summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* WL#3228 (NDB) : RBR using different table defs on slave/masterunknown2007-07-303-8/+7
* WL#3915 : (NDB) master's cols > slaveunknown2007-07-301-0/+9
* WL#3228 (NDB) : RBR using different table defs on slave/masterunknown2007-07-298-87/+737
* Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-mainunknown2007-07-2571-1137/+2609
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2007-07-241-3/+3
| |\
| | * Bug#29993 (Default value of log_output should be 'FILE', not 'TABLE')unknown2007-07-231-3/+3
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-07-245-90/+111
| |\ \ | | |/
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-07-215-90/+111
| | |\
| | | * Fix the coding style.unknown2007-07-202-31/+31
| | | * Merge bodhi.(none):/opt/local/work/mysql-5.0-runtimeunknown2007-07-201-3/+3
| | | |\
| | | | * Remove obvious comments.unknown2007-07-201-3/+3
| | | * | A follow-up fix for Bug#29431 "killing an insert delayed thread causes unknown2007-07-191-1/+2
| | | * | Merge bodhi.(none):/opt/local/work/mysql-5.0-runtimeunknown2007-07-191-54/+74
| | | |\ \ | | | | |/
| | | | * Rename all references to 'Delayed_insert' instances from 'tmp' to 'di'unknown2007-07-191-50/+50
| | | | * A fix for Bug#29431 killing an insert delayed thread causes crashunknown2007-07-191-8/+28
| | | * | Merge bodhi.(none):/opt/local/work/mysql-5.0-runtimeunknown2007-07-191-1/+1
| | | |\ \ | | | | |/
| | | | * A fix and a test case for Bug#26104 Bug on foreign key class constructor.unknown2007-07-181-1/+1
| * | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-07-214-12/+14
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge trift-lap.none:/MySQL/M51/bug14151-5.1unknown2007-07-203-3/+3
| | |\ \ \
| | | * | | After-merge fix for bug#14151.unknown2007-07-191-1/+1
| | | * | | Merge trift-lap.none:/MySQL/M50/bug14151-5.0unknown2007-07-192-2/+2
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Avoid the name conflict between the system-provided "md5.h" and the MySQL oneunknown2007-07-192-2/+2
| | | | * | Merge trift2.:/MySQL/M50/mysql-5.0unknown2007-07-172-1/+2
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * Merge trift-lap.fambruehe:/MySQL/M50/mysql-5.0unknown2007-07-162-1/+2
| | | | | |\
| | | | | | * Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0unknown2007-07-072-1/+2
| | | | | | |\
| | | | | | | * Merge dev:/data0/mysqldev/my/build-200706140748-5.0.44/mysql-5.0-releaseunknown2007-06-292-1/+2
| | | | | | | |\
| | * | | | | | \ Merge trift2.:/MySQL/M51/mysql-5.1unknown2007-07-191-9/+11
| | |\ \ \ \ \ \ \
| | | * | | | | | | CMakeLists.txt, configure.js:unknown2007-07-181-9/+11
| | | |/ / / / / /
| * | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-optunknown2007-07-211-4/+1
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-201-4/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Bug#29898: Item_date_typecast::val_int doesn't reset the null_value flag.unknown2007-07-201-4/+1
| | * | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0unknown2007-07-2015-41/+186
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | * | | | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/50unknown2007-07-1725-196/+617
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| * | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.1unknown2007-07-207-51/+92
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Re-set the plugin name so that we can be sure the plugin init()unknown2007-07-181-0/+5
| | * | | | | | | | | Move the filling of the table_name column above the initialization,unknown2007-07-181-1/+1
| | * | | | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51unknown2007-07-1736-601/+1352
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-07-172-22/+39
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge sin.intern.azundris.com:/home/tnurnberg/27198/50-27198unknown2007-07-172-22/+39
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge sin.intern.azundris.com:/home/tnurnberg/27198/41-27198unknown2007-07-172-11/+29
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge sin.intern.azundris.com:/home/tnurnberg/27198/40-27198unknown2007-07-162-11/+29
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * | | | | | | | Bug#27198: Error returns from time() are ignoredunknown2007-07-132-14/+29
| | | | | | * | | | | | | | Fixes a compilation problem on Windows. Backport of theunknown2007-02-091-0/+4
| | | | | * | | | | | | | | Merge sita.local:/Users/tsmith/m/bk/41unknown2007-07-093-1/+14
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge maint1.mysql.com:/data/localhome/tsmith/bk/41unknown2007-07-041-1/+16
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ Merge maint1.mysql.com:/data/localhome/tsmith/bk/41unknown2007-06-261-1/+4
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ Merge maint1.mysql.com:/data/localhome/tsmith/bk/41unknown2007-06-181-2/+8
| | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | \ \ \ \ \ \ \ \ \ \ \ Merge polly.local:/home/kaa/src/maint/bug24192/my50-bug24192unknown2007-07-111-13/+17
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-07-101-7/+9
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | NULL MERGE UP to 5.1.unknown2007-07-101-10/+29
| | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / | | | | |/| | | | | | | | | | | | | |