summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmpjani@ua141d10.elisa.omakaista.fi2005-10-131-15/+5
|\
| * Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1evgen@moonbone.local2005-10-137-33/+43
| |\
| | * Merge bk-internal:/home/bk/mysql-4.1jimw@mysql.com2005-10-124-0/+23
| | |\
| | * \ Merge mysql.com:/home/jimw/my/mysql-4.1-8731bjimw@mysql.com2005-10-121-32/+5
| | |\ \
| | | * | Fix wait_timeout (and kill) handling on Mac OS X by cleaning up howjimw@mysql.com2005-10-111-32/+5
| | * | | Merge mysql.com:/home/jimw/my/mysql-4.1-13344jimw@mysql.com2005-10-121-0/+8
| | |\ \ \
| | * \ \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-13619jimw@mysql.com2005-10-121-1/+7
| | |\ \ \ \
| * | \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1evgen@moonbone.local2005-10-131-3/+9
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix bug#13535 Incorrect result from SELECT statement after SHOW TABLE STATUSevgen@moonbone.local2005-10-031-3/+9
* | | | | | | Manual merge of bug fix #7672evgen@moonbone.local2005-10-134-0/+24
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Manual mergedevgen@moonbone.local2005-10-134-0/+23
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | select.test, sql_select.cc, sql_lex.cc, item.cc:evgen@moonbone.local2005-10-133-4/+15
| | * | | | | Manual merge, fix for bug #7672evgen@moonbone.local2005-10-123-0/+12
| | |\ \ \ \ \
| | | * | | | | Fix bug#7672 Unknown column error in order clauseevgen@moonbone.local2005-10-094-1/+19
* | | | | | | | A post-review fix (Bug#12736)konstantin@mysql.com2005-10-131-0/+1
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0konstantin@mysql.com2005-10-133-1/+30
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Mergekent@mysql.com2005-10-131-0/+8
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Fix CAST(1.0e+300 TO SIGNED). (Bug #13344)jimw@mysql.com2005-09-221-0/+8
| * | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmpkent@mysql.com2005-10-131-1/+7
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Handle errors returned by system crypt() in ENCRYPT(). (Bug #13619)jimw@mysql.com2005-10-061-1/+7
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | BUG#13343 CREATE|etc TRIGGER|VIEW|USER don't commit the transaction (inconsis...elliot@mysql.com2005-10-131-0/+15
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0konstantin@mysql.com2005-10-136-14/+109
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | A fix and a test case for Bug#12736 "Server crash during a select".konstantin@mysql.com2005-10-136-14/+109
* | | | | | | | fixes after merge of 4.1.guilhem@mysql.com2005-10-133-26/+7
* | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0guilhem@mysql.com2005-10-121-0/+15
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-10-121-0/+15
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Temporary solution for bug #13969 "Routines which are replicated from masterdlenev@mysql.com2005-10-121-0/+15
* | | | | | | | | | Merge mysql.com:/home/mysql_src/mysql-4.1guilhem@mysql.com2005-10-125-38/+182
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | mergeguilhem@mysql.com2005-10-127-115/+162
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | sql_yacc.yy:grog@mysql.com2005-10-121-1/+4
| * | | | | | | | | | Fix for BUG#13023: "SQL Thread is up but doesn't move forward". Details in sl...guilhem@mysql.com2005-10-125-41/+174
* | | | | | | | | | | slave.cc:guilhem@mysql.com2005-10-121-1/+18
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | To help people avoid BUG#2122 "changing hostname confuses master or slave" un...guilhem@mysql.com2005-10-111-1/+18
* | | | | | | | | | | Merge mysql.com:/usr/local/bk/mysql-5.0pem@mysql.com2005-10-121-2/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix compile error on Windows: remove wrong typecastsergefp@mysql.com2005-10-121-2/+1
* | | | | | | | | | | | Merge mysql.com:/usr/local/bk/mysql-5.0pem@mysql.com2005-10-122-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixed BUG#13510: Setting password local variable changes current passwordpem@mysql.com2005-10-112-0/+25
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge mysql.com:/usr/local/bk/mysql-5.0pem@mysql.com2005-10-121-1/+3
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/usr/local/bk/mysql-5.0pem@mysql.com2005-10-121-1/+3
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixed BUG#13616: "CALL <dbname>.<procedurename>" executes properly, butpem@mysql.com2005-10-051-1/+3
* | | | | | | | | | | | | after merge fixgluh@eagle.intranet.mysql.r18.ru2005-10-122-40/+42
* | | | | | | | | | | | | 4.1->5.0 mergegluh@mysql.com2005-10-122-1/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Fix for bug#9270 multiple SSL race conditions (for 5.0 tree)gluh@eagle.intranet.mysql.r18.ru2005-10-111-0/+97
| * | | | | | | | | | | | Added missing HAVE_REPLICATION definelars@mysql.com2005-10-101-1/+3
* | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-10-1228-347/+312
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Reviewing new pushed codemonty@mysql.com2005-10-1221-142/+149
| * | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-10-0814-205/+163
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Simple changes during review of codemonty@mysql.com2005-10-083-61/+37
| | * | | | | | | | | | | | Review of code pushed since last 5.0 pull:monty@mysql.com2005-10-0613-133/+109
* | | | | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2005-10-121-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status