summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Manual merge of fix for bug #7884 "Able to add invalid unique index onunknown2005-01-181-7/+7
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-01-181-7/+7
| |\
| | * Clean up in implementation of f_is_geom()/f_is_bitfield()/f_is_enum()unknown2005-01-181-7/+7
| * | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-01-181-0/+3
| |\ \
* | | | 1. Item now uses my_charset_bin by default,unknown2005-01-1813-56/+59
* | | | Fix 'make distclean' goal.unknown2005-01-181-1/+1
* | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-181-0/+5
|\ \ \ \
| * \ \ \ Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-187-6/+41
| |\ \ \ \
| * | | | | Fix for BUG#7965 "Slave_IO_State Stuck at 'Checking Master Version'":unknown2005-01-171-0/+5
* | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-1810-7/+52
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | #7874: CONCAT() gives wrong results mixing latin1 field and utf8 string literalsunknown2005-01-183-1/+26
| * | | | | Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1unknown2005-01-181-0/+3
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Anoter fix for moved IO_CACHE objectunknown2005-01-181-0/+3
| * | | | | Fixed new bug that caused symlink test to failunknown2005-01-182-4/+7
| * | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2005-01-181-1/+5
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | backported from 5.0 patch initialization of main select for commands where su...unknown2005-01-171-1/+5
| * | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-173-1/+11
| |\ \ \ \ \
| | * | | | | Bug #7966 query cache doesn't work properly with batch statementsunknown2005-01-171-0/+1
| | * | | | | Bug #7922 prompt \p fails on Windows for shared-memory connectionsunknown2005-01-152-1/+10
* | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-171-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-171-1/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge mysql.com:/space/my/mysql-4.0unknown2005-01-171-1/+1
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | - Enabled the handling of architecture extensions e.g. "-64bit" when buildingunknown2005-01-171-1/+1
| | | | |_|/ / | | | |/| | |
* | | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-172-0/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fixed memory leak in handle_local_infile()unknown2005-01-172-0/+2
| |/ / / / /
* | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-177-21/+112
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge mysql.com:/home/timka/mysql/src/4.1-virginunknown2005-01-171-14/+19
| |\ \ \ \ \
| | * \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-171-14/+19
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Bug#7937unknown2005-01-171-14/+19
| * | | | | | Merge mysql.com:/home/timka/mysql/src/4.1-virginunknown2005-01-173-4/+89
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix for BUG#7331.unknown2005-01-063-4/+89
| * | | | | | user_var.result, func_str.result, item_strfunc.cc:unknown2005-01-173-3/+4
* | | | | | | mysqldump.c:unknown2005-01-171-3/+3
|/ / / / / /
* | | | | | libmysql.c:unknown2005-01-171-1/+1
* | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-164-9/+9
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Makefile.am:unknown2005-01-161-2/+2
| * | | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-01-166-16/+53
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | initialize mysql->charset in mysql_initunknown2005-01-161-0/+1
| * | | | | don't ignore errors in readlinkunknown2005-01-151-3/+2
| * | | | | protect against malicious server trying to crash command-line client :)unknown2005-01-141-4/+4
* | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-163-14/+38
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-153-2/+15
| |\ \ \ \ \
| * \ \ \ \ \ Mergeunknown2005-01-153-14/+38
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | Fixed possible access to unintialized memory in filesort when using many buffersunknown2005-01-153-14/+38
* | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-1512-20/+54
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | func_gconcat.result, func_gconcat.test:unknown2005-01-153-2/+15
| |/ / / /
| * | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-01-144-13/+28
| |\ \ \ \
| | * | | | limit HEAP table size with max_heap_table_size, better estimation for mem_per...unknown2005-01-144-13/+28
| * | | | | Merge mysql.com:/home/jimw/my/mysql-4.0-cleanunknown2005-01-140-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge mysql.com:/home/jimw/my/mysql-4.0-7347unknown2005-01-141-2/+2
| | |\ \ \ \