summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-011133-24286/+51910
|\
| * Fix win/ files to be stored with LF in repositorymariadb-10.0.1910.0-defragmentVicentiu Ciorbaru2015-05-0814-862/+862
| * update .gitattributesSergei Golubchik2015-05-081-4/+5
| * convert files from CRLF to LF line endingsSergei Golubchik2015-05-08171-14008/+14008
| * bump the VERSIONSergei Golubchik2015-05-081-1/+1
| * Merge branch '5.5' into 10.0Sergei Golubchik2015-05-087-5/+31
| |\
| | * MDEV-8115 mysql_upgrade crashes the server with REPAIR VIEWSergei Golubchik2015-05-073-1/+17
| | * 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 MDEV-8103 into 10.0mariadb-10.0.18Kristian Nielsen2015-05-061-1/+1
| |\ \ \
| * \ \ \ 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
| * | | | | MDEV-8096 vio timeouts are multiplied by 1000 for sslSergei Golubchik2015-05-054-2/+57
| * | | | | MDEV-7985: MySQL Users Break when Migrating to MariaDB, part 2Vicențiu Ciorbaru2015-05-053-30/+436
| * | | | | Merge branch 'bb-10.0-serg' into 10.0Sergei Golubchik2015-05-05882-10425/+37075
| |\ \ \ \ \
| | * | | | | mroonga doesn't work in embedded anymoreSergei Golubchik2015-05-053-0/+11
| | * | | | | perfschema 5.6.24Sergei Golubchik2015-05-05151-1681/+2138
| | |\ \ \ \ \
| | | * | | | | 5.6.24Sergei Golubchik2015-05-04128-1663/+731
| | * | | | | | .gitignore: add generated mroonga *.result filesSergei Golubchik2015-05-051-16/+2
| | * | | | | | 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-0547-696/+2033
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | - 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
| | | * | | | | | - Adding files to ignore from C C++ and Visual StudioOlivier Bertrand2015-03-162-0/+253
| | | * | | | | | 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
| | * | | | | | | | InnoDB-5.6.24Sergei Golubchik2015-05-0520-492/+439
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | 5.6.24Sergei Golubchik2015-05-0419-491/+438
| | * | | | | | | | | Merge branch 'merge-pcre' into 10.0Sergei Golubchik2015-05-0441-768/+1695
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | 8.37Sergei Golubchik2015-05-0479-7082/+10402
| | * | | | | | | | | | Null-merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2015-05-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | move to storage/xtradbSergei Golubchik2015-05-04365-0/+0
| | * | | | | | | | | | Null-merge branch 'merge-sphinx' into 10.0Sergei Golubchik2015-05-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | move to storage/sphinxSergei Golubchik2015-05-0413-0/+0