summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* just like tempfiles: use key id 2 for temp Aria tablesSergei Golubchik2015-06-023-7/+23
* MDEV-8126 encryption for temp filesSergei Golubchik2015-06-022-0/+2
* always use my_b_pread() instead of mysql_file_pread()Sergei Golubchik2015-06-022-15/+13
* misc IO_CACHE cleanupsSergei Golubchik2015-06-023-4/+5
* myisam/aria: don't mess with IO_CACHE::fileSergei Golubchik2015-06-022-57/+60
* fix cmake dependenciesSergei Golubchik2015-06-021-3/+6
* remove few #ifdefs in innodb/xtradbSergei Golubchik2015-06-024-50/+6
* compilation failure on windowsSergei Golubchik2015-06-011-1/+1
* Merge remote-tracking branch 'github/10.1' into 10.1Sergei Golubchik2015-06-014-64/+42
|\
| * Fix compiler warning.Jan Lindström2015-05-312-2/+2
| * MDEV-7484: Log Time not consistent with InnoDB errors nor with MySQL error lo...Jan Lindström2015-05-304-64/+42
* | Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-01784-21052/+42061
|\ \ | |/ |/|
| * convert files from CRLF to LF line endingsSergei Golubchik2015-05-08169-12974/+12974
| * Merge branch '5.5' into 10.0Sergei Golubchik2015-05-084-4/+14
| |\
| | * Fix compiler error if compiler does not support c99 styleJan Lindström2015-05-074-3/+14
| | * Merge pull request #52 from openquery/MDEV-8053-c99-style-for-structure-membersJan Lindström2015-05-062-2/+2
| | |\
| | | * c99 style for assigning structure membersDaniel Black2015-04-252-2/+2
| * | | Fixing connect.dbf test failures on big endian machines.Alexander Barkov2015-05-071-24/+38
| * | | Merge branch 'Buggynours:10.0' into 10.0Sergei Golubchik2015-05-0517-116/+303
| |\ \ \
| | * | | - Fix a regression bug on (XML) HTML tables.Olivier Bertrand2015-05-057-18/+201
| | * | | Fix MDEV-8090 in tabmysql.cppSergei Golubchik2015-05-051-2/+9
| | * | | - Fix bug on updating JSON expanded valuesOlivier Bertrand2015-05-019-60/+57
| * | | | Merge branch 'bb-10.0-serg' into 10.0Sergei Golubchik2015-05-05592-7654/+28321
| |\ \ \ \
| | * | | | mroonga doesn't work in embedded anymoreSergei Golubchik2015-05-053-0/+11
| | * | | | perfschema 5.6.24Sergei Golubchik2015-05-0529-751/+337
| | |\ \ \ \
| | | * | | | 5.6.24Sergei Golubchik2015-05-0429-757/+338
| | * | | | | Merge branch 'Kentoku:10.0' into 10.0Sergei Golubchik2015-05-05426-5486/+24759
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'ks-Mroonga-5.02' into 10.0Kentoku SHIBA2015-05-05419-5434/+24597
| | | |\ \ \ \ \
| | | | * | | | | revert CMakeList.txt at groonga-normalizer-mysql/normalizersKentoku SHIBA2015-05-052-20/+1
| | | | * | | | | add -fPIC for groonga-normalizer-mysqlKentoku SHIBA2015-05-051-0/+8
| | | | * | | | | add -fPIC for groonga-normalizer-mysqlKentoku SHIBA2015-05-0549-1468/+7
| | | | * | | | | Update Mroonga to the latest version on 2015-04-30T04:44:30+0900Kentoku SHIBA2015-04-30413-5251/+25886
| | | * | | | | | update Spider to 3.2.21Kentoku SHIBA2015-05-057-52/+162
| | | |/ / / / /
| | * | | | | | Merge branch 'Buggynours:10.0' into 10.0Sergei Golubchik2015-05-0545-696/+1780
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | - Fix Catalog JSON table crash when no JpathOlivier Bertrand2015-04-1725-393/+894
| | | * | | | | Fix MDEV-7890Olivier Bertrand2015-04-045-16/+48
| | | * | | | | Correct a typo that made multiple 1 tables to return 0 lines on LinuxOlivier Bertrand2015-04-021-1/+1
| | | * | | | | - Fix MDEV-7879 by adding a test in all SetValue_pval function to return when...Olivier Bertrand2015-03-302-35/+52
| | | * | | | | D:\Ber\Develop\git3.msgOlivier Bertrand2015-03-281-0/+8
| | | * | | | | - Fix a bug that caused a crash when doing delete on a json table with wrong ...Olivier Bertrand2015-03-228-70/+29
| | | * | | | | This commit includes changes done in a previous (deleted) branch plus new ones.Olivier Bertrand2015-03-1820-393/+958
| | | * | | | | Add #include <ostream> in dict0mem.h and change iterator to const_iterator in...Buggynours2015-03-034-2/+4
| | * | | | | | XtraDB-5.6.23-72.1Sergei Golubchik2015-05-0530-86/+273
| | |\ \ \ \ \ \
| | | * | | | | | 5.6.23-72.1Sergei Golubchik2015-05-0430-85/+272
| | | * | | | | | move to storage/xtradbSergei Golubchik2015-05-04365-0/+327935
| | | / / / / /
| | * | | | | | InnoDB-5.6.24Sergei Golubchik2015-05-0520-492/+439
| | |\ \ \ \ \ \
| | | * | | | | | 5.6.24Sergei Golubchik2015-05-0419-491/+438
| | | * | | | | | move to storage/innobaseSergei Golubchik2015-05-04360-0/+317343
| | | / / / / /
| | * | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2015-05-0443-143/+722
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | Merge branch '5.5' into bb-5.5-sergmariadb-5.5.43Sergei Golubchik2015-04-292-7/+3
| | | |\ \ \ \ \