summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* Merge 5.1 -> 5.1-rplSven Sandberg2008-07-064-42/+130
|\
| * auto merge 5.0-bugteam --> 5.1-bugteamGleb Shchepa2008-06-241-33/+9
| |\
| | * back-port from 5.1.Gleb Shchepa2008-06-241-1/+1
| | * back-port from 5.1.Gleb Shchepa2008-06-241-31/+0
| | * Bug #36244: MySQL CLI doesn't recognize standalone -- Gleb Shchepa2008-06-241-1/+8
| | * Merge bk-internal:/home/bk/mysql-5.0unknown2008-05-052-2/+12
| | |\
| | | * Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463unknown2008-05-022-2/+11
| | | |\
| | * | \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294unknown2008-04-031-1/+1
| | |\ \ \
| * | | | | Bug#37003 Tests sporadically crashes with embedded serverDavi Arnaut2008-06-191-4/+22
| * | | | | Bug#37003 Tests sporadically crashes with embedded serverDavi Arnaut2008-06-183-9/+103
* | | | | | Merge parallel mtrMagnus Svensson2008-06-191-12/+10
|\ \ \ \ \ \
| * | | | | | Change the "diff tool" detection algoritm to use "diff -u", "diff -c" andunknown2008-05-021-12/+10
* | | | | | | Merge 5.1->5.1-rplMagnus Svensson2008-05-304-43/+36
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Silence warning due to copying the address of a string constant unknown2008-05-061-1/+3
| * | | | | Merge mysql.com:/Users/davi/mysql/bugs/36031-5.1unknown2008-05-051-6/+15
| |\ \ \ \ \
| | * | | | | Bug#36031 Test funcs_1.<engine>_views failing on Windowsunknown2008-05-021-6/+15
| * | | | | | Remove unused variableunknown2008-05-021-1/+0
| * | | | | | Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463unknown2008-05-022-2/+11
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | Bug#36469 mysql_upgrade does not use --tmpdirunknown2008-05-021-1/+10
| | * | | | Bug#36465 mysqltest should always use the --tmpdirunknown2008-05-021-1/+1
| | |/ / /
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-bugteamunknown2008-05-011-0/+1
| |\ \ \ \
| | * \ \ \ Merge pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mys...unknown2008-05-011-0/+1
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Bug#36026 - Test funcs_1.<engine>_trig_03 failing on Windowsunknown2008-05-011-0/+1
| | | |/ /
| | | * | Merge amd64.(none):/src/mysql-5.0-bugteamunknown2008-03-281-5/+19
| | | |\ \
| | | * \ \ Merge mysql.com:/misc/mysql/mysql-5.0unknown2008-03-271-9/+25
| | | |\ \ \
| | | | * \ \ Merge bk@192.168.21.1:mysql-5.0-optunknown2008-03-231-9/+25
| | | | |\ \ \
| | | * | \ \ \ Merge trift2.:/MySQL/M50/mysql-5.0unknown2008-03-142-0/+2
| | | |\ \ \ \ \ | | | | |/ / / /
| | | * | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug34192/my50-bug34192unknown2008-03-131-3/+24
| | | |\ \ \ \ \
| * | | \ \ \ \ \ Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteamunknown2008-05-011-31/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Bug #36041: mysql-test-run doesn't seem to string match unknown2008-04-291-31/+1
| * | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug35157/my51-bug35157unknown2008-04-241-1/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Bug#35157: mysqldump should use FLUSH TABLES NO_WRITE_TO_BINLOG \unknown2008-04-141-1/+4
| * | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294unknown2008-04-031-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294unknown2008-04-031-1/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | / | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Bug#26294: library name conflict between MySQL 4.x, 5.0 and Qt 3.3unknown2008-04-031-1/+1
| | | | |_|/ / / | | | |/| | | |
* | | | | | | | Add 'my_kill' - portable version of "kill"unknown2008-04-221-14/+36
* | | | | | | | Fix valgrind warningsunknown2008-04-211-0/+3
* | | | | | | | Rename "shutdown" -> "send_shutdown" and "kill_server" to "shutdown_server"unknown2008-04-211-27/+27
* | | | | | | | Add "kill_server", call shutdown on current conneciton and then make sureunknown2008-04-211-2/+127
* | | | | | | | Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rplunknown2008-04-038-23/+80
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge bk-internal:/home/bk/mysql-5.1unknown2008-03-311-2/+18
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.1unknown2008-03-317-9/+9
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge amd64.(none):/src/mysql-5.1-bugteamunknown2008-03-281-2/+18
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge amd64.(none):/src/bug26243/my50-bug26243unknown2008-03-281-2/+18
| | | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | / | | | | | |_|_|_|_|/ | | | | |/| | | | |
| | | | * | | | | | Bug#26243 mysql command line crash after control-cunknown2008-03-281-5/+19
| | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | Merge kaamos.(none):/data/src/mysql-5.0unknown2008-03-122-0/+2
| | | | |\ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| * | | | | | | | Merge mysql1000.(none):/home/andrei/MySQL/BARE/mysql-5.1unknown2008-03-307-9/+9
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-287-9/+9
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-132-0/+2
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | * | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-077-9/+9
| | | |\ \ \ \ \ \