summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge /my/maria-10.1-default into 10.1Monty2015-08-18204-6330/+6955
|\
| * Fixed failing tests and compiler warningsMonty2015-08-1814-17/+44
| * Ensure that fields declared with NOT NULL doesn't have DEFAULT values if not ...Monty2015-08-18184-6305/+6776
| * MDEV-8475 stale .TMM file causes MyiSAM and Aria engine to stop serving the t...Monty2015-08-186-8/+135
* | Adding EXPLAIN SELECT tests for:Alexander Barkov2015-08-174-0/+218
* | Adding MY_CHARSET_HANDLER::native_to_mb().Alexander Barkov2015-08-1417-23/+102
* | MDEV-8589: Non-default ENCRYPTION_KEY_ID is ignored upon reading a tableJan Lindström2015-08-1422-140/+154
* | MDEV-8591: Database page corruption on disk or a failed space, Assertion fail...Jan Lindström2015-08-144-99/+121
* | Recording range_mrr_icp.result (forgotten in the patch for MDEV-8613)Alexander Barkov2015-08-141-0/+12
* | Removing unused String_copier::copy_fix.Alexander Barkov2015-08-142-35/+2
* | MDEV-8613 Full table scan for WHERE indexed_varchar_column <=> 'bad-character'Alexander Barkov2015-08-133-1/+22
* | MDEV-8610 "WHERE CONTAINS(indexed_geometry_column,1)" causes full table scanAlexander Barkov2015-08-136-664/+729
* | MDEV-8599 "WHERE varchar_field LIKE temporal_const" does not use range optimizerAlexander Barkov2015-08-125-170/+243
* | Splitting a static function get_func_mm_tree() into virtualAlexander Barkov2015-08-122-260/+264
* | Removing RANGE_OPT_PARA::condAlexander Barkov2015-08-121-11/+1
* | MDEV-8441 Bad SHOW CREATE TABLE output for a table with a virtual columnAlexander Barkov2015-08-106-30/+83
* | MDEV-8590: Fix embedded build failureNirbhay Choubey2015-08-091-0/+5
* | MDEV-7205 : Galera cluster & sql_log_bin = off don't workNirbhay Choubey2015-08-0811-33/+229
* | MDEV-8582: innodb_force_primary_key option does not force PK or unique keyJan Lindström2015-08-083-11/+1
* | MDEV-8582: innodb_force_primary_key option does not force PK or unique keyJan Lindström2015-08-084-0/+33
* | MDEV-8583: Empty lines in encryption loggingJan Lindström2015-08-082-2/+2
* | MDEV-8410: Changing file-key-management to example-key-management causes cras...Jan Lindström2015-08-088-44/+472
* | Make ANALYZE FORMAT=JSON show execution time for filesort element.Sergei Petrunia2015-08-077-23/+48
* | Merge branch 'mdev8302-3' into 10.1Kristian Nielsen2015-08-041-0/+2
|\ \
| * | Fix embedded server buildKristian Nielsen2015-08-041-0/+2
* | | Merge MDEV-8302 into 10.1Kristian Nielsen2015-08-045-6/+147
|\ \ \ | |/ / | | / | |/ |/|
| * MDEV-8302: Duplicate key with parallel replicationKristian Nielsen2015-08-045-6/+147
* | MDEV-5096 - Wrong error message on attempt to kill somebody else's query IDSergey Vojtovich2015-07-244-1/+44
* | Merge branch 'bb-10.1-serg' into 10.1mariadb-10.1.6Sergei Golubchik2015-07-23333-2273/+11343
|\ \
| * | compilation failures on WindowsSergei Golubchik2015-07-232-2/+7
| * | fix for 32-bit testsSergei Golubchik2015-07-221-128/+128
| * | MDEV-8508 mroonga fails embedded tests in 10.1Sergei Golubchik2015-07-202-2/+2
| * | compiler warningSergei Golubchik2015-07-201-5/+6
| * | Merge https://github.com/Kentoku/MariaDB/tree/10.1 into 10.1Sergei Golubchik2015-07-20329-2136/+11200
| |\ \
| | * | Update Mroonga to the latest version on 2015-07-02T04:12:21+0900Kentoku SHIBA2015-07-02329-2136/+11200
| * | | Null-merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-07-200-0/+0
| |\ \ \
| | * | | MDEV-8383 : "GRANT role TO user" does not replicateNirbhay Choubey2015-07-103-0/+324
| | * | | MDEV-7903 : xtrabackup SST failing with maria-10.0-galeramariadb-galera-10.0.20Nirbhay Choubey2015-06-241-1/+2
| | * | | MDEV-7631 : Invalid WSREP_SST rows appear in mysqld-bin.index fileNirbhay Choubey2015-06-241-1/+8
| | * | | Add close-on-exec flag to open(), socket(), accept() & fopen().Nirbhay Choubey2015-06-246-7/+38
| | * | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-06-2313-25/+434
| | |\ \ \
| | | * | | Update SELinux policy to allow UDP for multicast repl in galera.mariadb-galera-5.5.44Nirbhay Choubey2015-06-232-20/+30
| | | * | | Merge tag 'mariadb-5.5.44' into 5.5-galeraNirbhay Choubey2015-06-21211-4424/+6440
| | | |\ \ \
| | | * | | | MDEV-8260 : Issues related to concurrent CTASNirbhay Choubey2015-06-197-23/+142
| | | * | | | MDEV-6829 : SELinux/AppArmor policies for Galera serverNirbhay Choubey2015-06-186-0/+278
| | * | | | | Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-21406-4454/+7447
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Remove duplicate script added due to bad merge.Nirbhay Choubey2015-06-211-26/+0
| | * | | | | MDEV-8239 : Idle threads post-execution end up in closing tables stateNirbhay Choubey2015-06-197-14/+14
| | * | | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-06-024-10/+61
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | MDEV-8208 : Sporadic SEGFAULT on startupNirbhay Choubey2015-05-241-0/+6