summaryrefslogtreecommitdiff
path: root/client/mysqlbinlog.cc
Commit message (Expand)AuthorAgeFilesLines
* 5.3 mergeSergei Golubchik2013-04-121-71/+96
|\
| * 5.2 mergeSergei Golubchik2013-04-111-71/+96
| |\
| | * 5.1 mergeSergei Golubchik2013-04-111-64/+89
| | |\
| | | * MDEV-4244 [PATCH] Buffer overruns and use-after-free errorsSergei Golubchik2013-04-061-64/+89
| * | | Merge MariaDB 5.1.66 -> 5.2 -> 5.3unknown2012-11-091-5/+14
| |\ \ \ | | |/ /
| | * | Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-081-5/+14
| | |\ \ | | | |/
| | | * Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-061-5/+14
| | | |\
| | * | \ Merge into latest 5.2.unknown2012-08-241-1/+1
| | |\ \ \
| * | \ \ \ Merge into latest 5.3unknown2012-08-241-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ 5.2 merge.Sergei Golubchik2012-08-221-4/+34
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | 5.1 mergeSergei Golubchik2012-08-221-4/+34
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | merge with MySQL 5.1.65Sergei Golubchik2012-08-221-4/+34
| | | |\ \ \ \
* | | | \ \ \ \ merge with mysql-5.5.30 minus few incorrect or not applicable changesetsSergei Golubchik2013-02-281-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | BUG#15891524: RLI_FAKE MODE IS NOT UNSET AFTER BINLOG REPLAYNuno Carvalho2012-11-201-0/+4
* | | | | | | | | mysql-5.5.28Sergei Golubchik2012-10-161-5/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | upmerge from mysql-5.1=>mysql-5.5Rohit Kalhans2012-08-081-1/+12
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | BUG#11757312: MYSQLBINLOG DOES NOT ACCEPT INPUT FROM STDINRohit Kalhans2012-08-081-1/+12
| * | | | | | | | Merge of patch for Bug#13928675 from mysql-5.1.Nirbhay Choubey2012-08-071-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUSTNirbhay Choubey2012-08-071-1/+1
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Merge from 5.3unknown2012-08-241-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | merge from 5.2unknown2012-08-241-1/+1
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge from 5.1.unknown2012-08-241-1/+1
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | | | |_|/ | | | |/| |
* | | | | | merge with MySQL 5.5.27Sergei Golubchik2012-08-091-4/+33
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | merge from 5.1 to 5.5Sujatha Sivakumar2012-07-101-1/+12
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | BUG#11762670:MY_B_WRITE RETURN VALUE IGNOREDSujatha Sivakumar2012-07-101-1/+12
| * | | | | Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING)Jon Olav Hauglid2012-06-291-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING)Jon Olav Hauglid2012-06-291-2/+2
| * | | | | upmerge from mysql-5.1 branch -> mysql-5.5 branchRohit Kalhans2012-05-291-1/+20
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#11762667: MYSQLBINLOG IGNORES ERRORS WHILE WRITING OUTPUTRohit Kalhans2012-05-291-1/+20
* | | | | | Merge MWL#234: @@skip_replication feature to MariaDB 5.5.unknown2012-03-011-0/+33
|\ \ \ \ \ \
| * | | | | | MWL#234: After-review fixes, including better names for the new system variab...unknown2011-08-121-16/+11
| * | | | | | MWL#234: Support for marking binlog events to not be replicated, and for tell...unknown2011-08-111-0/+38
* | | | | | | 5.3 mergeSergei Golubchik2012-01-131-3/+5
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge with 5.2.Michael Widenius2011-12-111-3/+6
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge with MariaDB 5.1Michael Widenius2011-11-241-3/+6
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | / | | | | |_|/ | | | |/| |
| | | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-3/+6
| | | |\ \ \ | | | | | |/ | | | | |/|
* | | | | | move safemalloc out of dbug.Sergei Golubchik2011-12-121-11/+15
* | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-221-6/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | fix typo: binlog_annotate_rows_events -> binlog_annotate_row_eventsSergei Golubchik2011-09-231-6/+6
* | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-3/+5
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | BUG#12695969Luis Soares2011-07-111-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | BUG#12695969Luis Soares2011-07-111-4/+2
| | |\ \ \ \
| | | * | | | BUG#12695969: FIX OUTDATED COPYRIGHT NOTICES IN REPLACTIONLuis Soares2011-07-111-7/+3
| | * | | | | Updated/added copyright headersKent Boortz2011-07-031-5/+14
| | |\ \ \ \ \
| * | \ \ \ \ \ Updated/added copyright headersKent Boortz2011-06-301-2/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+5
* | | | | | | | merge with 5.3Sergei Golubchik2011-10-191-28/+177
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | merge Windows performance patches into 5.3Vladislav Vaintroub2011-07-051-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs incr...Vladislav Vaintroub2011-06-121-1/+1
| | | |_|_|_|/ / | | |/| | | | |