summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Automatic merge with 5.1Michael Widenius2010-10-064-12/+24
|\
| * mergeSergei Golubchik2010-09-281-2/+1
| |\
| * | Fixed bug #57024.Igor Babaev2010-09-262-11/+21
| * | MergeIgor Babaev2010-09-231-0/+1
| |\ \
| | * | Fixed bug #53161.Igor Babaev2010-09-201-0/+1
| * | | MergeIgor Babaev2010-09-201-1/+2
| |\ \ \ | | |/ / | |/| |
| | * | Fixed bug #56862 (lp bug #640419).Igor Babaev2010-09-191-1/+2
* | | | Automatic mergeMichael Widenius2010-10-0135-150/+167
|\ \ \ \
| * | | | mysqld: Move --skip-new to --safe and remove old usage of --skip-newMichael Widenius2010-09-241-11/+4
| * | | | Change some my_bool in C++ classes and a few functions to bool to detect wron...Michael Widenius2010-09-2428-121/+159
| * | | | Fix usage of mysqld option --new, --old, --safe and --skip_new to not disable...Michael Widenius2010-09-238-18/+4
* | | | | mergedSergei Golubchik2010-09-211-2/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | fix for MySQL Bug#44797 - plugins w/o command-line options have no disabling ...Sergei Golubchik2010-09-211-2/+1
| | |/ / | |/| |
* | | | merge with 5.1Sergei Golubchik2010-09-164-4/+17
|\ \ \ \ | |/ / /
| * | | Automatic mergeMichael Widenius2010-09-151-0/+6
| |\ \ \
| | * | | mysqltest now gives error messages with error code for my_delete, my_rename, ...Michael Widenius2010-09-151-0/+6
| | | |/ | | |/|
| * | | Merge: fix valgrind failure in Unique classSergey Petrunya2010-09-141-1/+1
| |\ \ \
| | * | | Fix valgrind failure with Unique classSergey Petrunya2010-09-141-1/+1
| * | | | mergedSergei Golubchik2010-09-131-5/+0
| |\ \ \ \ | | |_|/ / | |/| | |
| * | | | MergeIgor Babaev2010-09-122-2/+5
| |\ \ \ \
| | * | | | Fixed bug #49600.Igor Babaev2010-09-112-2/+5
| | | |/ / | | |/| |
| * | | | Fixed bug #49322.Igor Babaev2010-09-091-1/+5
| |/ / /
* | | | rename maria to ariaSergei Golubchik2010-09-126-20/+20
* | | | restore shifted error numbersSergei Golubchik2010-09-121-8/+7
* | | | merge with 5.1Sergei Golubchik2010-09-1158-422/+865
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | to simpliy and unify the codeSergei Golubchik2010-09-111-5/+0
| |/
| * Automatic merge with 5.1-release (5.1.50)Michael Widenius2010-09-0921-77/+116
| |\
| | * Give a more precise warning why something fails.Michael Widenius2010-09-081-2/+1
| | * Automatic mergeMichael Widenius2010-09-071-10/+14
| | |\
| | * | Added --skip-bdb as a compatibility option for old config filesMichael Widenius2010-09-071-0/+8
| | * | Enable archive tables to work with mysql_upgrade / repairMichael Widenius2010-09-032-1/+5
| | * | Fix that one can run mysql_upgrade with long table namesMichael Widenius2010-09-0319-71/+100
| | * | Fixed bugs (mostly on sparc) that caused crashes in mysql-test-runMichael Widenius2010-09-031-3/+2
| * | | Write message to stderr if recovery is not likely to succeed because we don't...Michael Widenius2010-09-091-1/+1
| | |/ | |/|
| * | Fixed recovery bug where bitmap pages would not be correctly updated after pr...Michael Widenius2010-09-071-2/+3
| * | Fixed bug that 'maria_read_log -a' didn't set max_trid when reparing tables.Michael Widenius2010-09-061-10/+13
| |/
| * Merge with MySQL 5.1.50Michael Widenius2010-08-2751-320/+736
| |\
| | * auto-merge mysql-5.1-security (local) --> mysql-5.1-securityAlfranio Correia2010-08-033-1/+26
| | |\
| | | * BUG#55625 RBR breaks on failing 'CREATE TABLE'Alfranio Correia2010-08-023-1/+26
| | * | merge mysql-5.1-bugteam into mysql-5.1-securityGeorgi Kodinov2010-08-0216-45/+105
| | |\ \
| | | * | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-301-3/+0
| | | * | Automerge mysql-5.1-bugteam into mysql-5.1-bugteam latest.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 #55188: GROUP BY, GROUP_CONCAT and TEXT - inconsistent resultsGeorgi Kodinov2010-07-302-2/+5
| | | |/ /
| | | * | Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite runDavi Arnaut2010-07-301-2/+2
| | | * | Bug #34283 mysqlbinlog leaves tmpfile after termination if binlog contains l...unknown2010-07-301-0/+8
| | | |/
| | | * BUG#49124 Security issue with /*!-versioned */ SQL statements on Slaveunknown2010-07-297-17/+42
| | | * merged BUG#55322 to 5.1-bugteamSven Sandberg2010-07-261-0/+5
| | | |\
| | | | * BUG#55322: SHOW BINLOG EVENTS increases @@SESSION.MAX_ALLOWED_PACKETSven Sandberg2010-07-201-0/+5
| | | * | Merge 5.1-bugteam -> 5.1-bug-42496Dmitry Shulga2010-07-2343-391/+641
| | | |\ \