summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Fix for bug #13820 (No warning on log(NEGATIVE))unknown2005-10-171-6/+32
* Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1unknown2005-10-141-15/+13
|\
| * Fix for Bug #13961 Triggers on tables with auto_increment insert bogus value...unknown2005-10-141-14/+16
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-141-4/+3
|\ \
| * | Fixed compile errors on windowsunknown2005-10-141-4/+3
* | | Merge mysql.com:/usr/home/bar/mysql-4.1.b13751unknown2005-10-141-1/+1
|\ \ \ | |/ / |/| |
| * | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-141-1/+1
| |\ \
| | * \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-141-1/+1
| | |\ \
| | | * | ctype_utf8.result, ctype_utf8.test:unknown2005-10-071-1/+1
| * | | | - set 'updating' in both tables list if we have two of them (because of subqu...unknown2005-10-141-2/+6
| |/ / /
* | | | Merge abarkov@bk-internal:/home/bk/mysql-5.0unknown2005-10-142-3/+8
|\ \ \ \
| * \ \ \ Merge abarkov@bk-internal:/home/bk/mysql-5.0unknown2005-10-132-3/+8
| |\ \ \ \
| | * | | | ctype_utf8.result, ctype_utf8.test:unknown2005-10-132-3/+8
* | | | | | Move handling of suffix_length from strnxfrm_bin() to filesort to ensure prop...unknown2005-10-145-22/+124
* | | | | | Merge mysql.com:/home/my/mysql-4.1unknown2005-10-132-3/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Fixes during review of new codeunknown2005-10-131-2/+3
| * | | | | mergingunknown2005-10-131-1/+1
| |\ \ \ \ \
| | * | | | | Fix for bug #3874 (Group by field is not considered)unknown2005-10-131-1/+1
| | * | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-10-094-1/+19
| | |\ \ \ \ \
* | | \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-134-14/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixes during review of new pushed codeunknown2005-10-134-14/+17
* | | | | | | | | Merge abarkov@bk-internal:/home/bk/mysql-5.0unknown2005-10-131-15/+5
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmpunknown2005-10-131-15/+5
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | / / / / | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-137-33/+43
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-4.1unknown2005-10-124-0/+23
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-8731bunknown2005-10-121-32/+5
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fix wait_timeout (and kill) handling on Mac OS X by cleaning up howunknown2005-10-111-32/+5
| | | | | |_|_|_|_|_|/ | | | | |/| | | | | |
| | | * | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-13344unknown2005-10-121-0/+8
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-13619unknown2005-10-121-1/+7
| | | |\ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-131-3/+9
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Fix bug#13535 Incorrect result from SELECT statement after SHOW TABLE STATUSunknown2005-10-031-3/+9
* | | | | | | | | | | | | Merge abarkov@bk-internal:/home/bk/mysql-5.0unknown2005-10-131-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | type_binary.result, type_binary.test:unknown2005-10-131-1/+2
* | | | | | | | | | | | | Manual merge of bug fix #7672unknown2005-10-134-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Manual mergedunknown2005-10-134-0/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | select.test, sql_select.cc, sql_lex.cc, item.cc:unknown2005-10-133-4/+15
| | * | | | | | | | | | | Manual merge, fix for bug #7672unknown2005-10-123-0/+12
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Fix bug#7672 Unknown column error in order clauseunknown2005-10-094-1/+19
* | | | | | | | | | | | | A post-review fix (Bug#12736)unknown2005-10-131-0/+1
* | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-133-1/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Mergeunknown2005-10-131-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Fix CAST(1.0e+300 TO SIGNED). (Bug #13344)unknown2005-09-221-0/+8
| * | | | | | | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmpunknown2005-10-131-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Handle errors returned by system crypt() in ENCRYPT(). (Bug #13619)unknown2005-10-061-1/+7
| | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | BUG#13343 CREATE|etc TRIGGER|VIEW|USER don't commit the transaction (inconsis...unknown2005-10-131-0/+15
* | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-136-14/+109
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | A fix and a test case for Bug#12736 "Server crash during a select".unknown2005-10-136-14/+109
* | | | | | | | | | | | | fixes after merge of 4.1.unknown2005-10-133-26/+7
* | | | | | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-121-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-121-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |