summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal:/home/bk/mysql-5.1unknown2007-01-231-1/+1
|\
| * Merge trift2.:/MySQL/M51/mysql-5.1unknown2007-01-231-1/+1
| |\
| | * Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-workunknown2007-01-221-1/+1
| | |\
| | | * Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-workunknown2007-01-221-1/+1
| | | |\
| | | | * after-merge fixunknown2007-01-221-1/+1
| | | | * Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work1-testcases...unknown2007-01-227-16/+22
| | | | |\
| | | * | | Rearrange disable_warnings to enclose the warning emitters properly.unknown2007-01-191-2/+2
* | | | | | correct manual mergeunknown2007-01-231-6/+6
* | | | | | Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndbunknown2007-01-232-0/+32
|\ \ \ \ \ \
| * | | | | | bug#25746 ndb: 4209 error with 2 VARCHAR primary keysunknown2007-01-232-0/+35
| * | | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0unknown2007-01-082-9/+6
| |\ \ \ \ \ \
| | * | | | | | bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, no...unknown2007-01-082-9/+6
| * | | | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0unknown2007-01-082-0/+23
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, no...unknown2007-01-082-0/+23
| * | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-01-052-0/+29
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0unknown2007-01-032-0/+29
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
* | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1unknown2007-01-2215-0/+424
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/51-workunknown2007-01-122-0/+76
| |\ \ \ \ \ \ \ \
| | * | | | | | | | ndb - bug#25587unknown2007-01-122-0/+76
| * | | | | | | | | bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, no...unknown2007-01-082-0/+17
| * | | | | | | | | bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, no...unknown2007-01-082-0/+23
| * | | | | | | | | ha_ndbcluster.h, ndb_dd_alter.result, ha_ndbcluster.cc:unknown2007-01-041-2/+2
| * | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndbunknown2007-01-049-0/+284
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Many files:unknown2007-01-046-8/+6
| | * | | | | | | | | Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndbunknown2007-01-039-0/+286
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | New cluster replication test cases for replication optionsunknown2006-12-159-0/+286
| * | | | | | | | | | | bug #25296 Truncate table converts NDB disk based tables to in-memory tables...unknown2007-01-022-1/+25
* | | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2007-01-21115-2453/+2909
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Add missing version delimiter.unknown2007-01-191-0/+2
| * | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2007-01-191-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-01-191-0/+2
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | The rpl tree added a test case, and another source added a warning,unknown2007-01-191-0/+2
| | * | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-01-196-7/+35
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-01-186-7/+35
| | | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | after merge fix.unknown2007-01-191-5/+5
| * | | | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-01-196-7/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-01-186-7/+35
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/usr/home/ram/work/bug22533/my50-bug22533unknown2007-01-183-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | after merge fix.unknown2007-01-183-4/+4
| | | * | | | | | | | | | | | | Merge mysql.com:/usr/home/ram/work/bug22533/my50-bug22533unknown2007-01-183-3/+31
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / /
| | | | * | | | | | | | | | | | after merge fix.unknown2007-01-181-363/+17
| | | | * | | | | | | | | | | | Merge mysql.com:/usr/home/ram/work/bug22533/my41-bug22533unknown2007-01-183-3/+377
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | Fix for bug #22533: Traditional: Too-long bit value not rejected.unknown2006-12-063-3/+31
| * | | | | | | | | | | | | | | | Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50unknown2007-01-182-5/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41unknown2007-01-182-5/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | ndb_types.test: sleep a bit longer, to ensure that timestamp > @nowunknown2007-01-182-5/+6
| | | * | | | | | | | | | | | | | Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41unknown2007-01-1815-88/+168
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1unknown2007-01-1715-88/+168
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2006-12-222-0/+27
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge polly.local:/tmp/maint/bug24037/my41-bug24037unknown2006-12-222-0/+27
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \