summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Changed prototype of killed_ptr() to make it more portablemonty@mysql.com2004-05-266-9/+19
* merge with 4.0 to get Netware patches and fixes for libmysqld.dllmonty@mysql.com2004-05-251-7/+205
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mysql.com2004-05-251-8/+207
| |\
| | * Added patches from Novellmonty@mysql.com2004-05-251-8/+207
* | | changed comment for LONG_DATA_COMMANDkonstantin@mysql.com2004-05-251-3/+3
* | | sql_string.h:bar@bar.intranet.mysql.r18.ru2004-05-252-35/+0
* | | 1. Some optimization when conversion is not needed.bar@bar.intranet.mysql.r18.ru2004-05-254-21/+38
* | | Merge with 4.0 to get fixes for Windows project filesmonty@mysql.com2004-05-254-24/+17
|\ \ \ | |/ /
| * | New MYSQL_SERVER_SUFFIX usage (for easier compilation)monty@mysql.com2004-05-253-20/+9
| * | Fix for BUG#3871: a slave must always replicate a statement, even if it exami...guilhem@mysql.com2004-05-241-4/+8
* | | 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-2518-426/+757
|/ / /
* | | 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-2411-52/+106
|\ \ \ \ \
| * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-05-2411-52/+106
| |\ \ \ \ \
| | * | | | | After merge fixesmonty@mysql.com2004-05-242-3/+3
| | * | | | | Merge with 4.0, mainly to get changes to windows project filesmonty@mysql.com2004-05-209-49/+103
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0sergefp@mysql.com2004-05-192-16/+24
| | | |\ \ \ \
| | | | * | | | Fix for BUG33649: Post-review fixes sergefp@mysql.com2004-05-192-36/+34
| | | | * | | | Fix and test case for BUG#3649.sergefp@mysql.com2004-05-181-29/+39
| | | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mysql.com2004-05-195-30/+71
| | | |\ \ \ \ \
| | | | * | | | | Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'monty@mysql.com2004-05-195-30/+71
| | | * | | | | | 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-191-2/+2
| | | |/ / / / /
| | | * | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0ram@gw.mysql.r18.ru2004-05-181-0/+1
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | A fix (bug #3756: ISNULL(QUOTE()) returns 1 for every row after 1st NULL)ram@gw.mysql.r18.ru2004-05-171-0/+1
* | | | | | | | 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
* | | | | | | | 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
* | | | | | | | Merge bk-internal:/home/bk/mysql-4.1/serg@serg.mylan2004-05-236-17/+32
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | 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:/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
* | | | | | | assigning max_length parameter for Item_param (Bug #3811)bell@sanja.is.com.ua2004-05-201-0/+19
| |_|_|_|/ / |/| | | | |
* | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ram@gw.mysql.r18.ru2004-05-202-1/+20
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | A comment for str_to_datetime().ram@gw.mysql.r18.ru2004-05-201-0/+14
| * | | | | A fix (Bug #3728: Missing warning in 4.1).ram@gw.mysql.r18.ru2004-05-182-1/+6
* | | | | | after merge fixbell@sanja.is.com.ua2004-05-191-1/+2
* | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-05-1939-341/+450
|\ \ \ \ \ \
| * | | | | | Fixed BUG#3709: SELECT INTO 1 FROM DUAL not parsed as expectedpem@mysql.comhem.se2004-05-191-7/+7
| * | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1hf@deer.(none)2004-05-194-10/+9
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-05-191-2/+2
| | |\ \ \ \ \
| | | * | | | | Portability fixesmonty@mysql.com2004-05-191-2/+2
| | * | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1brian@brian-akers-computer.local2004-05-181-4/+2
| | |\ \ \ \ \ \
| | | * | | | | | Updating range_in_rows for the include file for ha_example (the main .cc file...brian@brian-akers-computer.local2004-05-181-4/+2
View Lorry Controller Status