summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge with 4.1unknown2005-05-1425-254/+442
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-145-6/+10
| |\
| * | After merge fixesunknown2005-05-1411-190/+200
| * | Merge with 4.0unknown2005-05-1418-84/+265
| |\ \
| | * | Fixed wrong buffer usage for auto-increment key with blob part that caused CH...unknown2005-05-133-10/+47
| | * | Change create_field->offset to store offset from start of fields, independent...unknown2005-05-135-56/+98
| | * | mysqldump.1.in:unknown2005-05-111-1/+2
| | * | Fix outfile test/resultsunknown2005-05-092-8/+9
| | * | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-05-089-27/+105
| | |\ \
| | | * \ Merge ltantony.mysql.com:/usr/home/antony/work2/p4-bug8191unknown2005-05-086-21/+55
| | | |\ \
| | | | * | Bug#8191 - SELECT INTO OUTFILE insists on FROM clauseunknown2005-05-087-21/+56
| | | * | | Bug#6236unknown2005-05-084-6/+51
| | | |/ /
| | * | | Merge bk-internal:/home/bk/mysql-4.0unknown2005-05-075-0/+54
| | |\ \ \
| | | * \ \ Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-05-074-0/+20
| | | |\ \ \
| | | | * | | Test fix. DROP TABLE added.unknown2005-05-072-0/+2
| | | | * | | BUG#7709 fix - Boolean fulltext query against unsupported engines does notunknown2005-05-074-0/+18
| | * | | | | errmsg.txt:unknown2005-05-0723-0/+23
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-135-3/+43
| |\ \ \ \ \ \
| * | | | | | | Fixes during reviewunknown2005-05-135-28/+21
* | | | | | | | More post-merge fixes.unknown2005-05-142-8/+12
* | | | | | | | A post-merge fix.unknown2005-05-141-4/+4
* | | | | | | | Manual merge (again)unknown2005-05-1415-14/+94
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Fix a valgrind warning: memcpy does not allow its arguments to overlap.unknown2005-05-141-2/+5
| * | | | | | | Fix wrong format specifier in error messages.unknown2005-05-142-2/+2
| * | | | | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-05-132-2/+3
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | sql/ha_blackhole.ccunknown2005-05-132-2/+3
| | |/ / / / /
| * | | | | | Merge bk-internal:/home/bk/mysql-4.1unknown2005-05-131-1/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-9603unknown2005-05-131-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Eliminate gcc 4.0 warning in libedit code. (Bug #9603)unknown2005-05-071-1/+1
| * | | | | | | | row0mysql.c:unknown2005-05-131-2/+10
| |/ / / / / / /
| * | | | | | | added prototype for mysql_set_character_set functionunknown2005-05-131-0/+1
| * | | | | | | added function mysql_set_character_set (reviewed by Monty)unknown2005-05-132-0/+31
| | |/ / / / / | |/| | | | |
| * | | | | | If the system is under high load 'show full processlist' might report the unknown2005-05-122-8/+9
| * | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-103-2/+3
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-101-0/+1
| | |\ \ \ \ \ \
| | | * | | | | | Fix for Ingounknown2005-05-101-0/+1
| | * | | | | | | ctype-big5.c:unknown2005-05-102-2/+2
| * | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-102-1/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Makefile.am, configure.in:unknown2005-05-102-1/+7
| * | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-103-1/+29
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | bug#10344: some string function fail for UCS2unknown2005-05-103-1/+29
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-1329-178/+306
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-1329-178/+306
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | concurrent-insert can now be set to 2 for concurrent inserts when there is ho...unknown2005-05-1329-178/+306
* | | | | | | | | | | Fixup from 4.1 to 5.0 mergeunknown2005-05-131-1/+1
* | | | | | | | | | | Add missing commas to errmsg.cunknown2005-05-131-3/+3
* | | | | | | | | | | Mergeunknown2005-05-133-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Fix for valgrind bug in decimal codeunknown2005-05-131-1/+1
| * | | | | | | | | | Add myself to the list of users who don't automatically check outunknown2005-05-131-0/+1
* | | | | | | | | | | Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0unknown2005-05-138-23/+130
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |