Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-10-30 | 1 | -42/+42 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-30 | 1 | -38/+26 |
| |\ | |||||
| | * | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-10-24 | 1 | -38/+26 |
| | |\ | |||||
| | | * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-10-22 | 1 | -38/+26 |
| | | |\ | |||||
| | | | * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-10-18 | 1 | -39/+26 |
| | | | |\ | |||||
| | | | | * | MDEV-13459 Warnings, when compiling with gcc-7.x | Sergei Golubchik | 2017-10-17 | 1 | -37/+37 |
| | | | | * | MDEV-10892 - rpl.rpl_semi_sync_uninstall_plugin fails with Assertion `0' failure | Sergey Vojtovich | 2017-10-13 | 1 | -34/+23 |
| * | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-18 | 1 | -4/+16 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | MW-416 | sjaakola | 2017-10-10 | 1 | -4/+16 |
* | | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-10-04 | 1 | -10/+10 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-02 | 1 | -10/+10 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | MDEV-13384 - misc Windows warnings fixed | Vladislav Vaintroub | 2017-09-28 | 1 | -3/+3 |
| | * | | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -7/+7 |
* | | | | | | simplify READ_RECORD usage NFC | Eugene Kosov | 2017-08-31 | 1 | -1/+1 |
* | | | | | | Added DBUG_ASSERT_AS_PRINTF compile flag | Monty | 2017-08-24 | 1 | -1/+1 |
* | | | | | | Enusure that my_global.h is included first | Michael Widenius | 2017-08-24 | 1 | -2/+2 |
* | | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-07-07 | 1 | -9/+15 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-07-07 | 1 | -9/+15 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-07-05 | 1 | -9/+15 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge remote-tracking branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-06-21 | 1 | -9/+15 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-06-20 | 1 | -9/+11 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | MDEV-13063 Server crashes in intern_plugin_lock or assertion `plugin_ptr->ref... | Sergei Golubchik | 2017-06-14 | 1 | -1/+1 |
| | | | | * | cleanup: move common test into a function | Sergei Golubchik | 2017-06-14 | 1 | -8/+10 |
| | | | * | | Silence bogus GCC 7 warnings -Wimplicit-fallthrough | Marko Mäkelä | 2017-05-17 | 1 | -2/+3 |
* | | | | | | MDEV-12179: Per-engine mysql.gtid_slave_pos table | Kristian Nielsen | 2017-07-03 | 1 | -0/+30 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Clarify plugin_ref lifetimes in function comments | Kristian Nielsen | 2017-04-21 | 1 | -0/+24 |
| * | | | | | | MDEV-12179: Per-engine mysql.gtid_slave_pos table | Kristian Nielsen | 2017-04-21 | 1 | -0/+6 |
* | | | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-06-19 | 1 | -2/+3 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-06-15 | 1 | -2/+3 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-22 | 1 | -2/+3 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | Silence bogus GCC 7 warnings -Wimplicit-fallthrough | Marko Mäkelä | 2017-05-17 | 1 | -2/+3 |
* | | | | | | | Merge branch 'bb-10.2-ext' into 10.3 | Marko Mäkelä | 2017-06-02 | 1 | -12/+18 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge tag 'mariadb-10.2.6' into bb-10.2-ext | Alexander Barkov | 2017-05-26 | 1 | -12/+18 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-06 | 1 | -12/+18 |
| | |\ \ \ \ \ | | | |/ / / / | | | | / / / | | | |/ / / | | |/| | | | |||||
| | | * | | | MDEV-9566 Server code changes in preparation for mariabackup | Vladislav Vaintroub | 2017-04-27 | 1 | -12/+18 |
* | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-04-24 | 1 | -36/+41 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Changing field::field_name and Item::name to LEX_CSTRING | Monty | 2017-04-23 | 1 | -36/+41 |
* | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-04-07 | 1 | -2/+3 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | MDEV-10139 Support for SEQUENCE objects | Monty | 2017-04-07 | 1 | -2/+3 |
| |/ / / / | |||||
* | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-04-03 | 1 | -18/+11 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -18/+11 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | cleanup: sort various lists of services | Sergei Golubchik | 2017-03-10 | 1 | -2/+2 |
| | * | | | make sql_udf.cc to shorten dlerror() messages | Sergei Golubchik | 2017-03-10 | 1 | -10/+2 |
| | * | | | cleanup: change dd_frm_type() to return the engine name, not legacy_db_type | Sergei Golubchik | 2017-03-10 | 1 | -3/+4 |
* | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-03-24 | 1 | -3/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fix several compile warnings on Windows | Vladislav Vaintroub | 2017-03-17 | 1 | -3/+3 |
* | | | | | MDEV-11379, MDEV-11388 - [WAIT n|NOWAIT] | Sergey Vojtovich | 2017-03-22 | 1 | -1/+2 |
|/ / / / | |||||
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 1 | -83/+65 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-10944: GALERA log-slave-updates FAIL after upgrading from 10.1.17 to 10.... | Nirbhay Choubey | 2016-11-02 | 1 | -0/+6 |
| * | | | init plugin psi keys before LOCK_plugin | Sergei Golubchik | 2016-09-29 | 1 | -4/+3 |