Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 1133 | -24286/+51910 |
|\ | |||||
| * | Fix win/ files to be stored with LF in repositorymariadb-10.0.1910.0-defragment | Vicentiu Ciorbaru | 2015-05-08 | 14 | -862/+862 |
| * | update .gitattributes | Sergei Golubchik | 2015-05-08 | 1 | -4/+5 |
| * | convert files from CRLF to LF line endings | Sergei Golubchik | 2015-05-08 | 171 | -14008/+14008 |
| * | bump the VERSION | Sergei Golubchik | 2015-05-08 | 1 | -1/+1 |
| * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-05-08 | 7 | -5/+31 |
| |\ | |||||
| | * | MDEV-8115 mysql_upgrade crashes the server with REPAIR VIEW | Sergei Golubchik | 2015-05-07 | 3 | -1/+17 |
| | * | Fix compiler error if compiler does not support c99 style | Jan Lindström | 2015-05-07 | 4 | -3/+14 |
| | * | Merge pull request #52 from openquery/MDEV-8053-c99-style-for-structure-members | Jan Lindström | 2015-05-06 | 2 | -2/+2 |
| | |\ | |||||
| | | * | c99 style for assigning structure members | Daniel Black | 2015-04-25 | 2 | -2/+2 |
| * | | | Fixing connect.dbf test failures on big endian machines. | Alexander Barkov | 2015-05-07 | 1 | -24/+38 |
| * | | | Merge MDEV-8103 into 10.0mariadb-10.0.18 | Kristian Nielsen | 2015-05-06 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'Buggynours:10.0' into 10.0 | Sergei Golubchik | 2015-05-05 | 17 | -116/+303 |
| |\ \ \ \ | |||||
| | * | | | | - Fix a regression bug on (XML) HTML tables. | Olivier Bertrand | 2015-05-05 | 7 | -18/+201 |
| | * | | | | Fix MDEV-8090 in tabmysql.cpp | Sergei Golubchik | 2015-05-05 | 1 | -2/+9 |
| | * | | | | - Fix bug on updating JSON expanded values | Olivier Bertrand | 2015-05-01 | 9 | -60/+57 |
| * | | | | | MDEV-8096 vio timeouts are multiplied by 1000 for ssl | Sergei Golubchik | 2015-05-05 | 4 | -2/+57 |
| * | | | | | MDEV-7985: MySQL Users Break when Migrating to MariaDB, part 2 | Vicențiu Ciorbaru | 2015-05-05 | 3 | -30/+436 |
| * | | | | | Merge branch 'bb-10.0-serg' into 10.0 | Sergei Golubchik | 2015-05-05 | 882 | -10425/+37075 |
| |\ \ \ \ \ | |||||
| | * | | | | | mroonga doesn't work in embedded anymore | Sergei Golubchik | 2015-05-05 | 3 | -0/+11 |
| | * | | | | | perfschema 5.6.24 | Sergei Golubchik | 2015-05-05 | 151 | -1681/+2138 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | 5.6.24 | Sergei Golubchik | 2015-05-04 | 128 | -1663/+731 |
| | * | | | | | | .gitignore: add generated mroonga *.result files | Sergei Golubchik | 2015-05-05 | 1 | -16/+2 |
| | * | | | | | | Merge branch 'Kentoku:10.0' into 10.0 | Sergei Golubchik | 2015-05-05 | 426 | -5486/+24759 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'ks-Mroonga-5.02' into 10.0 | Kentoku SHIBA | 2015-05-05 | 419 | -5434/+24597 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | revert CMakeList.txt at groonga-normalizer-mysql/normalizers | Kentoku SHIBA | 2015-05-05 | 2 | -20/+1 |
| | | | * | | | | | | add -fPIC for groonga-normalizer-mysql | Kentoku SHIBA | 2015-05-05 | 1 | -0/+8 |
| | | | * | | | | | | add -fPIC for groonga-normalizer-mysql | Kentoku SHIBA | 2015-05-05 | 49 | -1468/+7 |
| | | | * | | | | | | Update Mroonga to the latest version on 2015-04-30T04:44:30+0900 | Kentoku SHIBA | 2015-04-30 | 413 | -5251/+25886 |
| | | * | | | | | | | update Spider to 3.2.21 | Kentoku SHIBA | 2015-05-05 | 7 | -52/+162 |
| | | |/ / / / / / | |||||
| | * | | | | | | | Merge branch 'Buggynours:10.0' into 10.0 | Sergei Golubchik | 2015-05-05 | 47 | -696/+2033 |
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | |||||
| | | * | | | | | | - Fix Catalog JSON table crash when no Jpath | Olivier Bertrand | 2015-04-17 | 25 | -393/+894 |
| | | * | | | | | | Fix MDEV-7890 | Olivier Bertrand | 2015-04-04 | 5 | -16/+48 |
| | | * | | | | | | Correct a typo that made multiple 1 tables to return 0 lines on Linux | Olivier Bertrand | 2015-04-02 | 1 | -1/+1 |
| | | * | | | | | | - Fix MDEV-7879 by adding a test in all SetValue_pval function to return when... | Olivier Bertrand | 2015-03-30 | 2 | -35/+52 |
| | | * | | | | | | D:\Ber\Develop\git3.msg | Olivier Bertrand | 2015-03-28 | 1 | -0/+8 |
| | | * | | | | | | - Fix a bug that caused a crash when doing delete on a json table with wrong ... | Olivier Bertrand | 2015-03-22 | 8 | -70/+29 |
| | | * | | | | | | This commit includes changes done in a previous (deleted) branch plus new ones. | Olivier Bertrand | 2015-03-18 | 20 | -393/+958 |
| | | * | | | | | | - Adding files to ignore from C C++ and Visual Studio | Olivier Bertrand | 2015-03-16 | 2 | -0/+253 |
| | | * | | | | | | Add #include <ostream> in dict0mem.h and change iterator to const_iterator in... | Buggynours | 2015-03-03 | 4 | -2/+4 |
| | * | | | | | | | XtraDB-5.6.23-72.1 | Sergei Golubchik | 2015-05-05 | 30 | -86/+273 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | 5.6.23-72.1 | Sergei Golubchik | 2015-05-04 | 30 | -85/+272 |
| | * | | | | | | | | InnoDB-5.6.24 | Sergei Golubchik | 2015-05-05 | 20 | -492/+439 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | 5.6.24 | Sergei Golubchik | 2015-05-04 | 19 | -491/+438 |
| | * | | | | | | | | | Merge branch 'merge-pcre' into 10.0 | Sergei Golubchik | 2015-05-04 | 41 | -768/+1695 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | 8.37 | Sergei Golubchik | 2015-05-04 | 79 | -7082/+10402 |
| | * | | | | | | | | | | Null-merge branch 'merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2015-05-04 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | move to storage/xtradb | Sergei Golubchik | 2015-05-04 | 365 | -0/+0 |
| | * | | | | | | | | | | Null-merge branch 'merge-sphinx' into 10.0 | Sergei Golubchik | 2015-05-04 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | move to storage/sphinx | Sergei Golubchik | 2015-05-04 | 13 | -0/+0 |