Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | A clean-up patch for Item_func_conv_charset (needed for MDEV-9181) | Alexander Barkov | 2016-01-26 | 2 | -7/+9 |
* | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-01-25 | 10 | -33/+89 |
|\ | |||||
| * | Merge branch 'tmp' into tmp-10.0 | Kristian Nielsen | 2016-01-15 | 4 | -10/+27 |
| |\ | |||||
| * | | Fixed bug in semi_sync replication tests. | Monty | 2016-01-03 | 4 | -11/+12 |
| * | | Cleanup of slave code: | Monty | 2016-01-03 | 9 | -22/+77 |
* | | | MDEV-9428 NO_AUTO_VALUE_ON_ZERO is ignored when a trigger before insert is de... | Sergei Golubchik | 2016-01-25 | 1 | -1/+4 |
* | | | MDEV-9273 ERROR 1819 on grant statment for existing user | Sergei Golubchik | 2016-01-25 | 1 | -4/+6 |
* | | | cleanup: move all password validation logic into one function | Sergei Golubchik | 2016-01-25 | 1 | -31/+33 |
* | | | cleanup: LEX_USER::pwtext and LEX_USER::pwhash | Sergei Golubchik | 2016-01-25 | 3 | -49/+59 |
* | | | cleanup: create LEX_USER::reset_auth() | Sergei Golubchik | 2016-01-25 | 5 | -23/+15 |
* | | | MDEV-8208 Sporadic SEGFAULT on startup | Sergei Golubchik | 2016-01-25 | 4 | -67/+16 |
* | | | cleanup: wsrep helper to create a thread | Sergei Golubchik | 2016-01-25 | 1 | -7/+10 |
* | | | MDEV-9457: Poor query plan chosen for ORDER BY query by a recent 10.1 | Sergei Petrunia | 2016-01-24 | 1 | -5/+16 |
* | | | MDEV-9118 ANALYZE TABLE for Engine independent status fetchs blob/text column... | Oleksandr Byelkin | 2016-01-22 | 2 | -6/+28 |
* | | | After-merge fix. | Kristian Nielsen | 2016-01-15 | 1 | -2/+1 |
* | | | Merge branch 'tmp' into tmp-10.1 | Kristian Nielsen | 2016-01-15 | 4 | -10/+27 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix error handling for GTID and domain-based parallel replication | Kristian Nielsen | 2016-01-15 | 4 | -10/+27 |
* | | | Merge remote-tracking branch 'origin/10.0' into 10.1 | Alexander Barkov | 2015-12-29 | 1 | -5/+5 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge remote-tracking branch 'origin/5.5' into 10.0 | Alexander Barkov | 2015-12-29 | 1 | -5/+5 |
| |\ \ | |||||
| | * | | Moving Field_blob::store_length() back from protected to public, | Alexander Barkov | 2015-12-29 | 1 | -5/+5 |
* | | | | Merge remote-tracking branch 'origin/10.0' into 10.1 | Alexander Barkov | 2015-12-29 | 3 | -13/+36 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge remote-tracking branch 'origin/5.5' into 10.0 | Alexander Barkov | 2015-12-29 | 3 | -13/+36 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-9319 ALTER from a bigger to a smaller blob type truncates too much data | Alexander Barkov | 2015-12-29 | 3 | -13/+36 |
* | | | | Merge branch '10.0-galera' into 10.1 | Nirbhay Choubey | 2015-12-23 | 2 | -8/+18 |
|\ \ \ \ | |||||
| * | | | | MDEV-9224: postfix - thd can be null in reload_acl_and_cache()mariadb-galera-10.0.23 | Nirbhay Choubey | 2015-12-23 | 1 | -1/+1 |
| * | | | | Merge branch '5.5-galera' into 10.0-galera | Nirbhay Choubey | 2015-12-22 | 1 | -8/+8 |
| |\ \ \ \ | |||||
| | * | | | | MDEV-9290 : InnoDB: Assertion failure in file trx0sys.cc line 353mariadb-galera-5.5.47 | Nirbhay Choubey | 2015-12-22 | 1 | -8/+8 |
| * | | | | | MDEV-9224 : Database lockup on flush in galera | Nirbhay Choubey | 2015-12-22 | 1 | -0/+10 |
* | | | | | | MDEV-9095 - [PATCH] systemd capability for --memlock | Sergey Vojtovich | 2015-12-22 | 1 | -10/+18 |
* | | | | | | Merge branch '10.1' into bb-10.1-serg | Sergei Golubchik | 2015-12-22 | 2 | -6/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | MDEV-7540 Information Schema SPATIAL_REF_SYS contents don't match the expecte... | Alexey Botchkov | 2015-12-21 | 1 | -5/+12 |
| * | | | | | | MDEV-8627: SHOW GRANTS does not work for a replicated role | Vicențiu Ciorbaru | 2015-12-21 | 1 | -1/+1 |
* | | | | | | | fix galera.lp1438990 test | Sergei Golubchik | 2015-12-22 | 1 | -2/+4 |
* | | | | | | | Merge branch 'github/10.0-galera' into 10.1 | Sergei Golubchik | 2015-12-22 | 8 | -4/+36 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge branch '5.5-galera' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 1 | -1/+11 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | MDEV-9290 : InnoDB: Assertion failure in file trx0sys.cc line 353 | Nirbhay Choubey | 2015-12-16 | 1 | -1/+11 |
| | * | | | | | Merge tag 'mariadb-5.5.47' into 5.5-galera | Nirbhay Choubey | 2015-12-10 | 25 | -83/+209 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge tag 'mariadb-5.5.46' into 5.5-galera | Nirbhay Choubey | 2015-10-13 | 23 | -178/+393 |
| | |\ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 48 | -331/+830 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | MDEV-9162 : MariaDB Galera Cluster memory leak on async slave node | Nirbhay Choubey | 2015-12-14 | 4 | -3/+20 |
* | | | | | | | | | | MDEV-8605 MariaDB not use DEFAULT value even when inserted NULL for NOT NULLA... | Sergei Golubchik | 2015-12-21 | 12 | -67/+250 |
* | | | | | | | | | | cleanup | Sergei Golubchik | 2015-12-21 | 8 | -67/+43 |
* | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 36 | -174/+177 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | MDEV-9088 Server crashes on shutdown after the second post of feedback report | Sergei Golubchik | 2015-12-19 | 11 | -25/+1 |
| | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | MDEV-8378 - Debian: the Lintian complains about many "shlib-calls-exit" in manymariadb-10.0.23 | Sergey Vojtovich | 2015-12-16 | 1 | -3/+0 |
| * | | | | | | | | after-merge fix partitioning tests | Sergei Golubchik | 2015-12-15 | 1 | -0/+1 |
| * | | | | | | | | MDEV-9147: Character set is ignored in Dynamic Column for saved string | Oleksandr Byelkin | 2015-12-15 | 1 | -0/+2 |
| * | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-12-13 | 16 | -61/+62 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| | * | | | | | | | MDEV-7655 SHOW CREATE TABLE returns invalid DDL when using virtual columns al... | Sergei Golubchik | 2015-12-11 | 1 | -1/+1 |
| | * | | | | | | | revert 5e9a50efc37c233f1e2a3616f8bcb36315aba4c2 | Sergei Golubchik | 2015-12-11 | 1 | -3/+1 |