summaryrefslogtreecommitdiff
path: root/mysql-test/r
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/mysql_src/mysql-4.1guilhem@mysql.com2005-10-122-2/+25
|\
| * mergeguilhem@mysql.com2005-10-1219-5/+464
| |\
| | * sql_yacc.yy:grog@mysql.com2005-10-121-0/+1
| * | Fix for BUG#13023: "SQL Thread is up but doesn't move forward". Details in sl...guilhem@mysql.com2005-10-121-0/+22
* | | Merge mysql.com:/usr/local/bk/mysql-5.0pem@mysql.com2005-10-121-0/+38
|\ \ \
| * | | Fixed BUG#13510: Setting password local variable changes current passwordpem@mysql.com2005-10-111-0/+38
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-10-129-64/+86
|\ \ \ \
| * | | | Reviewing new pushed codemonty@mysql.com2005-10-125-25/+40
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-10-085-39/+46
| |\ \ \ \
| | * | | | Review of code pushed since last 5.0 pull:monty@mysql.com2005-10-069-65/+75
* | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2005-10-121-0/+22
|\ \ \ \ \ \
| * \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2005-10-111-0/+22
| |\ \ \ \ \ \
| | * | | | | | Fix bug#13327 check_equality() wasn't checking view's fieldsevgen@moonbone.local2005-10-101-0/+22
| | | |_|/ / / | | |/| | | |
* | | | | | | Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0eric@mysql.com2005-10-111-0/+15
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merginghf@deer.(none)2005-10-111-4/+4
| * | | | | | Merginghf@deer.(none)2005-10-111-0/+15
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1hf@deer.(none)2005-10-103-2/+32
| | |\ \ \ \ \
| | | * | | | | additional fix for bug #13372 (decimal union)hf@deer.(none)2005-09-271-1/+1
| | | * | | | | additional fix to the bug #13372 (decimal union)hf@deer.(none)2005-09-271-1/+1
| | | * | | | | Fix for bug #13372 (decimal union)hf@deer.(none)2005-09-272-1/+31
* | | | | | | | BUG#13724 conditionally added CONNECTION='connect string' for SHOW CREATE TABLEeric@mysql.com2005-10-101-0/+6
|/ / / / / / /
* | | | | | | After merge fixeslars@mysql.com2005-10-102-0/+9
* | | | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1lars@mysql.com2005-10-102-0/+73
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | BUG#12618: Removing fake lockinglars@mysql.com2005-10-101-0/+72
| * | | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2005-10-081-0/+6
| |\ \ \ \ \
| * | | | | | Populate t1 in order to get more predictable explain results.ramil@mysql.com2005-10-071-0/+1
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-10-071-0/+7
| |\ \ \ \ \ \
| | * | | | | | Review of new code since last pullmonty@mysql.com2005-10-071-0/+7
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0serg@serg.mylan2005-10-081-0/+6
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1serg@serg.mylan2005-10-081-0/+6
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Bug #10942 "deadlock with FLUSH TABLES WITH READ LOCK + STOP SLAVE"serg@serg.mylan2005-10-081-0/+6
* | | | | | | 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-061-3/+3
* | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2005-10-072-1/+58
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | BUG#13484: In ha_innobase::cmp_ref call Field::key_cmp() as this is the functionsergefp@mysql.com2005-10-012-1/+58
* | | | | | | Merge msdesk.(none):/home/msvensson/mysql-4.1msvensson@msdesk.(none)2005-10-069-0/+306
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-10-0510-0/+342
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-09-2910-0/+342
| | |\ \ \ \ \
| | | * \ \ \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-09-2810-0/+342
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-09-2310-0/+342
| | | | |\ \ \ \ \
| | | | | * | | | | Bug#13046: LIKE pattern matching using prefixbar@mysql.com2005-09-2110-0/+342
| * | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1jonas@perch.ndb.mysql.com2005-09-301-0/+1
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1jonas@perch.ndb.mysql.com2005-09-301-0/+1
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
* | | | | | | | | | | Bug#12935 Local and XA transactions not mutually exclusiveserg@serg.mylan2005-10-051-2/+10
* | | | | | | | | | | Bug#13143 - formatID should not affect XID's uniquenessserg@serg.mylan2005-10-051-0/+2
* | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |