summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Expand)AuthorAgeFilesLines
* After merge fixeslars@mysql.com2005-10-102-0/+9
* Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1lars@mysql.com2005-10-105-0/+138
|\
| * BUG#12618: Removing fake lockinglars@mysql.com2005-10-102-0/+131
| * Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2005-10-082-0/+16
| |\
| * | Populate t1 in order to get more predictable explain results.ramil@mysql.com2005-10-072-0/+3
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-10-072-0/+11
| |\ \
| | * | Review of new code since last pullmonty@mysql.com2005-10-072-0/+11
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0serg@serg.mylan2005-10-082-0/+16
|\ \ \ \
| * \ \ \ Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1serg@serg.mylan2005-10-082-0/+16
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Bug #10942 "deadlock with FLUSH TABLES WITH READ LOCK + STOP SLAVE"serg@serg.mylan2005-10-082-0/+16
* | | | | after merge fixgluh@eagle.intranet.mysql.r18.ru2005-10-071-3/+2
* | | | | 4.1 -> 5.0 mergegluh@mysql.com2005-10-071-2/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fix for bug#13605 'rpl_openssl' test hangsgluh@eagle.intranet.mysql.r18.ru2005-10-062-4/+4
* | | | | Fix for bug#13202 SELECT * INTO OUTFILE ... FROM information_schema.schemata ...gluh@eagle.intranet.mysql.r18.ru2005-10-071-0/+18
* | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2005-10-073-1/+102
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | BUG#13484: In ha_innobase::cmp_ref call Field::key_cmp() as this is the functionsergefp@mysql.com2005-10-013-1/+102
* | | | | Merge msdesk.(none):/home/msvensson/mysql-4.1msvensson@msdesk.(none)2005-10-0620-218/+341
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | ndb - prelim perl scripts to autotestpekka@mysql.com2005-10-061-138/+0
| * | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-10-0521-0/+379
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-09-2921-0/+379
| | |\ \ \
| | | * \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-09-2821-0/+379
| | | |\ \ \
| | | | * \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-09-2321-0/+379
| | | | |\ \ \
| | | | | * | | Bug#13046: LIKE pattern matching using prefixbar@mysql.com2005-09-2121-0/+379
| * | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1jonas@perch.ndb.mysql.com2005-09-302-0/+2
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1jonas@perch.ndb.mysql.com2005-09-302-0/+2
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
* | | | | | | | | Bug#12935 Local and XA transactions not mutually exclusiveserg@serg.mylan2005-10-052-2/+22
* | | | | | | | | Bug#13143 - formatID should not affect XID's uniquenessserg@serg.mylan2005-10-052-0/+4
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0serg@serg.mylan2005-10-041-3/+3
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-releaseserg@serg.mylan2005-10-041-3/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | innodb.result:serg@mysql.com2005-10-041-3/+3
* | | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0brian@zim.(none)2005-10-031-6/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Final patch for 5.0 for simplifying storage engine code. We now have just one...brian@zim.(none)2005-10-031-6/+6
* | | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com2005-10-047-16/+237
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/timka/mysql/src/5.0-virgintimour@mysql.com2005-10-032-0/+12
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix for BUG#13410 - qualified reference to a view column in the HAVING clause...timour@mysql.com2005-10-012-0/+12
| * | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0msvensson@neptunus.(none)2005-10-035-16/+225
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2005-09-305-16/+225
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Bug #13231 mysqltest: fails to dectect when mysql_next_result failsmsvensson@neptunus.(none)2005-09-292-13/+199
| | | * | | | | | | | | | | Bug #13231 mysqltest: fails to dectect when mysql_next_result failsmsvensson@neptunus.(none)2005-09-213-3/+26
* | | | | | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com2005-10-032-1/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0eric@mysql.com2005-09-302-1/+69
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Move handler specific options into handlerton flag checkeric@mysql.com2005-09-302-1/+69
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com2005-10-0116-23/+882
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | WL#2789 "Instance Manager: test using mysql-test-run testing framework"anozdrin@mysql.com2005-10-0113-0/+835
| * | | | | | | | | | | | WL#2789 "Instance Manager: test using mysql-test-run testing framework"anozdrin@mysql.com2005-10-013-23/+47
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-releasekent@mysql.com2005-10-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | init_db.sql:kent@mysql.com2005-10-011-1/+1
* | | | | | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-releasekent@mysql.com2005-09-302-31/+81
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | / / / / / / / / / / | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge mysqldev@production.mysql.com:my/mysql-5.0-releasekent@mysql.com2005-09-302-31/+81
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug#11238serg@serg.mylan2005-09-302-31/+81