summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-267-66/+141
|\
| * Merge mysql.com:/home/mydev/mysql-5.0--mainunknown2006-06-267-66/+141
| |\
| | * Bug#16986 - Deadlock condition with MyISAM tablesunknown2006-06-267-66/+141
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-267-16/+85
|\ \ \ | |/ / |/| |
| * | Bug#20616: drop_temp_table test fails on Windows platformunknown2006-06-232-9/+16
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2006-06-221-0/+2
| |\ \
| | * | Bug#19904: UDF: not initialized *is_null per rowunknown2006-06-081-0/+2
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-214-7/+67
| |\ \ \
| | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-204-7/+67
| | |\ \ \
| | | * \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2006-06-194-7/+67
| | | |\ \ \
| | | | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2006-06-141-2/+2
| | | | |\ \ \
| | | | | * | | Bug#19262: internal function create_typelib() uses DBUG_ENTER() but not DBUG_...unknown2006-06-141-2/+2
| | | | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2006-06-123-5/+65
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | | * | | Bug #16206: Superfluous COMMIT event in binlog when updating BDB in autocommit unknown2006-06-123-5/+65
* | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-232-5/+39
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge mysql.com:/opt/local/work/mysql-5.0-rootunknown2006-06-222-5/+39
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | A fix and a test case for Bug#15217 "Using a SP cursor on a table createdunknown2006-06-221-1/+3
| | * | | | | | | Fix for bug#19634 "Re-execution of multi-delete which involve trigger/storedunknown2006-06-211-4/+36
| | | |/ / / / / | | |/| | | | |
* | | | | | | | Merge moonbone.local:/work/tmp_merge-4.1-opt-mysqlunknown2006-06-231-21/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Bug#11228: DESC shows arbitrary column as "PRI"unknown2006-06-231-21/+0
| * | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-06-221-13/+7
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixed bug #14896.unknown2006-06-221-13/+7
* | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-221-13/+6
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-211-0/+20
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-211-0/+6
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge bk://localhost:5559unknown2006-06-211-10/+3
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Cleanup to patch for Bug#18246, "compilation error with tcp_wrapper"unknown2006-06-211-10/+3
| * | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-212-3/+10
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-211-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Fix for Bug#18246 "compilation error with tcp_wrapper"unknown2006-06-211-3/+3
* | | | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-06-224-3/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-224-3/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-211-0/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Bug#19437 (Connection refused by server: "2002 Can't connect... /master.sock"):unknown2006-06-201-0/+20
| | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Merge may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1unknown2006-06-211-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | / / / / / / | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge april:devel/BitKeeper/mysql-4.1unknown2006-06-211-0/+6
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | BUG#20357 - Got error 124 from storage engine using MIN and MAXunknown2006-06-211-0/+6
| | * | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-212-3/+10
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Merge mysql.com:/home/marty/MySQL/mysql-5.0-backedunknown2006-06-212-3/+10
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Fix for Bug #19906 REPLACE doesn't update TEXT fields correctlyunknown2006-06-212-3/+10
* | | | | | | | | | | | Merge mysql.com:/home/kgeorge/mysql/5.0/teamcleanunknown2006-06-211-9/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ merge of the changes for bug #18080unknown2006-06-211-9/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list errorunknown2006-06-191-9/+0
| | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge mysql.com:/home/kgeorge/mysql/5.0/teamcleanunknown2006-06-213-10/+34
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Bug #20482: failure on Create join view with sources views/tables in different unknown2006-06-213-10/+34
* | | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-06-218-72/+81
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | field.cc, field.h:unknown2006-06-213-24/+24
| * | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-212-3/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Manually mergedunknown2006-06-201-1/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | select.result:unknown2006-06-201-1/+2
View Lorry Controller Status