summaryrefslogtreecommitdiff
path: root/mysql-test/r
Commit message (Expand)AuthorAgeFilesLines
* After merge fixesunknown2005-01-043-3/+8
* Mergeunknown2005-01-0410-14/+32
|\
| * Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEYunknown2005-01-0310-14/+32
| |\
| | * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-036-14/+25
| | |\
| | | * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-316-14/+25
| | | |\
| | * | \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-311-0/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flagunknown2004-12-311-0/+1
| | * | | Merged fixes for bug #7297 "Two digit year should be interpreted unknown2004-12-306-7/+7
| | * | | Manual merge of fix for bugs of #7297 and #7515 into 4.1 tree.unknown2004-12-302-2/+15
| | |\ \ \
| | | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-12-303-0/+98
| | | |\ \ \
| | | * | | | Fix for bug #7515 "from_unixtime(0) now returns NULL instead ofunknown2004-12-301-2/+5
| | | * | | | Fix for bug #7297 "Two digit year should be interpreted correctlyunknown2004-12-161-0/+10
| | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-301-5/+1
| | |\ \ \ \ \
| | | * | | | | Fix func_concat.result: allow -0.00 to be converted to string both with and w...unknown2004-12-301-5/+1
| | * | | | | | Fix for bug #6914 "Problems using time()/date() output in expressions".unknown2004-12-301-0/+9
| | |/ / / / /
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-045-6/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Better handling of ensuring that setup_tables() are not called twiceunknown2005-01-035-6/+6
* | | | | | | mysql-test/r/multi_update.result, mysql-test/t/multi_update.testunknown2005-01-041-6/+2
|/ / / / / /
* | | | | | Streamlined code for trim, ltrim and rtrimunknown2005-01-021-0/+9
* | | | | | post-mergeunknown2004-12-318-59/+58
* | | | | | manually mergedunknown2004-12-3116-21/+273
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | post-mergeunknown2004-12-316-14/+25
| * | | | | mergedunknown2004-12-302-4/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | unsufficient privilege checks in GRANT, when a grantor has column-level privi...unknown2004-12-303-5/+5
| | | |/ / | | |/| |
| * | | | Merge mysql.com:/home/timka/mysql/src/4.1-virginunknown2004-12-281-0/+6
| |\ \ \ \
| | * | | | Fix for BUG#7455.unknown2004-12-281-0/+6
| * | | | | WL#2319 V2: Exclude tables from dumpunknown2004-12-271-0/+33
| |/ / / /
| * | | | Merge mysql.com:/home/timka/mysql/src/4.1-virginunknown2004-12-271-0/+5
| |\ \ \ \
| | * | | | Fix for BUG#7377. This fix adds the same implementation for ha_myisammgr::ind...unknown2004-12-271-0/+5
| * | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2004-12-261-5/+32
| |\ \ \ \ \
| | * | | | | subselect.result, subselect.test:unknown2004-12-261-0/+12
| | * | | | | subselect.result, subselect.test:unknown2004-12-251-5/+20
| | |/ / / /
| * | | | | additional 4.0 -> 4.1 merge !!unknown2004-12-251-1/+0
| * | | | | 4.0 -> 4.1 mergeunknown2004-12-241-0/+7
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-12-231-0/+22
| | |\ \ \ \
| | * | | | | Fix for a bug #7495unknown2004-12-231-12/+6
| | * | | | | A fix for the bug #7495unknown2004-12-221-0/+12
| * | | | | | Manual merge of changes making GRANTs, which change SSL attributes and/orunknown2004-12-231-0/+22
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Make GRANTs, which change SSL attributes and/or user limits,unknown2004-12-231-0/+22
| | |/ / / /
| * | | | | incorrect result fixedunknown2004-12-231-2/+2
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-221-0/+3
| |\ \ \ \ \
| | * | | | | Fix for bug #7458 "Microseconds are gobbled from the string result of unknown2004-12-221-0/+3
| * | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-221-0/+18
| |\ \ \ \ \ \
| | * | | | | | ndb: bug#7340 fixunknown2004-12-221-0/+18
| * | | | | | | Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8unknown2004-12-221-0/+106
| | |_|_|/ / / | |/| | | | |
| * | | | | | Bug#7302: UCS2 data in ENUM field get truncated when new column is addedunknown2004-12-211-0/+11
| | |_|_|_|/ | |/| | | |
| * | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-218-18965/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-213-1/+62
| |\ \ \ \ \ \
| * | | | | | | A fix (bug #7281: RAND(RAND) crashes server).unknown2004-12-201-0/+2
* | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-311-3/+0
|\ \ \ \ \ \ \ \