summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Expand)AuthorAgeFilesLines
* Manual mergeigor@rurik.mysql.com2005-08-024-0/+33
|\
| * Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1svoj@mysql.com2005-08-022-0/+14
| |\
| | * Fix for BUG#12075.svoj@mysql.com2005-08-022-0/+14
| * | Merge mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.0svoj@mysql.com2005-08-022-0/+19
| |\ \
| | * | BUG#11684 fix.svoj@mysql.com2005-08-022-0/+19
* | | | Fix two test results that were merged out-of-order.jimw@mysql.com2005-08-012-24/+34
* | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-08-017-10/+73
|\ \ \ \ | |/ / /
| * | | Merge mysql.com:/home/jimw/my/mysql-4.1-11402jimw@mysql.com2005-08-012-0/+8
| |\ \ \
| | * | | Fix multiplication of abs() by a negative value. (Bug #11402)jimw@mysql.com2005-06-222-0/+8
| * | | | Merge mysql.com:/home/jimw/my/mysql-4.1-10724jimw@mysql.com2005-08-015-10/+55
| |\ \ \ \
| | * | | | Don't force column header to @@session.var_name if @@local.var_namejimw@mysql.com2005-07-255-10/+55
* | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-08-012-0/+83
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1sasha@asksasha.com2005-08-012-0/+83
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | updates for BUG#10780 - fixed slave I/O thread running status to No while att...sasha@asksasha.com2005-07-292-2/+34
| | * | | | testcase for bug 10780 was not added in the previous commitsasha@asksasha.com2005-07-281-0/+28
| | * | | | patch for bug 10780sasha@asksasha.com2005-07-281-0/+23
* | | | | | Fix crash in 'INSERT DELAYED' statement that failed due to ajimw@mysql.com2005-08-012-0/+16
* | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold@mysql.com2005-08-012-2/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-releasemskold@mysql.com2005-08-012-2/+2
| |\ \ \ \ \ \
| | * | | | | | Fix for bug#12021mskold@mysql.com2005-07-312-2/+2
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mishka.local2005-07-318-171/+205
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mishka.local2005-07-318-171/+205
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixes during review of new pushed codemonty@mishka.local2005-07-318-180/+209
* | | | | | | | | | Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0igor@rurik.mysql.com2005-07-312-4/+4
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | null_key.result, null_key.test:igor@rurik.mysql.com2005-07-312-4/+4
* | | | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-5.0igor@rurik.mysql.com2005-07-314-2/+170
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Manual mergeigor@rurik.mysql.com2005-07-281-0/+7
| * | | | | | | | | Manual mergeigor@rurik.mysql.com2005-07-284-7/+168
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | / / / / / / / | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | func_gconcat.result, func_gconcat.test:igor@rurik.mysql.com2005-07-282-0/+64
| | * | | | | | | null_key.test, null_key.result:igor@rurik.mysql.com2005-07-282-17/+6
| | * | | | | | | null_key.test, null_key.result:igor@rurik.mysql.com2005-07-282-6/+66
| | * | | | | | | Manual mergeigor@rurik.mysql.com2005-07-282-0/+56
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | sql_select.cc:igor@rurik.mysql.com2005-07-282-0/+57
* | | | | | | | | postmerge-fixbell@sanja.is.com.ua2005-07-303-25/+14
* | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2005-07-297-29/+147
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added sql_mode saving to mysql_dump (BUG#5891, part 2)bell@sanja.is.com.ua2005-07-294-33/+67
| * | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2005-07-283-8/+92
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | store/restore sql_mode which was in force during ctrigger creation (BUG#5891)bell@sanja.is.com.ua2005-07-283-8/+92
* | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-10351jimw@mysql.com2005-07-294-19/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix for handling of unsigned long options on 32-bit platforms thatjimw@mysql.com2005-07-284-19/+9
* | | | | | | | | | | Fix for bug #12173 (show create table crash)hf@deer.(none)2005-07-292-0/+18
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-07-295-4/+46
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-5.0-10351jimw@mysql.com2005-07-282-0/+22
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Fix value returned from SELECT of unsigned long systemjimw@mysql.com2005-07-222-0/+22
| * | | | | | | | | | row_sel_store_mysql_rec(): Convert NULL true VARCHAR columnsmarko@hundin.mysql.fi2005-07-281-4/+4
| * | | | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0gluh@mysql.com2005-07-282-0/+20
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix for bug#12127 triggers do not show in info_schema before they are used if...gluh@eagle.intranet.mysql.r18.ru2005-07-272-0/+20
* | | | | | | | | | | | After merge fixesmonty@mysql.com2005-07-284-157/+153
* | | | | | | | | | | | Merge mysql.com:/home/my/mysql-4.1monty@mysql.com2005-07-28346-116/+768
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Added end marker for tests to make future merges easiermonty@mysql.com2005-07-28347-24/+660