summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
Commit message (Expand)AuthorAgeFilesLines
* merge.Sergei Golubchik2010-11-251-7/+7
|\
| * 5.1.51 mergeSergei Golubchik2010-10-191-0/+8
| |\
| * \ Merge with MySQL 5.1.50Michael Widenius2010-08-271-25/+39
| |\ \
| * | | Fixed warnings and build failures after last pushMichael Widenius2010-08-021-3/+3
| * | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-2/+4
| |\ \ \
| * | | | restore the unintentinally broken ABISergei Golubchik2010-07-231-1/+1
| * | | | Merge with MySQL 5.1.47Michael Widenius2010-05-261-9/+4
| |\ \ \ \
| * \ \ \ \ Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-5/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-14/+24
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge with MySQL 5.1.42Michael Widenius2010-01-151-6/+11
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge with MySQL 5.1, with following additions:unknown2009-11-161-14/+121
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge MySQL->MariaDBSergey Petrunya2009-09-081-5/+19
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Fixed problems in mergeMichael Widenius2009-05-191-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | We are now using Valgrind rather than purify, and have for quite some time.unknown2009-05-061-1/+1
| * | | | | | | | | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-251-3/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-3/+26
| | |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed compiler warnings found by gcc 4.3.2Michael Widenius2009-01-311-7/+7
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2008-05-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | WL#3138: Maria - fast "SELECT COUNT(*) FROM t;" and "CHECKSUM TABLE t"unknown2008-05-291-1/+1
| * | | | | | | | | | | | | | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-26/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixed compiler warnings in a lot of filesunknown2008-02-131-5/+0
* | | | | | | | | | | | | | | mysql-5.1 -> mysql-5.5 mergeSergei Golubchik2010-11-051-6/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Bug #56709: Memory leaks at running the 5.1 test suiteAlexey Kopytov2010-09-221-7/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Bug #34283 mysqlbinlog leaves tmpfile after termination if binlog contains l...unknown2010-08-031-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Bug #34283 mysqlbinlog leaves tmpfile after termination if binlog contains l...unknown2010-08-031-0/+8
* | | | | | | | | | | | | | | Manual merge from mysql-5.1-bugteam into mysql-trunk-merge.Luis Soares2010-07-301-8/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Revert patch for BUG#34283. Causing lots of test failures in PB2,Luis Soares2010-07-301-8/+0
* | | | | | | | | | | | | | | Bug #34283 mysqlbinlog leaves tmpfile after termination if binlog contains l...unknown2010-07-301-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Bug #34283 mysqlbinlog leaves tmpfile after termination if binlog contains l...unknown2010-07-301-0/+8
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-201-8/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-201-7/+6
* | | | | | | | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge.Davi Arnaut2010-07-151-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-151-1/+1
| * | | | | | | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-081-2/+2
* | | | | | | | | | | | | | | mergeGeorgi Kodinov2010-07-141-23/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| / / / / / / / / / / / / / | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Bug #51876: crash/memory underrun when loading data with ucs2Georgi Kodinov2010-07-141-23/+33
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | mergeGeorgi Kodinov2010-06-091-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | MergeGeorgi Kodinov2010-06-091-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Bug #52512: Assertion `! is_set()' in Diagnostics_area::set_ok_status Georgi Kodinov2010-04-071-0/+4
| | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
* | | | | | | | | | | | | Bug #49829 Many "hides virtual function" warnings with SunStudioTor Didriksen2010-05-311-3/+3
* | | | | | | | | | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2010-05-281-16/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-05-111-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Bug#53189 Table map version unused and can be removedHe Zhenxing2010-05-081-2/+0
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-05-071-7/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Bug#50373 --secure-file-priv=""Kristofer Pettersson2010-05-031-7/+4
| * | | | | | | | | | | | Manual merge of local mysql-trunk-merge with bk-internal.Alexey Kopytov2010-05-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Manual merge from mysql-trunk.Alexander Nozdrin2010-05-071-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-04-301-3/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | / / / / / / / / / / / | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |