summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Expand)AuthorAgeFilesLines
* Adding rules for building blackhole, also updating test case.brian@zim.(none)2005-03-251-1/+1
* Resolving merge.brian@zim.(none)2005-03-251-0/+1
|\
| * Fix upgrade/downgrade issue. brian@zim.(none)2005-03-251-0/+1
| * Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1brian@zim.(none)2005-03-252-0/+16
| |\
* | \ Merging support for blackhole up to 5.0.brian@zim.(none)2005-03-254-0/+191
|\ \ \ | |/ /
| * | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1brian@zim.(none)2005-03-244-0/+191
| |\ \
| | * | Collection of changes per Bar and Serg.brian@zim.(none)2005-03-242-1202/+5
| | * | Additional storage engine called "blackhole". Customer request, and for that ...brian@zim.(none)2005-03-224-0/+1388
* | | | Many files:bar@eagle.intranet.mysql.r18.ru2005-03-254-17/+17
* | | | Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1bar@eagle.intranet.mysql.r18.ru2005-03-252-0/+16
|\ \ \ \ | | |_|/ | |/| |
| * | | Allow inserting of extra HKSCS and cp950 characters into a Big5 column.bar@mysql.com2005-03-252-0/+16
| |/ /
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2005-03-242-0/+34
| |\ \
| * \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2005-03-241-1/+1
| |\ \ \
| | * | | BUG#9303 blob field with specified length < 256 does not create tinyblobmsvensson@neptunus.(none)2005-03-241-1/+1
* | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0gluh@gluh.mysql.r18.ru2005-03-251-2/+2
|\ \ \ \ \
| * | | | | Fix for bug #8941: garbage MAX_ROWS=# from SHOW CREATE TABLE INFORMATION_SCHE...gluh@gluh.mysql.r18.ru2005-03-251-2/+2
* | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0gluh@gluh.mysql.r18.ru2005-03-252-0/+3
|\ \ \ \ \ \
| * | | | | | Bug #9317: Wrong count for tables in INFORMATION_SCHEMAgluh@gluh.mysql.r18.ru2005-03-242-0/+3
* | | | | | | func_str.result:bar@eagle.intranet.mysql.r18.ru2005-03-251-0/+20
* | | | | | | Mergebar@eagle.intranet.mysql.r18.ru2005-03-251-0/+14
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-03-242-0/+34
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fixed that LEFT OUTER JOIN was replaced with a regulat joinbar@mysql.com2005-03-242-0/+34
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2005-03-243-1/+11
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
* | | | | testing repl of timezone with LOAD DATA INFILE (hourra!)gbichot@quadita2.mysql.com2005-03-243-0/+36
* | | | | rpl_deadlock.result:gbichot@quadita2.mysql.com2005-03-241-1/+1
* | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0gbichot@quadita2.mysql.com2005-03-242-0/+10
|\ \ \ \ \
| * \ \ \ \ merge from 4.1gbichot@quadita2.mysql.com2005-03-242-0/+10
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge gbichot@bk-internal.mysql.com://home/bk/mysql-4.1gbichot@quadita2.mysql.com2005-03-232-0/+10
| | |\ \ \ \
| | | * | | | "After Monty's review" changes to the fix for BUG#8325 "Deadlock in replicati...gbichot@quadita2.mysql.com2005-03-232-0/+10
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2005-03-242-0/+32
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2005-03-233-1/+18
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2005-03-232-0/+32
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | / / | | |_|_|_|/ / | |/| | | | |
| | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2005-03-222-4/+4
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Merge neptunus.(none):/home/msvensson/mysql/bug9072msvensson@neptunus.(none)2005-03-223-30/+44
| | |\ \ \ \ \
| | * | | | | | BUG#9072 'Max_error_count' system variable cannot be set to zeromsvensson@neptunus.(none)2005-03-212-0/+32
* | | | | | | | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-03-233-1/+18
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0konstantin@mysql.com2005-03-232-0/+17
| |\ \ \ \ \ \ \
| | * | | | | | | A test case for Bug#6282 "Packet error with SELECT INTO"konstantin@mysql.com2005-03-232-0/+17
| | |/ / / / / /
| * | | | | | | Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1paul@kite-hub.kitebird.com2005-03-231-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | README:paul@kite-hub.kitebird.com2005-03-231-1/+1
| | | |_|/ / | | |/| | |
| | * | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-buildkent@mysql.com2005-03-222-4/+4
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-buildkent@mysql.com2005-03-213-30/+44
| | |\ \ \ \ | | | |_|/ / | | |/| | |
* | | | | | sql/sql_acl.ccserg@serg.mylan2005-03-235-22/+19
* | | | | | mergedserg@serg.mylan2005-03-237-29/+47
|\ \ \ \ \ \
| * \ \ \ \ \ Merge mysql.com:/data0/mysqldev/my/mysql-5.0-buildjimw@mysql.com2005-03-225-29/+28
| |\ \ \ \ \ \
| | * | | | | | Hack to ensure that CHAR's created in 5.0 are not converted to VARCHAR even ifjimw@mysql.com2005-03-225-29/+28
| * | | | | | | BUG#9339 - Updating a column does not work if the table has a UTF-8 VARCHAR p...serg@mysql.com2005-03-222-0/+16
| |/ / / / / /
| * | | | | | Mergemysqldev@mysql.com2005-03-225-28/+77
| |\ \ \ \ \ \
| | * | | | | | sql_acl.cc, sql_acl.h, sql_parse.ccmysqldev@mysql.com2005-03-225-28/+77
* | | | | | | | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-03-233-2/+108
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
View Lorry Controller Status