summaryrefslogtreecommitdiff
path: root/mysql-test/include
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.1lars/lthalmann@dl145k.mysql.com2007-07-025-27/+402
|\
| * Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2007-07-025-27/+402
| |\
| | * Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rplcbell/Chuck@mysql_cab_desk.2007-06-294-0/+347
| | |\
| | | * Merge poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndbtomas@poseidon.mysql.com2007-06-284-0/+347
| | | |\
| | | | * select_ndb_apply_status.inc:jmiller/ndbdev@mysql.com/ndb08.mysql.com2007-06-211-0/+13
| | | | * Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndbjmiller/ndbdev@ndb08.mysql.com2007-06-213-0/+334
| | | | |\
| | | | | * Many files:jmiller/ndbdev@mysql.com/ndb08.mysql.com2007-06-213-0/+334
| | * | | | BUG#28991 : rpl_events failure in pushbuild cbell/Chuck@mysql_cab_desk.2007-06-261-27/+55
| | |/ / /
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.(none)2007-07-029-2/+307
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Patch for the following bugs:anozdrin/alik@ibm.2007-06-288-0/+297
| * | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-06-251-2/+10
| |\ \ \ \
| | * | | | Fix for BUG#29318 "Statements prepared with PREPARE and with oneguilhem@gbichot3.local2007-06-231-2/+10
* | | | | | Merge olga.mysql.com:/home/igor/mysql-5.0-optigor@olga.mysql.com2007-06-301-0/+35
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@ramil.myoffice.izhnet.ru2007-06-171-0/+26
| |\ \ \ \ \
| * \ \ \ \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-mainttsmith@quadxeon.mysql.com2007-06-151-0/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-buildtsmith@quadxeon.mysql.com2007-06-144-4/+21
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-rpltsmith@maint1.mysql.com2007-06-215-32/+44
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndbtomas@whalegate.ndb.mysql.com2007-06-191-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | corrected typotomas@whalegate.ndb.mysql.com2007-06-191-1/+1
| * | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndbtomas@whalegate.ndb.mysql.com2007-06-191-0/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | turn off binlogging of the updates during wait for not_readonlytomas@whalegate.ndb.mysql.com2007-06-191-0/+3
| * | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndbtomas@whalegate.ndb.mysql.com2007-06-184-32/+35
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | check for different error messagetomas@whalegate.ndb.mysql.com2007-06-181-2/+2
| | * | | | | | | fixes Bug #25305 (and several other similar test tailures with the same symptom)tomas@whalegate.ndb.mysql.com2007-06-184-32/+35
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2007-06-181-0/+6
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-rplmats@kindahl-laptop.dnsalias.net2007-06-111-0/+6
| | |\ \ \ \ \ \
| | | * | | | | | BUG#24954 (Last_errno and Last_error not set after master_retry_count hasmats@kindahl-laptop.dnsalias.net2007-06-111-1/+1
| | | * | | | | | Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-rplmats@kindahl-laptop.dnsalias.net2007-06-091-0/+6
| | | |\ \ \ \ \ \
| | | | * | | | | | BUG#24954 (Last_errno and Last_error not set after master_retry_count was rea...mats@kindahl-laptop.dnsalias.net2007-06-091-0/+6
* | | | | | | | | | Fix for bug #28772: rpl_row_until fails in pushbuildramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-06-194-6/+6
* | | | | | | | | | Merge mysql.com:/home/ram/work/b28144/b28144.5.0ramil/ram@ramil.myoffice.izhnet.ru2007-06-171-0/+26
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Fix for bug #28144: "Slave_IO_Running" differs in replication testsramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-06-151-0/+26
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Backport oframil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-06-154-0/+135
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Bug#28369 rpl test cases fail with binlog disabledmsvensson@pilot.(none)2007-06-081-0/+4
* | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-buildtsmith@quadxeon.mysql.com2007-06-1512-20/+55
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.1holyfoot/hf@hfmain.(none)2007-06-1411-20/+54
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Bug #28991: rpl_events failure in pushbuildgkodinov/kgeorge@magare.gmz2007-06-141-0/+3
| | * | | | | | Merge bk@192.168.21.1:mysql-5.1-optholyfoot/hf@hfmain.(none)2007-06-121-11/+11
| | |\ \ \ \ \ \
| | | * | | | | | Bug #28757 Test program / embedded server crash in test "unsafe_binlog_innodb"holyfoot/hf@mysql.com/hfmain.(none)2007-06-121-11/+11
| | | | |/ / / / | | | |/| | | |
| | * | | | | | Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysqlevgen@moonbone.local2007-06-111-0/+31
| | |\ \ \ \ \ \
| | * | | | | | | compilation error fixgluh@mysql.com/eagle.(none)2007-06-098-9/+9
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2007-06-061-0/+1
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2007-06-043-0/+503
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | * | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-nndf@pippilotta.erinye.com2007-05-301-0/+1
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | | * | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nndf@pippilotta.erinye.com2007-05-151-0/+1
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | |
| | | | * | | | | BUG#28370 federated test cases fail with binlog disableddf@pippilotta.erinye.com2007-05-151-0/+1
| | | | | |/ / / | | | | |/| | |
* | | | | | | | Updated patch for Bug#28497 based off of Magnus's reviewjmiller/ndbdev@mysql.com/ndb08.mysql.com2007-06-134-0/+135
* | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-maintmsvensson@pilot.(none)2007-06-082-7/+2
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.(none)2007-06-081-3/+2
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Bug#28718 Running backup testcase fails in mysql testsuite of MySQL-enterpris...msvensson@pilot.(none)2007-06-071-3/+2