summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* MDEV-8010 - Avoid sql_alloc() in Items (Patch #1)Sergey Vojtovich2015-08-212-9/+9
* Merge /my/maria-10.1-default into 10.1Monty2015-08-1841-92/+103
|\
| * Fixed failing tests and compiler warningsMonty2015-08-186-10/+15
| * Ensure that fields declared with NOT NULL doesn't have DEFAULT values if not ...Monty2015-08-1833-79/+83
| * MDEV-8475 stale .TMM file causes MyiSAM and Aria engine to stop serving the t...Monty2015-08-182-3/+5
* | 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
* | MDEV-8582: innodb_force_primary_key option does not force PK or unique keyJan Lindström2015-08-082-10/+0
* | MDEV-8582: innodb_force_primary_key option does not force PK or unique keyJan Lindström2015-08-082-0/+10
* | 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
|/
* Merge branch 'bb-10.1-serg' into 10.1mariadb-10.1.6Sergei Golubchik2015-07-23329-2138/+11202
|\
| * MDEV-8508 mroonga fails embedded tests in 10.1Sergei Golubchik2015-07-202-2/+2
| * 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
* | | MDEV-8522: InnoDB: Assertion failure in file fil0fil.cc line 475Jan Lindström2015-07-222-8/+14
* | | MDEV-8501: encryption.create_or_replace fails in buildbot on P8 buildersJan Lindström2015-07-212-1/+13
|/ /
* | Merge branch '10.0-galera' into 10.1Nirbhay Choubey2015-07-146-108/+160
* | Cleanups, fixed warnings from valgrind, fixed failing tests (because on chang...Monty2015-07-101-0/+4
* | Merge branch '10.1' of github.com:MariaDB/server into 10.1Monty2015-07-099-45/+53
|\ \
| * | MDEV-8415 utf8: compare broken bytes as "greater than any non-broken character"Alexander Barkov2015-07-031-1/+1
| * | Fix test failure seen on P7/P8 innodb-encrypt-tables update/validateJan Lindström2015-07-022-4/+4
| |/
| * MDEV-8406: Test failure on encryption.innodb-page_encryption_log_encryption i...Jan Lindström2015-07-014-32/+32
| * MDEV-8396: InnoDB: Assertion failure in file fil0crypt.cc line 2052Jan Lindström2015-06-302-2/+2
| * MDEV-8395: InnoDB: Assertion failure in file fil0pagecompress.cc line 539 (SI...Jan Lindström2015-06-302-6/+14
* | - Renaming variables so that they don't shadow others (After this patch one c...Monty2015-07-068-33/+36
|/
* MDEV-8393: InnoDB: Assertion failure in file fil0crypt.cc line 2109Jan Lindström2015-06-294-4/+14
* MDEV-8390: innodb.innodb-flush-changed-page-bitmaps crashesJan Lindström2015-06-291-0/+8
* Merge tag 'mariadb-10.0.20' into 10.1Sergei Golubchik2015-06-27183-2192/+3145
|\
| * MDEV-7398 mysqld segfaults on FreeBSD 10.1 i386 when built with clang 3.4Sergei Golubchik2015-06-161-2/+2
| * MDEV-8128 cmake fails to detect boost librariesSergei Golubchik2015-06-161-0/+1
| * Merge branch 'connect-10.0' into 10.0Sergei Golubchik2015-06-1687-1226/+1519
| |\
| | * Commit merge resolved filesOlivier Bertrand2015-06-055-115/+0
| | * Commit merge resolved filesOlivier Bertrand2015-06-05754-19671/+39599
| | |\
| | * | Fix swapping key numeric values on Big Endian machines.Olivier Bertrand2015-06-032-4/+4
| | * | Fix swapping key numeric values on Big Endian machines.Olivier Bertrand2015-06-031-2/+2
| | * | Fix swapping key numeric values on Big Endian machines.Olivier Bertrand2015-06-032-0/+14
| | * | Fix swapping key numeric values on Big Endian machines.Olivier Bertrand2015-06-031-8/+8
| | * | Fix swapping key numeric values on Big Endian machines.Olivier Bertrand2015-06-031-1/+31
| | * | Fix handling of NULL values when reading from tables.Olivier Bertrand2015-06-022-6/+5
| | * | Add unicode ODBC types to the types recognized by CONNECT.Olivier Bertrand2015-05-307-24/+80
| | * | Change all preprocessor compiler directives to use __WIN__ as the mean ofOlivier Bertrand2015-05-2757-482/+483
| | * | JSONColumns and XMLColumns revisited. They can retrieve their parameters dire...Olivier Bertrand2015-05-2615-292/+369
| | * | Security: EOM modules must now be loaded from the plugin directory.Olivier Bertrand2015-05-203-18/+64
| | * | Json array index (position) was badly set for default array settingOlivier Bertrand2015-05-171-1/+1
| | * | In BIN table date_format now imply by default field_format='C'.Olivier Bertrand2015-05-177-324/+318
| | * | Fix a bug in BIN buffer initialisation (in FIXFAM::AllocateBuffer)Olivier Bertrand2015-05-156-137/+173
| | * | Make BIN table files more flexible with new column format.Olivier Bertrand2015-05-134-44/+147
| | * | Get rid of more GCC warnings about unused parametersOlivier Bertrand2015-05-106-35/+50
| | * | Get rid of GCC warnings about unused parametersOlivier Bertrand2015-05-0956-769/+744