summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-newjoerg@mysql.com2005-12-293-12/+14
|\
| * after pull fixesserg@serg.mylan2005-12-293-12/+14
* | Merge mysql.com:/M50/upward-5.0 into mysql.com:/M51/merge-5.1joerg@mysql.com2005-12-291-2/+2
|\ \ | |/ |/|
| * Fix for bug #15108: mysqld crashes when innodb_log_file_size is set > 4Gramil@mysql.com2005-11-241-2/+2
* | Merge mysql.com:/home/mydev/mysql-5.0-bug15591ingo@mysql.com2005-12-291-3/+32
|\ \
| * | Bug#15591 Occasional test suite abort due to port in useingo@mysql.com2005-12-281-3/+32
| * | Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0ingo@mysql.com2005-12-271-1/+1
| |\ \
| * \ \ Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2005-12-278-19/+144
| |\ \ \
| | * | | BUG#5390 - problems with merge tablesingo@mysql.com2005-12-208-19/+144
* | | | | Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15775_part2...msvensson@devsrv-b.mysql.com2005-12-281-6/+27
|\ \ \ \ \
| * \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2msvensson@neptunus.(none)2005-12-281-6/+27
| |\ \ \ \ \
| | * | | | | Bug #15775 "drop user" command does not refresh acl_check_hostsmsvensson@neptunus.(none)2005-12-281-6/+27
* | | | | | | WL#2575 - Fulltext: Parser plugin for FTSsvoj@mysql.com2005-12-285-33/+94
* | | | | | | Merge mysql.com:/home/stewart/Documents/MySQL/5.0/mainstewart@mysql.com2005-12-281-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge mysql.com:/home/stewart/Documents/MySQL/4.1/mainstewart@mysql.com2005-12-281-1/+1
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | correct help textserg@serg.mylan2005-12-231-1/+1
| | * | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2005-12-151-2/+2
| | |\ \ \ \ \
| * | | | | | | remove "defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)" unmaintainably sca...serg@serg.mylan2005-12-243-5/+5
| * | | | | | | Merge bk-internal:/home/bk/mysql-5.0knielsen@mysql.com2005-12-212-8/+8
| |\ \ \ \ \ \ \
| | * | | | | | | BUG#15842: Change in "item.cc" adding Item_sp_variable breaks compile on HP-U...knielsen@mysql.com2005-12-212-8/+8
* | | | | | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-newacurtis@xiphis.org2005-12-272-3/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bug#15976: Multiply warnings about unfreed memoryacurtis@xiphis.org2005-12-252-3/+1
* | | | | | | | | | Merge mysql.com:/home/mydev/mysql-5.1ingo@mysql.com2005-12-261-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | WL#2985: fix typo bug when partitioning is not compiled insergefp@mysql.com2005-12-261-1/+1
* | | | | | | | | | | Merge mysql.com:/home/mydev/mysql-5.1ingo@mysql.com2005-12-268-17/+141
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | BUG#5390 - problems with merge tablesingo@mysql.com2005-12-228-17/+141
* | | | | | | | | | | Fix for SQLCOM_BINLOG_BASE64_EVENT related code. ramil@mysql.com2005-12-261-1/+2
* | | | | | | | | | | Merge newbox:mysql-5.1-ppruning-r4sergefp@mysql.com2005-12-2614-59/+1667
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | WL#2985 "Partition pruning": fixes to post-review fixes: when modifying SEL_T...sergefp@mysql.com2005-12-261-0/+3
| * | | | | | | | | | | Fix typo bug in previous csetsergefp@mysql.com2005-12-261-1/+1
| * | | | | | | | | | | WL#2985 "Partition Pruning": post-review fixes:sergefp@mysql.com2005-12-263-69/+389
| * | | | | | | | | | | WL#2985 "Partition Pruning"sergefp@mysql.com2005-12-2213-47/+1332
* | | | | | | | | | | | Merge mysql.com:/home/dlenev/src/mysql-5.0-bg14836dlenev@mysql.com2005-12-244-16/+36
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | / / / / / / / / | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-12-211-10/+17
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fix for bug #14863 "Triggers: crash if create and there is no current database".dlenev@mysql.com2005-12-111-10/+17
| * | | | | | | | | | errmsg.txt:paul@snake-hub.snake.net2005-12-201-1/+1
| * | | | | | | | | | Fix for bug#14271 I_S: columns has no size for (var)binary columnsgluh@eagle.intranet.mysql.r18.ru2005-12-191-1/+3
| * | | | | | | | | | Fix for bug#14861 aliased column names are not preserved.gluh@eagle.intranet.mysql.r18.ru2005-12-191-5/+7
| * | | | | | | | | | Bug#12770 DESC cannot display the info. about temporary tablegluh@eagle.intranet.mysql.r18.ru2005-12-191-0/+8
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Fix for Antony's push. I've also changed from using the zlib off_t pointer ty...brian@zim.(none)2005-12-232-7/+6
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newbrian@zim.(none)2005-12-223-57/+63
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update to add in support for AZIO.brian@zim.(none)2005-12-223-57/+63
* | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newbrian@zim.(none)2005-12-222-3/+6
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/bkroot/mysql-5.1-newmats@mysql.com2005-12-221-3/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug#15920 (Temporary tables are not logged in binlog):mats@mysql.com2005-12-221-3/+5
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | WL#1012 Add to sql/Makefile.am include files forgotten in RBR push.knielsen@mysql.com2005-12-221-0/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newbrian@zim.(none)2005-12-225-1/+67
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | This patch does the following:brian@zim.(none)2005-12-225-1/+67
* | | | | | | | | | WL#1012: All changes as one single changeset.lars@mysql.com2005-12-2247-1138/+5849
* | | | | | | | | | plugin version changesacurtis@xiphis.org2005-12-213-55/+36