summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1unknown2006-11-3097-3231/+5201
|\
| * Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0unknown2006-11-301-0/+15
| |\
| | * #18487 UPDATE IGNORE not supported for unique constraint violation of non-pr...unknown2006-11-301-0/+15
| | * bug#21507 I can't create a unique hash index in NDB: Added possibillity to cr...unknown2006-11-072-51/+211
| * | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2006-11-3015-155/+314
| |\ \
| | * | A post-merge fix: fix the failing trigger-grant.test.unknown2006-11-301-16/+16
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-11-303-33/+101
| | |\ \
| | | * \ Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0unknown2006-11-291-0/+2
| | | |\ \
| | | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-11-2961-517/+1825
| | | |\ \ \
| | | * \ \ \ Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0unknown2006-11-221-3/+7
| | | |\ \ \ \
| | | * \ \ \ \ Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0unknown2006-11-212-15/+2
| | | |\ \ \ \ \
| | | * | | | | | Fix of debbuging mode of query cache (proposed by Monty reviewed by me).unknown2006-11-171-18/+24
| | | * | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0unknown2006-11-163-4/+17
| | | |\ \ \ \ \ \
| | | * | | | | | | Bug#23703 (DROP TRIGGER needs an IF EXISTS)unknown2006-11-132-29/+80
| | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2006-11-3036-248/+1180
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-11-2936-248/+1180
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20637unknown2006-11-291-0/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | / / | | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
| | | * | | | | | | | BUG#20637: "load data concurrent infile" locks the tableunknown2006-11-291-0/+2
| | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-11-2980-2696/+3523
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1unknown2006-11-221-3/+7
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21635unknown2006-11-221-3/+7
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21635unknown2006-11-221-3/+7
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | BUG#21635: MYSQL_FIELD struct's member strings seem to misbehave forunknown2006-11-221-3/+7
| | * | | | | | | | | | Update after merge.unknown2006-11-211-1/+11
| | * | | | | | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23159unknown2006-11-212-13/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | / / / | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | | * | | | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23159unknown2006-11-212-15/+2
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | BUG#23159: prepared_stmt_count should be status variableunknown2006-11-212-14/+2
| | * | | | | | | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2006-11-165-83/+91
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions)unknown2006-11-165-83/+91
| | * | | | | | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug17047unknown2006-11-163-4/+17
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | | * | | | | | | | | Add 5.0 part of fix for bug 17047.unknown2006-11-162-3/+17
| | | * | | | | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug17047unknown2006-11-161-1/+0
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | BUG#17047: CHAR() and IN() can return NULL without signaling NULL resultunknown2006-11-161-1/+0
| | | | | |_|_|/ / / / / | | | | |/| | | | | | |
| | * | | | | | | | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2006-11-154-3/+67
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Bug#18239 (Possible to overload internal functions with stored functions)unknown2006-11-144-3/+67
| | * | | | | | | | | | | Small adjustment after merging fix for bug#23651 "Server crashes whenunknown2006-11-131-1/+1
| | * | | | | | | | | | | Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg23651unknown2006-11-131-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimeunknown2006-11-131-0/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Fix for bug bug#23651 "Server crashes when trigger which usesunknown2006-11-131-0/+1
| | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| * | | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2006-11-2936-248/+1180
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge mysql.com:/home/kent/bk/mysql-5.0-buildunknown2006-11-291-2/+5
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Makefile.am:unknown2006-11-281-2/+5
| | | * | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2006-11-2733-138/+145
| | | |\ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.1unknown2006-11-291-9/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1unknown2006-11-2835-246/+1175
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | opt_range.cc:unknown2006-11-281-1/+1
| | | * | | | | | | | | | | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.1unknown2006-11-272-29/+45
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge macbook.gmz:/Users/kgeorge/mysql/work/mysql-5.0-optunknown2006-11-221-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | Fix typo in commentunknown2006-11-211-1/+1
| | | * | | | | | | | | | | | | Merge macbook.gmz:/Users/kgeorge/mysql/work/mysql-5.1unknown2006-11-222-26/+115
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \