summaryrefslogtreecommitdiff
path: root/mysql-test/include
Commit message (Expand)AuthorAgeFilesLines
* Merge 50 -> 51 (-opt changesets)tsmith@ramayana.hindu.god2007-08-011-0/+106
|\
* \ Merge ramayana.hindu.god:/home/tsmith/m/bk/51tsmith@ramayana.hindu.god2007-08-011-1/+8
|\ \
| * \ Merge ramayana.hindu.god:/home/tsmith/m/bk/51tsmith@ramayana.hindu.god2007-07-311-1/+8
| |\ \
| | * \ Merge ramayana.hindu.god:/home/tsmith/m/bk/51tsmith@ramayana.hindu.god2007-07-241-1/+9
| | |\ \
| | | * \ Merge mysql.com:/home/ram/work/b28125/b28125.5.0ramil/ram@ramil.myoffice.izhnet.ru2007-07-201-2/+9
| | | |\ \
* | | | \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.(none)2007-07-311-0/+32
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge bodhi.(none):/opt/local/work/mysql-5.0-runtimekostja@bodhi.(none)2007-07-311-0/+33
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |
* | | | | Merge xiphis.org:/anubis/antony/work/mysql-5.1-enginesacurtis/antony@ltamd64.xiphis.org2007-07-261-0/+85
|\ \ \ \ \
| * \ \ \ \ Merge gleb.loc:/home/uchum/work/bk/5.0-optgshchepa/uchum@gleb.loc2007-07-261-0/+85
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
* | | | | Merge xiphis.org:/anubis/antony/work/p2-bug25714.1acurtis/antony@ltamd64.xiphis.org2007-07-241-0/+7
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Bug#25714antony@pcg5ppc.xiphis.org2007-07-231-0/+7
| |/ /
* | | Merge gleb.loc:/home/uchum/work/bk/5.1gshchepa/uchum@gleb.loc2007-07-203-6/+66
|\ \ \ | | |/ | |/|
| * | Merge ramayana.hindu.god:/home/tsmith/m/bk/51tsmith@ramayana.hindu.god2007-07-171-64/+20
| |\ \
| * | | correct cluster support checktomas@whalegate.ndb.mysql.com2007-07-131-1/+1
| * | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndbtomas@whalegate.ndb.mysql.com2007-07-131-1/+6
| |\ \ \
| | * | | avoid multiple defines of server1/2tomas@whalegate.ndb.mysql.com2007-07-131-1/+6
| * | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndbtomas@whalegate.ndb.mysql.com2007-07-131-5/+9
| |\ \ \ \ | | |/ / /
| | * | | avoid some sporadic startup issuestomas@whalegate.ndb.mysql.com2007-07-131-5/+9
| * | | | Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569.tsmith@sita.local2007-07-101-0/+51
* | | | | Merge gleb.loc:/home/uchum/work/bk/5.1gshchepa/uchum@gleb.loc2007-07-191-64/+20
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engineskostja@bodhi.(none)2007-07-171-59/+15
| |\ \ \ \
| | * \ \ \ Merge bodhi.(none):/opt/local/work/mysql-5.0-runtimekostja@bodhi.(none)2007-07-161-59/+15
| | |\ \ \ \ | | | |/ / / | | |/| | |
| * | | | | BUG#29807 - innodb_mysql.test: Cannot find table test/t2 from thesvoj@mysql.com/june.mysql.com2007-07-161-5/+5
| |/ / / /
* | | | | Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-optgkodinov/kgeorge@magare.gmz2007-07-181-0/+48
|\ \ \ \ \ | | |_|_|/ | |/| | |
* | | | | Merge gleb.loc:/home/uchum/work/bk/5.1gshchepa/uchum@gleb.loc2007-07-131-0/+24
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-optevgen@moonbone.local2007-07-091-0/+24
| |\ \ \ \
| | * | | | Bug#29310: An InnoDB table was updated when the data wasn't actually changed.evgen@moonbone.local2007-07-081-0/+24
* | | | | | Merge sita.local:/Users/tsmith/m/bk/51tsmith@sita.local2007-07-091-1/+73
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge gleb.loc:/home/uchum/work/bk/5.1gshchepa/uchum@gleb.loc2007-07-081-1/+14
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marveljani@labbari.dsl.inet.fi2007-07-061-1/+14
| | |\ \ \ \ | | | | |/ / | | | |/| |
| * | | | | Merge gleb.loc:/home/uchum/work/bk/5.1gshchepa/uchum@gleb.loc2007-07-051-1/+60
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | merge 5.0-opt -> 5.1-optgkodinov/kgeorge@magare.gmz2007-07-041-1/+1
| | * | | | Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-optgkodinov/kgeorge@magare.gmz2007-07-041-1/+60
| | |\ \ \ \ | | | |/ / /
* | | | | | Merge maint1.mysql.com:/data/localhome/tsmith/bk/51tsmith@maint1.mysql.com2007-07-041-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.(none)2007-06-291-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge pilot.(none):/data/msvensson/mysql/bug28356/my50-bug28356msvensson@pilot.(none)2007-06-291-1/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Change "exec rm" to "remove_file"msvensson@pilot.(none)2007-06-271-1/+1
* | | | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |