summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge with 4.0 to get fixes for Windows project filesmonty@mysql.com2004-05-2556-118/+354
|\
| * New MYSQL_SERVER_SUFFIX usage (for easier compilation)monty@mysql.com2004-05-2551-117/+94
| * Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-05-241-4/+8
| |\
| | * Fix for BUG#3871: a slave must always replicate a statement, even if it exami...guilhem@mysql.com2004-05-241-4/+8
| * | InnoDB cleanup: sync0arr.c: sync_array_cell_print(): Remove unused variable strmarko@hundin.mysql.fi2004-05-241-1/+0
| |/
| * Bug fixes:monty@mysql.com2004-05-203-4/+252
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@brandersnatch.localdomain2004-05-252-0/+9
|\ \
| * | Fix for sporadically failures of innodb.test on Darwin 7.3 dlenev@brandersnatch.localdomain2004-05-252-0/+9
* | | Support for character set conversion in binary protocol: another gokonstantin@mysql.com2004-05-2530-529/+1060
|/ /
* | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1vva@eagle.mysql.r18.ru2004-05-245-103/+104
|\ \
| * \ Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1vva@eagle.mysql.r18.ru2004-05-245-103/+104
| |\ \
| | * | Introduced parameter object "ALTER_INFO" for mysql_alter_tablevva@eagle.mysql.r18.ru2004-05-215-103/+104
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-05-2486-1045/+1651
|\ \ \ \
| * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-05-2486-1045/+1651
| |\ \ \ \
| | * | | | After merge fixesmonty@mysql.com2004-05-2419-80/+118
| | * | | | Merge with 4.0, mainly to get changes to windows project filesmonty@mysql.com2004-05-2081-1008/+1576
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0sergefp@mysql.com2004-05-194-16/+48
| | | |\ \ \
| | | | * | | Fix for BUG33649: Post-review fixes sergefp@mysql.com2004-05-192-36/+34
| | | | * | | Fix and test case for BUG#3649.sergefp@mysql.com2004-05-183-29/+63
| | | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mysql.com2004-05-1964-338/+1570
| | | |\ \ \ \
| | | | * | | | Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'monty@mysql.com2004-05-1964-338/+1570
| | | * | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-05-194-11/+14
| | | |\ \ \ \ \
| | | | * | | | | Fix for BUG#3829 "Setting server_id on fly doesn't allow replication to start"guilhem@mysql.com2004-05-194-11/+14
| | | | |/ / / /
| | | * | | | | Fix for Bug#3754 "SET GLOBAL myisam_max_sort_file_size doesn't konstantin@mysql.com2004-05-193-3/+13
| | | |/ / / /
| | | * | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0ram@gw.mysql.r18.ru2004-05-183-0/+19
| | | |\ \ \ \
| | | | * | | | added newline at the end of the file.ram@gw.mysql.r18.ru2004-05-171-1/+1
| | | | * | | | A fix (bug #3756: ISNULL(QUOTE()) returns 1 for every row after 1st NULL)ram@gw.mysql.r18.ru2004-05-173-0/+19
| | | * | | | | mem0pool.c:heikki@hundin.mysql.fi2004-05-181-13/+5
| | | | |/ / / | | | |/| | |
| | | * | | | dict0dict.c:heikki@hundin.mysql.fi2004-05-171-1/+2
| | | * | | | InnoDB: srv0srv.c: Remove reference to sync0ipm.h (fix ChangeSet@1.1833)marko@hundin.mysql.fi2004-05-171-1/+0
| | | * | | | InnoDB: Remove unused module sync0ipmmarko@hundin.mysql.fi2004-05-176-472/+4
| | | * | | | InnoDB: Remove unused module os0shmmarko@hundin.mysql.fi2004-05-176-235/+4
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@brandersnatch.localdomain2004-05-243-9/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix for bug which caused temp_table.test fail on Darwin 7.3dlenev@brandersnatch.localdomain2004-05-243-9/+1
* | | | | | | Fix of small syntax error - added missing backslash that prevented building o...dlenev@brandersnatch.localdomain2004-05-241-1/+1
* | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1hf@deer.(none)2004-05-241-1/+7
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix for bug #3691 (libmysqld reports error 2 on CREATE DATABASE hf@deer.(none)2004-05-241-1/+7
* | | | | | | mysqlbinlog: new option --to-last-log. This option has effect only if --read-...guilhem@mysql.com2004-05-231-12/+19
* | | | | | | Merge bk-internal:/home/bk/mysql-4.1/serg@serg.mylan2004-05-2315-61/+116
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Fix for bug which caused grant.test fail on darwin7.3. We were converting db ...dlenev@brandersnatch.localdomain2004-05-226-17/+32
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@brandersnatch.localdomain2004-05-214-13/+28
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1hf@deer.(none)2004-05-214-13/+28
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Addition to the fix for bug #3791 (libmysqld mysql segfaults if can's find hf@deer.(none)2004-05-211-1/+3
| | | * | | | | Proposed fix for #3791 (embedded: mysql segfaults if cannot findhf@deer.(none)2004-05-171-1/+5
| | | * | | | | Proposed fix for #3744 (embedded server, wrong error message if database ishf@deer.(none)2004-05-173-12/+21
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@brandersnatch.localdomain2004-05-215-31/+56
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Moved testing of binlog_cache_use/binlog_cache_disk_use statistical variables...dlenev@brandersnatch.localdomain2004-05-195-31/+56
* | | | | | | | bug in repair_by_sort of fulltext indexes that contained identicalserg@serg.mylan2004-05-231-4/+3
* | | | | | | | Merge bk-internal:/home/bk/mysql-4.1/serg@serg.mylan2004-05-211-7/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | asserting table->file->enable_indexes() in union re-executionserg@serg.mylan2004-05-211-7/+10