Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'mariadb-10.0.20' into 10.1 | Sergei Golubchik | 2015-06-27 | 1 | -5/+8 |
|\ | |||||
| * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-06-11 | 1 | -5/+8 |
| |\ | |||||
| | * | MDEV-7500 thread_handling option in my.cnf is not passing "connect events" to... | Alexey Botchkov | 2015-06-08 | 1 | -5/+8 |
* | | | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 1 | -6/+2 |
|\ \ \ | |/ / | |||||
| * | | MDEV-6805 one can set character_set_client to utf32 | Sergei Golubchik | 2014-11-18 | 1 | -5/+1 |
| * | | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -1/+1 |
* | | | MDEV-6108 update userstat feature from percona server | Sergei Golubchik | 2014-10-11 | 1 | -3/+9 |
* | | | cleanup: remove dead code | Sergei Golubchik | 2014-10-11 | 1 | -54/+0 |
* | | | MDEV 4427: query timeouts | Monty | 2014-10-07 | 1 | -1/+6 |
* | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -1/+24 |
|/ / | |||||
* | | MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wron... | Sergei Golubchik | 2014-05-13 | 1 | -1/+1 |
* | | 5.6-compatibility, per-host connect error counter is reset only after the | Sergei Golubchik | 2014-05-07 | 1 | -1/+1 |
* | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -2/+2 |
|\ \ | |||||
| * \ | 5.5 merge | Sergei Golubchik | 2014-02-25 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 1 | -1/+1 |
| | | * | WL#7076: Backporting wl6715 to support both formats | Ashish Agarwal | 2013-08-23 | 1 | -19/+28 |
| | | |\ | |||||
| | | | * | WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7 | Ashish Agarwal | 2013-07-02 | 1 | -18/+27 |
| | | |/ | |||||
| | | * | Bug#11753779: MAX_CONNECT_ERRORS WORKS ONLY WHEN 1ST | Harin Vadodaria | 2012-09-17 | 1 | -0/+13 |
| | | |\ | |||||
| | | * \ | Bug#11753779: MAX_CONNECT_ERRORS WORKS ONLY WHEN 1ST | Harin Vadodaria | 2012-06-19 | 1 | -13/+0 |
| | | |\ \ | |||||
| | | * \ \ | Bug#11753779: MAX_CONNECT_ERRORS WORKS ONLY WHEN 1ST | Harin Vadodaria | 2012-06-13 | 1 | -0/+13 |
| | | |\ \ \ | |||||
| | | * | | | | Bug#14003080:65104: MAX_USER_CONNECTIONS WITH PROCESSLIST EMPTY | Praveenkumar Hulakund | 2012-05-28 | 1 | -54/+80 |
* | | | | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -22/+134 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | MDEV-4058 | unknown | 2013-06-27 | 1 | -19/+131 |
| * | | | | | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -1/+1 |
| * | | | | | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -2/+2 |
* | | | | | | | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1) | Sergei Golubchik | 2013-04-17 | 1 | -1/+1 |
* | | | | | | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | / / / / / | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | prefer static inline functions to macros. | Sergei Golubchik | 2013-04-09 | 1 | -1/+1 |
| * | | | | | | remove ULL() and LL(), because they're totally unnecessary | Sergei Golubchik | 2013-04-07 | 1 | -2/+2 |
| |/ / / / / | |||||
* | | | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -0/+13 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 5.3 merge | Sergei Golubchik | 2013-01-15 | 1 | -0/+13 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | 5.2->5.3 merge | Sergei Golubchik | 2013-01-10 | 1 | -0/+13 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | 5.1 merge | Sergei Golubchik | 2013-01-10 | 1 | -0/+13 |
| | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ | mysql-5.1.67 merge | Sergei Golubchik | 2013-01-09 | 1 | -5/+35 |
| | | | |\ \ \ \ \ | | | | | | |_|_|/ | | | | | |/| | | | |||||
| | | | | * | | | | Bug#11753779: MAX_CONNECT_ERRORS WORKS ONLY WHEN 1ST | Harin Vadodaria | 2012-09-17 | 1 | -8/+60 |
| | | | | | |_|/ | | | | | |/| | | |||||
| | | | | * | | | Bug#11753779: MAX_CONNECT_ERRORS WORKS ONLY WHEN 1ST | Harin Vadodaria | 2012-06-19 | 1 | -50/+4 |
| | | | | | |/ | | | | | |/| | |||||
| | | | | * | | Bug#11753779: MAX_CONNECT_ERRORS WORKS ONLY WHEN 1ST | Harin Vadodaria | 2012-06-13 | 1 | -4/+50 |
| | * | | | | | merge | Sergei Golubchik | 2012-04-05 | 1 | -4/+29 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | merge | Sergei Golubchik | 2012-04-05 | 1 | -4/+29 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | mysql-5.1.62 merge | Sergei Golubchik | 2012-04-05 | 1 | -4/+29 |
| | | | |\ \ \ | | | | | |/ / | |||||
| | | | * | | | A recent change in the server protocol code broke SSL connection for some cli... | Vladislav Vaintroub | 2012-02-11 | 1 | -14/+21 |
* | | | | | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -1/+2 |
|/ / / / / / | |||||
* | | | | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -2/+2 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2012-02-15 | 1 | -1/+1 |
* | | | | | | Update copyright notices | Vladislav Vaintroub | 2012-02-28 | 1 | -1/+1 |
* | | | | | | merge | Vladislav Vaintroub | 2012-01-24 | 1 | -2/+29 |
|\ \ \ \ \ \ |