summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge bk@192.168.21.1:mysql-5.1-newholyfoot@mysql.com2006-04-2710-4/+44
|\
| * bug #18518 (embedded server crashes starting)holyfoot@deer.(none)2006-04-261-0/+9
| * bug #18518 (embedded server crashes starting)holyfoot@deer.(none)2006-04-249-4/+35
* | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-newtomas@poseidon.ndb.mysql.com2006-04-270-0/+0
|\ \
| * \ Merge mysql.com:/home/psergey/bk-trees/mysql-5.0sergefp@mysql.com2006-04-276-14/+364
| |\ \
* | \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-newtomas@poseidon.ndb.mysql.com2006-04-2618-89/+628
|\ \ \ \ | |/ / / |/| | |
| * | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0tomas@poseidon.ndb.mysql.com2006-04-2618-89/+628
| |\ \ \
| | * | | Bug #18550 ndbd getting "node failure handling not complete..." after gracefu...tomas@poseidon.ndb.mysql.com2006-04-267-51/+148
| | * | | Bug #19202 Incorrect errorhandling in select count(*) wrt temporary errortomas@poseidon.ndb.mysql.com2006-04-261-5/+27
| | * | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0tomas@poseidon.ndb.mysql.com2006-04-264-14/+65
| | |\ \ \
| | | * | | ndb: added timeout handling to alloc node id to avoid the usage of purge stal...tomas@poseidon.ndb.mysql.com2006-04-264-14/+65
| | * | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0jonas@perch.ndb.mysql.com2006-04-266-24/+39
| | |\ \ \ \
| | | * \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2006-04-266-24/+39
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | fixed error message textbell@sanja.is.com.ua2006-04-262-2/+2
| | |/ / / /
| | * | | | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0aivanov@mysql.com2006-04-264-1/+20
| | |\ \ \ \
| | | * \ \ \ Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0aivanov@mysql.com2006-04-264-1/+20
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | | * | | Merge mysql.com:/home/alexi/mysql-5.0aivanov@mysql.com2006-04-264-1/+20
| | | | |\ \ \
| | * | | | | | configure.in:bpontz@mysql.com2006-04-261-2/+2
| | * | | | | | after mergeserg@sergbook.mysql.com2006-04-251-2/+2
| | * | | | | | Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1serg@sergbook.mysql.com2006-04-251-1/+18
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | after merge fixserg@sergbook.mysql.com2006-04-251-3/+3
| | | * | | | | mergedserg@sergbook.mysql.com2006-04-251-1/+18
| | | |\ \ \ \ \
| | | | * | | | | buffer overflow and information exposure bugs fixedserg@sergbook.mysql.com2006-04-251-0/+15
| | | | * | | | | Merge mysql.com:/home/mydev/mysql-4.0ingo@mysql.com2006-04-1116-36/+123
| | | | |\ \ \ \ \
| | * | | | | | | | Fix compile failure on Win32sergefp@mysql.com2006-04-261-1/+1
| | * | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2006-04-266-14/+364
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | BUG#15872: Don't run the range analyzer on "t1.keypart NOT IN (const1, ..., )...sergefp@mysql.com2006-04-256-14/+364
| | | | |_|_|/ / / / | | | |/| | | | | |
* | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-newmskold@mysql.com2006-04-262-2/+4
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-newmskold@mysql.com2006-04-262-2/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Added test for violation of uniqueness constraint at create indexmskold@mysql.com2006-04-262-2/+4
| | |/ / / / / / / / /
* | | | | | | | | | | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-newmleich@mysql.com2006-04-262-11/+9
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-newmleich@mysql.com2006-04-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| * | | | | | | | | | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-newmleich@mysql.com2006-04-262-11/+9
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-newmleich@mysql.com2006-04-252-11/+9
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Post merge correction for the Changesetmleich@mysql.com2006-04-252-11/+9
* | | | | | | | | | | | | Merge mysql.com:/home/mydev/mysql-5.1ingo@mysql.com2006-04-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Corrected include path to work under Windowsmskold@mysql.com2006-04-261-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge mysql.com:/home/mydev/mysql-5.1ingo@mysql.com2006-04-261-31/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge mysql.com:/home/mydev/mysql-5.1ingo@mysql.com2006-04-251-31/+18
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Bug#18129 - Fast (online) add index leaves temporary table frm in case of errorsingo@mysql.com2006-04-131-31/+18
* | | | | | | | | | | | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-newaivanov@mysql.com2006-04-2615-149/+59
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-newaivanov@mysql.com2006-04-2615-149/+59
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492aivanov@mysql.com2006-04-262-1/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-workaivanov@mysql.com2006-04-262-1/+5
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Make innodb_mysql produce a non-empty output.aivanov@mysql.com2006-04-262-1/+5
| | * | | | | | | | | | | | | Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492-workaivanov@mysql.com2006-04-263-0/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-workaivanov@mysql.com2006-04-263-0/+15
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / /
| | | | * | | | | | | | | | | Files innodb.[test|result] are to be used by Innobase only.aivanov@mysql.com2006-04-263-0/+15
| | * | | | | | | | | | | | | Applied innodb-5.1-ss492 snapshot.aivanov@mysql.com2006-04-2612-149/+40
| | * | | | | | | | | | | | | Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492-workaivanov@mysql.com2006-04-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | | | | | | / / / / / / / / | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | |