summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Expand)AuthorAgeFilesLines
* mtr_cases.pl:cmiller@maint1.mysql.com2006-09-011-27/+31
* Bug #20908: Crash if select @@""cmiller@maint1.mysql.com2006-08-152-0/+17
* Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_mergekroki/tomash@moonlight.intranet2006-07-291-5/+5
|\
| * Bug#21218 Test "mysqlbinlog" fails to execute another program on Windowsmsvensson@neptunus.(none)2006-07-241-5/+6
* | udf_example.c, udf.test, Makefile.am:kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se2006-07-291-1/+1
* | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0tsmith@maint1.mysql.com2006-07-285-4855/+42
|\ \
| * \ Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-releasekroki/tomash@moonlight.intranet2006-07-275-4855/+42
| |\ \
| | * | "mysql-test-run.pl" must write a "Logging:" line for the evaluation of RPM bu...joerg@trift2.2006-07-251-0/+5
| | * | Merge patch for bug #15195 from 5.0 -> 5.0-release (for 5.0.24)tsmith@maint1.mysql.com2006-07-213-1/+12
| | * | A fix and a test case for Bug#21002 "Derived table not selecting from a kostja@bodhi.local2006-07-195-4855/+42
* | | | Merge siva.hindu.god:/usr/home/tim/m/bk/global-41tsmith/tim@siva.hindu.god2006-07-262-0/+17
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil/ram@mysql.com/myoffice.izhnet.ru2006-07-232-0/+17
| |\ \
| | * | Fix for #16327: invalid TIMESTAMP values retrievedramil@mysql.com2006-05-172-0/+17
| * | | Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1evgen@moonbone.local2006-07-1810-1/+205
| |\ \ \
* | \ \ \ Merge bk://anubis/mysql-5.0-enginesacurtis/antony@xiphis.org/ltantony.xiphis.org2006-07-214-1/+153
|\ \ \ \ \
| * | | | | "BUG #18764: Delete conditions causing inconsistencies in Federated tables"patg@govinda.patg.net2006-07-182-2/+0
| * | | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0-enginespatg@govinda.patg.net2006-07-182-0/+96
| |\ \ \ \ \
| | * | | | | "BUG #18764: Delete conditions causing inconsistencies in Federated tables"patg@govinda.patg.net2006-07-172-0/+95
| * | | | | | Merge bk-internal:/home/bk/mysql-5.0-enginesjimw@rama.(none)2006-07-182-1/+28
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0-enginesjimw@rama.(none)2006-07-112-1/+28
| | |\ \ \ \ \ \
| | | * | | | | | Bug #17766: The server accepts to create MERGE tables which cannot workjimw@rama.(none)2006-07-112-1/+28
| * | | | | | | | Bug #17608: String literals lost during INSERT query on FEDERATED tablejimw@rama.(none)2006-07-122-0/+31
* | | | | | | | | Partial merge of the patch for bug #15195 from 4.1 -> 5.0; more changes neededtsmith/tim@siva.hindu.god2006-07-203-1/+12
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil/ram@mysql.com/myoffice.izhnet.ru2006-07-143-1/+12
| |\ \ \ \ \ \ \ \
| | * | | | | | | | --{skip-}merge option added which allows the user to disable merge engine andramil/ram@mysql.com/myoffice.izhnet.ru2006-07-143-1/+12
* | | | | | | | | | Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-releasetnurnberg@salvation.intern.azundris.com2006-07-192-0/+238
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Bug#20989: View '(null).(null)' references invalid table(s)... on SQL SECURIT...tnurnberg@salvation.intern.azundris.com2006-07-192-0/+238
* | | | | | | | | | manual merge, part 2/2tnurnberg@salvation.intern.azundris.com2006-07-191-1/+0
* | | | | | | | | | Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-releasetnurnberg@salvation.intern.azundris.com2006-07-192-32/+79
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Bug# 20221- Dumping of multiple databases containing view(s) yields maleforme...iggy@rolltop.ignatz42.dyndns.org2006-07-172-0/+77
| * | | | | | | | | Bug#21014: Segmentation fault of mysqldump on viewtnurnberg@mysql.com/salvation.intern.azundris.com2006-07-142-0/+49
* | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2006-07-1813-122/+242
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 4.1 -> 5.0 mergeigreenhoe/greenman@anubis.greendragongames.com2006-07-141-3/+2
| * | | | | | | | | | Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0igreenhoe/greenman@anubis.greendragongames.com2006-07-1412-122/+200
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | 4.1 -> 5.0 merge fixesigreenhoe/greenman@anubis.greendragongames.com2006-07-143-27/+14
| | * | | | | | | | | | 4.1 -> 5.0 mergeigreenhoe/greenman@anubis.greendragongames.com2006-07-1311-109/+200
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maintcmiller@zippy.(none)2006-07-1314-0/+297
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1cmiller@zippy.(none)2006-07-112-1/+13
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge chilla.local:/home/mydev/mysql-4.1-bug17877ingo/mydev@chilla.local2006-07-082-0/+84
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2006-07-074-0/+44
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Bugs#17647: Trouble with "create database"bar@mysql.com2006-05-044-0/+44
| | | | * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1konstantin@bodhi.netgear2006-07-072-0/+39
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | A fix and a test case for Bug#19399 "res 'Lost Connection' when konstantin@bodhi.netgear2006-07-062-0/+39
| | | * | | | | | | | | | | | | Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-4.1-maintigreenhoe/greenman@anubis.greendragongames.com2006-07-1323-16/+535
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Fix for bug #15977 (switch ordering of DISABLE KEYS/LOCK TABLE in mysqldump)igreenhoe@mysql.com2006-06-211-52/+34
| * | | | | | | | | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0tnurnberg@mysql.com/salvation.intern.azundris.com2006-07-142-0/+79
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Bug#21014: Segmentation fault of mysqldump on viewtnurnberg@mysql.com/salvation.intern.azundris.com2006-07-142-0/+79
| | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.(none)2006-07-132-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0cmiller@zippy.(none)2006-07-132-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | A patch to Bug#17667 didn't take into consideration that the vardir, which co...cmiller@zippy.(none)2006-07-101-0/+1