Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-01-12 | 1 | -1/+1 |
|\ | |||||
| * | MDEV-11685: sql_mode can't be set with non-ascii connection charset | Nirbhay Choubey | 2017-01-11 | 1 | -1/+1 |
* | | Fixed failing test cases and compiler warnings | Monty | 2016-04-25 | 1 | -1/+1 |
* | | MDEV-6459 max_relay_log_size and sql_slave_skip_counter misbehave on PPC64 | Sergei Golubchik | 2014-09-10 | 1 | -18/+15 |
* | | MDEV-6459 - max_relay_log_size and sql_slave_skip_counter | Sergey Vojtovich | 2014-07-18 | 1 | -6/+6 |
* | | Merge MariaDB 10.0-base to 10.0. | unknown | 2014-02-10 | 1 | -0/+50 |
|\ \ | |||||
| * | | MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID. | unknown | 2014-02-07 | 1 | -0/+50 |
* | | | Fixes to get valgrind to work with jemalloc | Michael Widenius | 2014-01-02 | 1 | -0/+1 |
* | | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 1 | -5/+52 |
|\ \ \ | |/ / | |||||
| * | | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 1 | -5/+8 |
| |\ \ | | |/ | |||||
| | * | mysql-5.5.33 merge | Sergei Golubchik | 2013-09-06 | 1 | -5/+8 |
| | |\ | |||||
| | | * | Bug#16945503 ADDRESSSANITIZER BUG IN SYS_VARS | Tor Didriksen | 2013-06-21 | 1 | -6/+13 |
| | | * | Bug#16194302: SUPPORT FOR FLOATING-POINT SYSTEM VARIABLES | Ashish Agarwal | 2013-05-19 | 1 | -4/+5 |
| * | | | MDEV-26: Global transaction ID. | unknown | 2013-08-23 | 1 | -0/+41 |
| * | | | merge 5.5 -> 10.0-base | unknown | 2013-08-20 | 1 | -0/+3 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-4815 - allow multiple mysql_server_init() / mysql_server_end() in the s... | Vladislav Vaintroub | 2013-07-29 | 1 | -0/+3 |
* | | | | Fix bug MDEV-4885: When performance schema is disabled, autosized parameters ... | unknown | 2013-08-12 | 1 | -1/+1 |
* | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -0/+2 |
* | | | | | Merge 10.0-base -> 10.0 | unknown | 2013-05-28 | 1 | -3/+105 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | MDEV-26: Global transaction ID. | unknown | 2013-05-22 | 1 | -3/+105 |
* | | | | | Merge 10.0-base -> 10.0 | Igor Babaev | 2013-04-17 | 1 | -2/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixes for stuff seen in buildbot: | unknown | 2013-04-16 | 1 | -0/+1 |
| * | | | | Makeing rpl_filter for each Master_info. | Lixun Peng | 2013-04-16 | 1 | -2/+3 |
* | | | | | Merge 10.0-base -> 10.0 (GTID). | unknown | 2013-04-17 | 1 | -0/+40 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-26: Global transaction ID. First alpha release. | unknown | 2013-04-15 | 1 | -0/+40 |
| |\ \ \ \ | |||||
| | * | | | | MDEV-26: Global transaction ID. | unknown | 2013-04-05 | 1 | -0/+40 |
* | | | | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 1 | -2/+1 |
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | | |||||
| * | | | | 5.5 merge | Sergei Golubchik | 2013-03-27 | 1 | -2/+1 |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | |||||
| | * | | fix @@external_user variable | Sergei Golubchik | 2013-03-26 | 1 | -2/+1 |
* | | | | remove "invisible sysvars" oxymoron | Sergei Golubchik | 2013-02-02 | 1 | -1/+0 |
* | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -15/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATION | Sergei Golubchik | 2012-12-17 | 1 | -15/+0 |
| * | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -44/+44 |
| |\ \ \ | | |/ / | |||||
* | | | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -44/+44 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -43/+43 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Bug#14498355: DEPRECATION WARNINGS SHOULD NOT CONTAIN MYSQL VERSION | Martin Hansson | 2012-08-24 | 1 | -40/+40 |
| | * | | Bug#14003080:65104: MAX_USER_CONNECTIONS WITH PROCESSLIST EMPTY | Praveenkumar Hulakund | 2012-05-28 | 1 | -2/+3 |
* | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -6/+168 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Implementation of Multi-source replication (MDEV:253) | Michael Widenius | 2012-10-04 | 1 | -7/+167 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Changed SHOW_FUNC variabels that don't return SHOW_ARRAY to SHOW_SIMPLE_FUNC. | Michael Widenius | 2012-10-03 | 1 | -7/+6 |
| | * | | Made max_relay_log_size depending on master connection. | Michael Widenius | 2012-10-01 | 1 | -15/+29 |
| | * | | Implementation of Multi-source replication (MDEV:253) | Michael Widenius | 2012-09-28 | 1 | -0/+142 |
| |/ / | |||||
| * | | Fixed compiler warnings | Michael Widenius | 2012-08-17 | 1 | -1/+1 |
| * | | MDEV-450: Deadlock between starting a slave and reading system variables | unknown | 2012-08-14 | 1 | -0/+2 |
* | | | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 1 | -0/+2 |
* | | | Added support of thd->tx_read_only | Michael Widenius | 2012-08-07 | 1 | -0/+24 |
* | | | Fixed compiler warnings | Michael Widenius | 2012-07-06 | 1 | -1/+1 |
|/ / | |||||
* | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 1 | -1/+1 |