summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Expand)AuthorAgeFilesLines
* Merge bk://anubis/mysql-5.0-enginesunknown2006-07-214-1/+153
|\
| * "BUG #18764: Delete conditions causing inconsistencies in Federated tables"unknown2006-07-182-2/+0
| * Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0-enginesunknown2006-07-182-0/+96
| |\
| | * "BUG #18764: Delete conditions causing inconsistencies in Federated tables"unknown2006-07-172-0/+95
| * | Merge bk-internal:/home/bk/mysql-5.0-enginesunknown2006-07-182-1/+28
| |\ \
| | * \ Merge bk-internal:/home/bk/mysql-5.0-enginesunknown2006-07-112-1/+28
| | |\ \
| | | * | Bug #17766: The server accepts to create MERGE tables which cannot workunknown2006-07-112-1/+28
| * | | | Bug #17608: String literals lost during INSERT query on FEDERATED tableunknown2006-07-122-0/+31
* | | | | Partial merge of the patch for bug #15195 from 4.1 -> 5.0; more changes neededunknown2006-07-203-1/+12
|\ \ \ \ \
| * \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-07-143-1/+12
| |\ \ \ \ \
| | * | | | | --{skip-}merge option added which allows the user to disable merge engine andunknown2006-07-143-1/+12
* | | | | | | Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-releaseunknown2006-07-192-0/+238
|\ \ \ \ \ \ \
| * | | | | | | Bug#20989: View '(null).(null)' references invalid table(s)... on SQL SECURIT...unknown2006-07-192-0/+238
* | | | | | | | manual merge, part 2/2unknown2006-07-191-1/+0
* | | | | | | | Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-releaseunknown2006-07-192-32/+79
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Bug# 20221- Dumping of multiple databases containing view(s) yields maleforme...unknown2006-07-172-0/+77
| * | | | | | | Bug#21014: Segmentation fault of mysqldump on viewunknown2006-07-142-0/+49
* | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-07-1813-122/+242
|\ \ \ \ \ \ \ \
| * | | | | | | | 4.1 -> 5.0 mergeunknown2006-07-141-3/+2
| * | | | | | | | Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-07-1412-122/+200
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 4.1 -> 5.0 merge fixesunknown2006-07-143-27/+14
| | * | | | | | | | 4.1 -> 5.0 mergeunknown2006-07-1311-109/+200
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2006-07-1314-0/+297
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-07-112-1/+13
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge chilla.local:/home/mydev/mysql-4.1-bug17877unknown2006-07-082-0/+84
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-07-074-0/+44
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Bugs#17647: Trouble with "create database"unknown2006-05-044-0/+44
| | | | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-07-072-0/+39
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | A fix and a test case for Bug#19399 "res 'Lost Connection' when unknown2006-07-062-0/+39
| | | * | | | | | | | | | | Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2006-07-1323-16/+535
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Fix for bug #15977 (switch ordering of DISABLE KEYS/LOCK TABLE in mysqldump)unknown2006-06-211-52/+34
| * | | | | | | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-07-142-0/+79
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Bug#21014: Segmentation fault of mysqldump on viewunknown2006-07-142-0/+79
| | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-07-132-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0unknown2006-07-132-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | A patch to Bug#17667 didn't take into consideration that the vardir, which co...unknown2006-07-101-0/+1
| | | * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2006-06-291-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2006-06-281-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | Fix for bug #18979, bad RE in mysql-test-run.plunknown2006-04-171-1/+1
| * | | | | | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.0-ktunknown2006-07-1329-54/+1266
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge mysql.com:/usr/home/bar/mysql-5.0unknown2006-07-072-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | func_str.result, func_str.test:unknown2006-07-072-0/+8
* | | | | | | | | | | | | | | | | Merge moonbone.local:/work/tmp_merge-4.1-opt-mysqlunknown2006-07-184-1/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge moonbone.local:/work/mysql-4.1unknown2006-07-184-1/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Bug#20432: mysql client interprets commands in commentsunknown2006-07-132-0/+33
| | | |_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Bug#20729: Bad date_format() call makes mysql server crashunknown2006-07-112-1/+13
| * | | | | | | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-optunknown2006-07-142-0/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | Post-merge fix.unknown2006-07-171-0/+1
* | | | | | | | | | | | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-07-176-12/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-07-174-8/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \