summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-226-1/+51
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-12-156-1/+53
| |\
| | * Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-156-1/+53
* | | Rearrange disable_warnings to enclose the warning emitters properly.cmiller@zippy.cornsilk.net2007-01-191-2/+2
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintcmiller@zippy.cornsilk.net2007-01-191-0/+2
|\ \ \
| * | | The rpl tree added a test case, and another source added a warning,cmiller@zippy.cornsilk.net2007-01-191-0/+2
* | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/myoffice.izhnet.ru2007-01-196-7/+35
|\ \ \ \ | |/ / / |/| | |
| * | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/myoffice.izhnet.ru2007-01-186-7/+35
| |\ \ \
| | * | | after merge fix.ramil/ram@mysql.com/myoffice.izhnet.ru2007-01-183-4/+4
| | * | | after merge fix.ramil/ram@mysql.com/myoffice.izhnet.ru2007-01-181-363/+17
| | * | | Merge mysql.com:/usr/home/ram/work/bug22533/my41-bug22533ramil/ram@mysql.com/myoffice.izhnet.ru2007-01-183-3/+377
| | |\ \ \
| | | * | | Fix for bug #22533: Traditional: Too-long bit value not rejected.ramil/ram@mysql.com/myoffice.izhnet.ru2006-12-063-3/+31
* | | | | | Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41tsmith@siva.hindu.god2007-01-182-5/+6
|\ \ \ \ \ \
| * | | | | | ndb_types.test: sleep a bit longer, to ensure that timestamp > @nowtsmith@siva.hindu.god2007-01-182-5/+6
| * | | | | | Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41tsmith@siva.hindu.god2007-01-1815-88/+168
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1msvensson@pilot.mysql.com2007-01-1715-88/+168
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-mainttsmith/tim@siva.hindu.god2006-12-222-0/+27
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge polly.local:/tmp/maint/bug24037/my41-bug24037kaa@polly.local2006-12-222-0/+27
| | | | |\ \ \ \ \ \
| | | * | \ \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/g41tsmith/tim@siva.hindu.god2006-12-214-5/+25
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| * | | | | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpllars/lthalmann@mysql.com/dl145j.mysql.com2007-01-178-1/+259
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpllars/lthalmann@mysql.com/dl145j.mysql.com2007-01-128-1/+259
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/bkroot/mysql-4.1-rpllars@mysql.com/black.(none)2006-12-088-1/+259
| | | |\ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50tsmith@siva.hindu.god2007-01-1832-946/+1886
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpllars/lthalmann@mysql.com/dl145j.mysql.com2007-01-1724-939/+1472
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpllars/lthalmann@mysql.com/dl145j.mysql.com2007-01-1224-939/+1472
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Fix for BUG#19725 "Calls to SF in other database are not replicatedguilhem@gbichot3.local2007-01-082-119/+192
| | | * | | | | | | | | | | | | After merge fix for bug N22645bar@mysql.com/bar.intranet.mysql.r18.ru2006-12-141-2/+2
| | | * | | | | | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rplbar@mysql.com/bar.intranet.mysql.r18.ru2006-12-145-1/+44
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Bug#22645 LC_TIME_NAMES: Statement not replicatedbar@mysql.com/bar.intranet.mysql.r18.ru2006-12-075-1/+45
| | | * | | | | | | | | | | | | | Merge mysql.com:/home/bkroot/mysql-5.0-rpllars@mysql.com/black.(none)2006-12-0823-820/+1237
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rplrafal@quant.(none)2006-12-082-0/+27
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rplbar@mysql.com/bar.intranet.mysql.r18.ru2006-12-082-0/+27
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | Bug#24158 SET PASSWORD in binary log fails under ANSI_QUOTESbar@mysql.com/bar.intranet.mysql.r18.ru2006-11-302-0/+27
| | | | * | | | | | | | | | | | | | | | Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rplrafal@quant.(none)2006-12-0821-820/+1210
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rplbar@mysql.com/bar.intranet.mysql.r18.ru2006-12-085-0/+140
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | Merging bug#22645 "LC_TIME_NAMES: Statement not replicated" from 4.1.bar@mysql.com/bar.intranet.mysql.r18.ru2006-12-051-0/+1
| | | | | | * | | | | | | | | | | | | | Merge mysql.com:/usr/home/bar/mysql-4.1.b22645bar@mysql.com/bar.intranet.mysql.r18.ru2006-12-054-0/+139
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / | | | | | | |/| | | | / / / / / / / / / | | | | | | | | |_|_|/ / / / / / / / / | | | | | | | |/| | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | Bug#22645 LC_TIME_NAMES: Statement not replicatedbar@mysql.com/bar.intranet.mysql.r18.ru2006-12-054-0/+139
| | | | | | | * | | | | | | | | | | | BUG#13926: --order-by-primary fails if PKEY contains quote character.bar@mysql.com/bar.intranet.mysql.r18.ru2006-11-212-0/+77
| | | | | | | * | | | | | | | | | | | Merge mysql.com:/usr/home/bar/mysql-4.1.b22646bar@mysql.com/bar.intranet.mysql.r18.ru2006-11-202-1/+43
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | Bug#20396 Bin Log does not get DELIMETER cmd - Recover StoredProc failsbar@mysql.com/bar.intranet.mysql.r18.ru2006-11-289-725/+882
| | | | | |/ / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | Prepare to merge "backport of bug#13926 from 5.0 to 4.1" back into 5.0:bar@mysql.com/bar.intranet.mysql.r18.ru2006-11-212-91/+91
| | | | | * | | | | | | | | | | | | | After merge fixbar@mysql.com/bar.intranet.mysql.r18.ru2006-11-201-1/+1
| | | | | * | | | | | | | | | | | | | Merge mysql.com:/usr/home/bar/mysql-4.1.b22646bar@mysql.com/bar.intranet.mysql.r18.ru2006-11-202-1/+43
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | Bug#22646 LC_TIME_NAMES: Assignment to non-UTF8 target failsbar@mysql.com/bar.intranet.mysql.r18.ru2006-11-082-1/+43
| | | | | * | | | | | | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rplbar@mysql.com/bar.intranet.mysql.r18.ru2006-11-163-3/+54
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/usr/home/bar/mysql-5.0-rplbar@mysql.com/bar.intranet.mysql.r18.ru2006-11-163-3/+54
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | | | | Bug#23619 Incorrectly escaped multibyte characters in binary log break replic...bar@mysql.com/bar.intranet.mysql.r18.ru2006-11-093-3/+54
| * | | | | | | | | | | | | | | | | | | | Fix a ps.test failure in 5.0-runtime tree.kostja@bodhi.local2007-01-172-10/+11
| * | | | | | | | | | | | | | | | | | | | Merge bodhi.local:/opt/local/work/mysql-4.1-runtimekostja@bodhi.local2007-01-161-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |