Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-02-10 | 3 | -13/+143 |
|\ | |||||
| * | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-01-26 | 1 | -12/+60 |
| |\ | |||||
| | * | MDEV-4774 Strangeness with max_binlog_stmt_cache_size Settings | Sachin Setiya | 2017-01-20 | 1 | -12/+60 |
| * | | Merge remote-tracking branch 'origin/10.1' into 10.1bb-10.1-vicentiu-galera | Vicențiu Ciorbaru | 2017-01-16 | 1 | -7/+8 |
| |\ \ | |||||
| * \ \ | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-01-16 | 2 | -1/+83 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge branch 'bb-10.0-vicentiu' into 10.0mariadb-10.0.29 | Vicențiu Ciorbaru | 2017-01-12 | 2 | -1/+83 |
| | |\ \ | |||||
| | | * \ | Merge remote-tracking branch 'origin/5.5' into 10.0 | vicentiu | 2017-01-06 | 2 | -1/+83 |
| | | |\ \ | |||||
| | | | * | | MDEV-11676 Starting service with mysqld_safe_helper fails in SELINUX "enforci... | Sergei Golubchik | 2017-01-04 | 1 | -1/+2 |
| | | | * | | move check_user/set_user from mysqld.cc to mysys | Sergei Golubchik | 2016-12-22 | 2 | -2/+83 |
* | | | | | | Merge 10.1 to 10.2. | Marko Mäkelä | 2017-01-19 | 1 | -7/+8 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | cleanup: make malloc_size_cb_func always defined | Sergei Golubchik | 2017-01-15 | 1 | -7/+8 |
| |/ / / / | |||||
* | | | | | Make atomic writes general | Sergei Golubchik | 2017-01-11 | 2 | -0/+334 |
* | | | | | Removed usage of my_hash_search() with uninitialized HASH. | Monty | 2017-01-11 | 1 | -7/+7 |
* | | | | | Improve mysys/hash by caching hash_nr | Monty | 2017-01-11 | 2 | -69/+173 |
* | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-01-10 | 1 | -1/+6 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-01-10 | 1 | -1/+6 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | MDEV-11087 Search path for my.ini is wrong for default installation | Vladislav Vaintroub | 2017-01-06 | 1 | -1/+6 |
| | |/ / | |||||
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 5 | -8/+19 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix escaping '\' in a string constant. | Vladislav Vaintroub | 2016-10-22 | 1 | -1/+1 |
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-09-29 | 1 | -3/+3 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-09-29 | 1 | -3/+3 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-10907 MTR and server writes can interleave in the error log | Vladislav Vaintroub | 2016-09-27 | 1 | -3/+3 |
| * | | | MDEV-10508 Mariadb crash on out of disk space during dump import | Sergei Golubchik | 2016-09-28 | 1 | -2/+2 |
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-09-28 | 2 | -3/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-09-27 | 2 | -3/+5 |
| | |\ \ | | | |/ | |||||
| | | * | don't use my_copystat in the server | Sergei Golubchik | 2016-09-12 | 2 | -3/+5 |
| * | | | MDEV-10823 Certain unicode characters in hostname prevent mysqld from starting | Vladislav Vaintroub | 2016-09-27 | 1 | -0/+9 |
* | | | | MDEV-5800 MyISAM support for indexed vcols | Sergei Golubchik | 2016-12-12 | 1 | -1/+1 |
* | | | | cleanup: my_printf_error(ER_xxx, ER(ER_xxx), ... ) | Sergei Golubchik | 2016-12-12 | 1 | -1/+1 |
* | | | | fix stack traces when linking with libbfd | Sergei Golubchik | 2016-12-12 | 1 | -12/+18 |
* | | | | fix build and some warnings | kevg | 2016-11-24 | 1 | -12/+0 |
* | | | | MDEV-11255 LDML: allow defining 2-level UCA collations | Alexander Barkov | 2016-11-08 | 1 | -7/+38 |
* | | | | MDEV-10943 . Workaround linker error on Linux. Linux does not actually use __... | Vladislav Vaintroub | 2016-10-15 | 1 | -2/+2 |
* | | | | MDEV-9736: Window functions: multiple cursors to read filesort result | Sergei Petrunia | 2016-09-24 | 1 | -14/+134 |
* | | | | MDEV-10877 xxx_unicode_nopad_ci collations | Alexander Barkov | 2016-09-23 | 2 | -5/+30 |
* | | | | Merge branch '10.2' into bb-10.2-connector-c-integ-subm | Sergei Golubchik | 2016-09-21 | 4 | -40/+171 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-09-09 | 2 | -14/+33 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 2 | -11/+8 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Fixed compiler error and some warnings on windows | Monty | 2016-08-23 | 1 | -1/+1 |
| | | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-08-10 | 1 | -10/+7 |
| | | |\ \ | | | | |/ | |||||
| | | | * | MDEV-10357 my_context_continue() does not store current fiber on Windows | Vladislav Vaintroub | 2016-08-03 | 1 | -10/+7 |
| | * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-07-13 | 1 | -4/+26 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | [MDEV-9127] Crash reporter often fails to show the query that crashed | Vicențiu Ciorbaru | 2016-07-12 | 1 | -4/+26 |
| * | | | | MDEV-9711 NO PAD collations | Alexander Barkov | 2016-09-06 | 2 | -5/+45 |
| * | | | | MDEV-10743 LDML: a new syntax to reuse sort order from another 8bit simple co... | Alexander Barkov | 2016-09-06 | 1 | -5/+93 |
| * | | | | LDML refactoring for "MDEV-9711 NO PAD collations" | Alexander Barkov | 2016-09-03 | 1 | -16/+0 |
* | | | | | name clash with gnutls on on base64_encode | Sergei Golubchik | 2016-09-12 | 1 | -16/+16 |
* | | | | | After-review changes | Sergei Golubchik | 2016-09-12 | 2 | -7/+7 |
* | | | | | MDEV-9293 - Use MariaDB's Connector/C in server | Vladislav Vaintroub | 2016-08-25 | 3 | -1/+217 |
|/ / / / | |||||
* | | | | Revert "MDEV-9293 Connector/C integration" | Vladislav Vaintroub | 2016-08-19 | 3 | -217/+1 |