summaryrefslogtreecommitdiff
path: root/mysql-test/r
Commit message (Expand)AuthorAgeFilesLines
* Merge abarkov@bk-internal:/home/bk/mysql-5.0unknown2005-10-1313-177/+290
|\
| * type_binary.result, type_binary.test:unknown2005-10-1313-177/+290
* | Manual merge of bug fix #7672unknown2005-10-131-0/+10
|\ \
| * \ Manual mergedunknown2005-10-131-0/+10
| |\ \
| | * \ Manual merge, fix for bug #7672unknown2005-10-121-0/+10
| | |\ \
| | | * | Fix bug#7672 Unknown column error in order clauseunknown2005-10-091-0/+10
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-133-0/+440
|\ \ \ \ \
| * \ \ \ \ Mergeunknown2005-10-131-0/+3
| |\ \ \ \ \
| | * | | | | Fix CAST(1.0e+300 TO SIGNED). (Bug #13344)unknown2005-09-221-0/+3
| * | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmpunknown2005-10-131-0/+3
| |\ \ \ \ \ \
| | * | | | | | Handle errors returned by system crypt() in ENCRYPT(). (Bug #13619)unknown2005-10-061-0/+3
| * | | | | | | BUG#13343 CREATE|etc TRIGGER|VIEW|USER don't commit the transaction (inconsis...unknown2005-10-131-0/+434
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-131-0/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | A fix and a test case for Bug#12736 "Server crash during a select".unknown2005-10-131-0/+20
* | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-136-1/+254
|\ \ \ \ \ \ \ \
| * | | | | | | | BUG# 13052unknown2005-10-121-0/+184
| * | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-131-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | replace port number with string identifier so that it may have different port...unknown2005-10-121-1/+1
| * | | | | | | | | fixes after merge of 4.1.unknown2005-10-131-2/+2
| * | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-121-0/+8
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-121-0/+8
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Temporary solution for bug #13969 "Routines which are replicated from masterunknown2005-10-121-0/+8
| * | | | | | | | | | Merge mysql.com:/home/mysql_src/mysql-4.1unknown2005-10-122-2/+25
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | / / / / | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | mergeunknown2005-10-1219-5/+464
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | sql_yacc.yy:unknown2005-10-121-0/+1
| | * | | | | | | | | Fix for BUG#13023: "SQL Thread is up but doesn't move forward". Details in sl...unknown2005-10-121-0/+22
| * | | | | | | | | | Merge mysql.com:/usr/local/bk/mysql-5.0unknown2005-10-121-0/+38
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixed BUG#13510: Setting password local variable changes current passwordunknown2005-10-111-0/+38
| | | |_|_|/ / / / / / | | |/| | | | | | | |
* | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-1214-64/+211
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-129-64/+86
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Reviewing new pushed codeunknown2005-10-125-25/+40
| | * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-085-39/+46
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Review of code pushed since last 5.0 pull:unknown2005-10-069-65/+75
| * | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-121-0/+22
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-111-0/+22
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | | * | | | | | | | | | Fix bug#13327 check_equality() wasn't checking view's fieldsunknown2005-10-101-0/+22
| | | | |_|/ / / / / / / | | | |/| | | | | | | |
| * | | | | | | | | | | Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-111-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Mergingunknown2005-10-111-4/+4
| | * | | | | | | | | | Mergingunknown2005-10-111-0/+15
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1unknown2005-10-103-2/+32
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | additional fix for bug #13372 (decimal union)unknown2005-09-271-1/+1
| | | | * | | | | | | | | additional fix to the bug #13372 (decimal union)unknown2005-09-271-1/+1
| | | | * | | | | | | | | Fix for bug #13372 (decimal union)unknown2005-09-272-1/+31
| | | | | |_|_|_|_|_|/ / | | | | |/| | | | | | |
| * | | | | | | | | | | BUG#13724 conditionally added CONNECTION='connect string' for SHOW CREATE TABLEunknown2005-10-101-0/+6
| |/ / / / / / / / / /
| * | | | | | | | | | After merge fixesunknown2005-10-102-0/+9
| * | | | | | | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1unknown2005-10-102-0/+73
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | / / / / / / / | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | BUG#12618: Removing fake lockingunknown2005-10-101-0/+72
| | * | | | | | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-10-081-0/+6
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Populate t1 in order to get more predictable explain results.unknown2005-10-071-0/+1
| | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-071-0/+7
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |