summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1unknown2005-08-1926-13/+99
|\
| * Bug#11338 Fixes from review (identical functionality).unknown2005-08-199-33/+51
| * Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0unknown2005-08-180-0/+0
| |\
| | * Some minor fixes for Netware. These were required after we started buildingunknown2005-08-183-7/+14
| | * Merge mysql.com:/space/my/mysql-4.0unknown2005-08-124-7/+16
| | |\
| * | | Changes for Netware. This is needed when building against newer Libcunknown2005-08-182-0/+13
| * | | Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-1931-51/+172
| |\ \ \
| | * \ \ Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-171-1/+2
| | |\ \ \
| | | * | | Bug #6581 Failure to start mysql server on Windows with AWE option enabledunknown2005-08-121-1/+2
| | * | | | Increase the version number to 4.1.15 (as 4.1.14 has been cloned off).unknown2005-08-171-2/+2
| | * | | | mysql-test-run.pl, mtr_misc.pl:unknown2005-08-172-1/+10
| | * | | | Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1unknown2005-08-1722-8/+98
| | |\ \ \ \
| | | * | | | BUG#11338 (logging of prepared statement w/ blob type)unknown2005-08-1722-8/+98
* | | | | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-193-101/+241
|\ \ \ \ \ \ \
| * | | | | | | Fix for BUG#10957 "stop instance, issued after flush instances causes IM to c...unknown2005-08-193-101/+241
* | | | | | | | Merge mysql.com:/home/timka/mysql/src/5.0-virginunknown2005-08-194-4/+134
|\ \ \ \ \ \ \ \
| * | | | | | | | A fix and a test case for "Bug #12168 'DECLARE CONTINUE HANDLER FOR unknown2005-08-194-4/+134
* | | | | | | | | Merge mysql.com:/home/timka/mysql/src/5.0-virginunknown2005-08-197-29/+53
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | WL#2486 - natural and using join according to SQL:2003unknown2005-08-197-26/+50
| * | | | | | | | Merge mysql.com:/home/timka/mysql/src/5.0-virginunknown2005-08-181-3/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | WL#2486 - natural and using joinunknown2005-08-181-3/+3
* | | | | | | | | | btr0sea.c:unknown2005-08-191-0/+7
* | | | | | | | | | fixed test after mergeunknown2005-08-192-2/+2
* | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0unknown2005-08-191-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | row0sel.c:unknown2005-08-191-0/+5
* | | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0unknown2005-08-195-3/+16
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-195-3/+16
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | test fix for fix of 12591unknown2005-08-192-2/+2
| | * | | | | | | | | | Merge lmy004.:/work/mysql-5.0-cleanunknown2005-08-183-1/+14
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | fix for bug #12591 (SHOW TABLES FROM dbname produces wrong error message)unknown2005-08-173-1/+14
* | | | | | | | | | | | | changes in row operationunknown2005-08-191-2/+2
* | | | | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0unknown2005-08-194-6/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | stop on NULL comparison only if it is allowed (BUG#12509)unknown2005-08-184-6/+38
* | | | | | | | | | | | | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-191-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Allow consistent cursor view see changes made by creating transaction.unknown2005-08-181-3/+5
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Manual mergeunknown2005-08-181-0/+11
* | | | | | | | | | | | | Manual mergeunknown2005-08-187-32/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-183-1/+28
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fix bug #10624 Views with multiple UNION and UNION ALL produce incorrectunknown2005-08-153-1/+28
| * | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-08-185-31/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fix minor typo in handling of error conditions and return of SLEEP().unknown2005-08-171-2/+2
| | * | | | | | | | | | | | | Revert patch for Bug #12595, it causes the sql_mode test to fail.unknown2005-08-173-28/+0
| | * | | | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-12582unknown2005-08-172-3/+45
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Fix up definition of new set_timespec_nsec() macro. (Related to bug #12582)unknown2005-08-171-4/+13
| | | * | | | | | | | | | | | | Fix SLEEP() to be interruptable. (Bug #12582)unknown2005-08-162-2/+35
| | | | |_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Fix bad merge of sql/item_strfunc.cc by aivanovunknown2005-08-171-3/+0
* | | | | | | | | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-181-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-181-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Undo the test cset that shouldn't have been pushed (ChangeSet@1.1988, 2005-08...unknown2005-08-181-3/+0
* | | | | | | | | | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-184-5/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |