summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* 5.3 mergeSergei Golubchik2012-03-062-7/+17
|\
| * Merge.Igor Babaev2012-03-051-4/+9
| |\
| | * Fixed LP bug #946055.Igor Babaev2012-03-051-4/+9
| * | Automatic mergeMichael Widenius2012-03-051-4/+13
| |\ \ | | |/ | |/|
| | * Fixed lp:925377 "Querying myisam table metadata while 'alter table..enable ke...Michael Widenius2012-02-281-4/+13
| * | Fix for LP BUG#944504 unknown2012-03-051-1/+1
| * | Fixed LP bug #944782.Igor Babaev2012-03-041-2/+7
* | | compilation warning: unused variableSergei Golubchik2012-03-051-2/+2
* | | mdev-20: INSTALL PLUGIN SONAMESergei Golubchik2012-03-054-129/+222
* | | MergeIgor Babaev2012-03-0213-132/+359
|\ \ \
| * \ \ Merge MWL#234: @@skip_replication, into latest MariaDB 5.5 for pushunknown2012-03-0213-132/+359
| |\ \ \
| | * | | Small cleanups:unknown2012-03-011-73/+39
| | * | | Merge MWL#234: @@skip_replication feature to MariaDB 5.5.unknown2012-03-0113-88/+349
| | |\ \ \
| | | * | | MWL#234: Implement option to switch between master-side and client-side filte...unknown2011-08-168-20/+49
| | | * | | MWL#234: After-review fixes, including better names for the new system variab...unknown2011-08-129-69/+92
| | | * | | MWL#234: Support for marking binlog events to not be replicated, and for tell...unknown2011-08-119-38/+231
* | | | | | Merge MWL #247 from mariadb 5.3 -> mariadb 5.5.Igor Babaev2012-03-029-51/+313
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Addressed all review feedbacks for mwl #247.Igor Babaev2012-02-283-15/+27
| * | | | | Merge.Igor Babaev2012-02-2714-137/+247
| |\ \ \ \ \
| * \ \ \ \ \ Merge.Igor Babaev2012-02-2245-355/+798
| |\ \ \ \ \ \
| * | | | | | | Fixed LP bug #923236.Igor Babaev2012-01-291-0/+4
| * | | | | | | Fixed LP bug #921167.Igor Babaev2012-01-241-0/+2
| * | | | | | | Merge.Igor Babaev2012-01-249-56/+300
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed LP bug #914560.Igor Babaev2012-01-172-0/+6
| | * | | | | | | Fixed more compiler warnings. Igor Babaev2012-01-011-2/+4
| | * | | | | | | Fixed calculation of rec_per_key elements for added components of the extende...Igor Babaev2012-01-013-6/+8
| | * | | | | | | Merged MWL#247 into the latest 5.3.Igor Babaev2011-12-318-49/+283
| | |\ \ \ \ \ \ \
| | | * | | | | | | Implementation of the MWL#247: Make the optimizer use extended keys.Igor Babaev2011-12-318-49/+283
* | | | | | | | | | Merge 5.3->5.5.Igor Babaev2012-03-0110-21/+100
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Fixed LP bug #943543.Igor Babaev2012-02-291-6/+6
| * | | | | | | | | lp:938977 - Query performance with join/index super slow on MariaDB 5.3.4RCSergei Golubchik2012-02-281-2/+7
| | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge 5.2->5.3Igor Babaev2012-02-261-9/+11
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix of LP bug:938518 (also LP bug:791761 and LP bug:806955)unknown2012-02-251-9/+11
| * | | | | | | | | Rolled back the patch for bug 791761.Igor Babaev2012-02-263-5/+1
| * | | | | | | | | Merge.Igor Babaev2012-02-248-10/+80
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixed LP bug #939009.Igor Babaev2012-02-248-10/+80
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | BUG#938131: Subquery materialization is not used in CREATE TABLE SELECTSergey Petrunya2012-02-241-3/+4
| * | | | | | | | | Merge 5.2->5.3Sergey Petrunya2012-02-241-0/+1
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Back-ported the fix and test cases for bugs #59487 and #43368 fromIgor Babaev2012-02-221-0/+1
| * | | | | | | | Merge fix for BUG#934597Sergey Petrunya2012-02-241-0/+9
| |\ \ \ \ \ \ \ \
| | * | | | | | | | BUG#934597: Assertion `! is_set()' failed in Diagnostics_area::set_ok_status(...Sergey Petrunya2012-02-241-0/+9
| | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | Make Tc_log_page_size status variable use SHOW_LONG_NOFLUSH.Sergei Golubchik2012-02-291-1/+1
* | | | | | | | | overlay support for mysql-test-run and mysqltestSergei Golubchik2012-02-231-1/+1
* | | | | | | | | MDEV-117 Assertion: prebuilt->sql_stat_start || trx->conc_state == 1 failed a...Sergei Golubchik2012-03-013-14/+21
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Update copyright noticesVladislav Vaintroub2012-02-2810-5/+10
* | | | | | | | merge 5.5Vladislav Vaintroub2012-02-2728-91/+389
|\ \ \ \ \ \ \ \
| * | | | | | | | because of the high cost associated with fake symdir resolution, disable sym...Vladislav Vaintroub2012-02-271-1/+3
| * | | | | | | | Merge MWL#192: non-blocking client library into MariaDB.unknown2012-02-262-8/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | MWL#192 after-merge fixes.unknown2012-02-231-7/+3
| | * | | | | | | | Merge latest MariaDB 5.5 into MWL#192: Non-blocking client library.unknown2012-02-2251-198/+833
| | |\ \ \ \ \ \ \ \