summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* merge with 4.1monty@mysql.com2004-10-29123-2779/+6226
|\
| * Produce a "truncated" warning if a value cannot be convertedbar@mysql.com2004-10-283-16/+41
| * An extra "separator" class member was removed from Item_func_concat_ws.bar@mysql.com2004-10-284-74/+14
| * Making the latest fix for Bug#6166 (key.test) work in prepared statements.konstantin@mysql.com2004-10-281-2/+4
| * Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-10-272-15/+80
| |\
| | * Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-10-272-15/+80
| | |\
| | | * removed incorrect error message about aggregate functionsbell@sanja.is.com.ua2004-10-272-15/+80
| * | | Fixed access to freed memorymonty@mysql.com2004-10-273-7/+7
| * | | Merge with 4.0monty@mysql.com2004-10-277-7/+43
| |\ \ \ | | |/ / | |/| |
| | * | Backport innodb_max_purge_lag from 4.1marko@hundin.mysql.fi2004-10-273-0/+11
| | * | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0bell@sanja.is.com.ua2004-10-245-5/+44
| | |\ \
| | | * | postreview fixesbell@sanja.is.com.ua2004-10-223-4/+6
| | | * | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0bell@sanja.is.com.ua2004-10-221-2/+6
| | | |\ \
| | | * | | Check of temporary tables hiding for query fetched from QC (BUG#6084)bell@sanja.is.com.ua2004-10-212-1/+34
| | * | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0bell@sanja.is.com.ua2004-10-225-12/+14
| | |\ \ \ \ | | | |/ / /
| | * | | | fixed retsult codebell@sanja.is.com.ua2004-10-191-1/+1
| * | | | | mergedserg@serg.mylan2004-10-262-17/+0
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Bug #6019 - SELECT tries to use too short prefix index on utf8 dataserg@serg.mylan2004-10-262-17/+0
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-10-2615-73/+110
| |\ \ \ \ \
| | * | | | | A lot of fixes for prepared statements (PS):monty@mysql.com2004-10-2615-73/+110
| * | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1gluh@gluh.mysql.r18.ru2004-10-261-1/+1
| |\ \ \ \ \ \
| | * | | | | | Typo fixgluh@gluh.mysql.r18.ru2004-10-261-1/+1
| * | | | | | | Bug 6206: ENUMs are not case sensitive even if declared BINARYbar@mysql.com2004-10-265-15/+16
| |/ / / / / /
| * | | | | | Fix for bug #6166: index prefix length of 0 not rejectedgluh@gluh.mysql.r18.ru2004-10-261-1/+13
| * | | | | | - Check ENUM/SET duplicate values taking in account charset/collation.bar@mysql.com2004-10-261-14/+14
| * | | | | | Reuse more code: two equal pieces for ENUM and SET where movedbar@mysql.com2004-10-261-26/+33
| * | | | | | fix for alignment bug on solaris 64 bittomas@poseidon.ndb.mysql.com2004-10-251-3/+5
| * | | | | | Bug#6202: ENUMs are not case sensitive even if declared BINARYbar@mysql.com2004-10-2515-23/+99
| | |/ / / / | |/| | | |
| * | | | | removed unneed variablebell@sanja.is.com.ua2004-10-241-1/+0
| * | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-10-232-12/+30
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | force assigning error handler for all mem_rootsbell@sanja.is.com.ua2004-10-211-3/+3
| | * | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-10-151-9/+27
| | |\ \ \ \
| | | * | | | we can't rely on current variables implementation, so have to use String poin...bell@sanja.is.com.ua2004-10-141-9/+27
| * | | | | | Fixed wrong range test code for HEAP tables. This caused a crash when doing a...monty@mysql.com2004-10-231-1/+2
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-10-223-78/+91
| |\ \ \ \ \ \
| | * | | | | | sql_acl.cc:dellis@goetia.(none)2004-10-221-7/+8
| | * | | | | | Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1dellis@goetia.(none)2004-10-221-59/+71
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ After-merge fixes.dellis@goetia.(none)2004-10-221-59/+71
| | | |\ \ \ \ \ \
| | | | * | | | | | sql_acl.cc:dellis@goetia.(none)2004-10-221-34/+29
| | | | * | | | | | sql_acl.cc:dellis@goetia.(none)2004-10-181-47/+71
| | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1konstantin@mysql.com2004-10-221-15/+13
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Manual mergekonstantin@mysql.com2004-10-221-15/+13
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | A fix and test case for Bug#6088 "FOUND_ROWS returns wrong values forkonstantin@mysql.com2004-10-221-15/+13
| | * | | | | | | | | Manual merge of fix for bug #6081 "Call to deprecated mysql_create_db()dlenev@mysql.com2004-10-221-1/+3
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@mysql.com2004-10-221-2/+8
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Manual merge of fix for bug #6081 "Call to deprecated mysql_create_db() funct...dlenev@mysql.com2004-10-221-2/+8
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Fix for bug #6081 "Call to deprecated mysql_create_db() function crashesdlenev@brandersnatch.localdomain2004-10-171-2/+8
| * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-10-2210-39/+114
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-10-228-38/+77
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | After merge fixesmonty@mysql.com2004-10-221-2/+2