summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge gbichot3.local:/home/mysql_src/mysql-5.1-2unknown2006-08-0914-49/+2142
|\
| * postmerge fixunknown2006-05-242-4/+21
| * Merge sanja.is.com.ua:/home/bell/mysql/bk/work-5.1unknown2006-05-2413-47/+2122
| |\
| | * Added storage/maria (based on MyISAM). WL#3245unknown2006-04-1113-47/+2122
* | | Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfootunknown2006-08-085-148/+94
|\ \ \
| * \ \ Merge bk://anubis/mysql-5.0-enginesunknown2006-07-215-189/+44
| |\ \ \
| | * | | "BUG #18764: Delete conditions causing inconsistencies in Federated tables"unknown2006-07-181-2/+5
| | * | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0-enginesunknown2006-07-181-67/+23
| | |\ \ \
| | | * | | "BUG #18764: Delete conditions causing inconsistencies in Federated tables"unknown2006-07-171-66/+23
| | * | | | Merge bk-internal:/home/bk/mysql-5.0-enginesunknown2006-07-182-0/+8
| | |\ \ \ \
| | | * \ \ \ Merge bk-internal:/home/bk/mysql-5.0-enginesunknown2006-07-112-0/+8
| | | |\ \ \ \
| | | | * | | | Bug #17766: The server accepts to create MERGE tables which cannot workunknown2006-07-112-0/+8
| | * | | | | | Bug #17608: String literals lost during INSERT query on FEDERATED tableunknown2006-07-123-133/+21
* | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-new-maintunknown2006-08-042-174/+85
|\ \ \ \ \ \ \ \
| * | | | | | | | Replace FEDERATED_EQ with STRING_WITH_LEN("=")unknown2006-08-031-1/+1
| * | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/my51-m-bug20942unknown2006-08-032-173/+84
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Bug#20942 ha_federated uses String::append(const char *s), strlen() on every ...unknown2006-08-022-174/+85
* | | | | | | | | | 5.0 -> 5.1 manual merge, part 4 of 4 (or more?)unknown2006-08-031-1/+1
* | | | | | | | | | Merge maint1.mysql.com:/data/localhome/tsmith/bk/mrg50-cunknown2006-08-033-2/+17
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Finish the merge of the patch for bug #15195 from 4.1 -> 5.0unknown2006-07-203-2/+12
| * | | | | | | | | Partial merge of the patch for bug #15195 from 4.1 -> 5.0; more changes neededunknown2006-07-203-2/+8
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-07-144-5/+14
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | --{skip-}merge option added which allows the user to disable merge engine andunknown2006-07-144-5/+14
* | | | | | | | | | | | Merge maint1.mysql.com:/data/localhome/tsmith/bk/mrg50-bunknown2006-08-031-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | / / / / / / / / | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-releaseunknown2006-07-191-1/+8
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug#20989: View '(null).(null)' references invalid table(s)... on SQL SECURIT...unknown2006-07-191-1/+8
| * | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-07-187-10/+43
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-08-024-10/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rplunknown2006-07-314-10/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Make innodb_flush_log_at_trx_commit a settable global variable.unknown2006-07-294-7/+10
| | * | | | | | | | | | | | | Make innodb_thread_concurrency 0 by default, and extendunknown2006-07-291-2/+4
| | * | | | | | | | | | | | | Applied innodb-5.1-ss660 snapshot.unknown2006-07-261-1/+2
* | | | | | | | | | | | | | | sql_view.cc:unknown2006-08-021-2/+2
* | | | | | | | | | | | | | | Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysqlunknown2006-08-014-16/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-08-011-13/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-07-311-13/+38
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Bug #11551: Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLEunknown2006-07-311-13/+38
| * | | | | | | | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-08-014-4/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-optunknown2006-07-314-4/+64
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHMunknown2006-07-314-4/+64
* | | | | | | | | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2006-08-015-34/+178
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2006-07-305-34/+178
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | BUG#14940: post-review fixesunknown2006-07-301-6/+8
| | * | | | | | | | | | | | | | | | | | BUG#14940 "MySQL choose wrong index", v.2unknown2006-07-285-34/+179
* | | | | | | | | | | | | | | | | | | | After merge fixunknown2006-08-016-25/+20
* | | | | | | | | | | | | | | | | | | | Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysqlunknown2006-07-311-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | select.result, func_group.result, sql_select.cc:unknown2006-07-311-1/+2
* | | | | | | | | | | | | | | | | | | | Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysqlunknown2006-07-3024-74/+320
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge sunlight.local:/local_work/tmp_merge-4.1-opt-mysqlunknown2006-07-291-0/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-optunknown2006-07-271-2/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status