summaryrefslogtreecommitdiff
path: root/sql/sql_connect.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'mariadb-10.0.29' into 10.0-galeraNirbhay Choubey2017-01-131-7/+6
|\
| * Merge remote-tracking branch 'origin/5.5' into 10.0vicentiu2017-01-061-7/+6
| |\
| | * add an assertSergei Golubchik2016-12-221-9/+7
* | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-291-1/+2
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2016-04-261-1/+2
| |\ \ | | |/
| | * MDEV-7775 Wrong error message (Unknown error) when idle sessions are killed a...Sergei Golubchik2016-04-251-1/+2
* | | Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-311-1/+0
|\ \ \ | |/ /
| * | remove unneded #include's that had a dubious explanationSergei Golubchik2015-10-241-1/+0
* | | Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-211-5/+8
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2015-06-111-5/+8
| |\ \ | | |/
| | * MDEV-7500 thread_handling option in my.cnf is not passing "connect events" to...Alexey Botchkov2015-06-081-5/+8
* | | bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-051-6/+2
|\ \ \ | |/ /
| * | MDEV-6805 one can set character_set_client to utf32Sergei Golubchik2014-11-181-5/+1
| * | MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-1/+1
* | | bzr merge -rtag:mariadb-10.0.12 maria/10.0Nirbhay Choubey2014-06-191-1/+1
|\ \ \ | |/ /
| * | MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wron...Sergei Golubchik2014-05-131-1/+1
* | | bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-1/+1
|\ \ \ | |/ /
| * | 5.6-compatibility, per-host connect error counter is reset only after theSergei Golubchik2014-05-071-1/+1
* | | Merging revision from codership-mysql/5.5 (r3928..3968) andNirbhay Choubey2014-03-271-13/+1
|\ \ \
| * | | bzr merge -r3933..3945 codership/5.5 (Non-InnoDB changes only).Nirbhay Choubey2014-03-251-13/+1
* | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-2/+2
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | 10.0-base mergeSergei Golubchik2014-02-261-2/+2
| |\ \
| | * \ 5.5 mergeSergei Golubchik2014-02-251-2/+2
| | |\ \ | | | |/
| | | * MySQL-5.5.36 mergeSergei Golubchik2014-02-171-2/+2
| | | |\
| | | | * Updated/added copyright headersMurthy Narkedimilli2014-01-061-1/+1
| | | | * WL#7076: Backporting wl6715 to support both formats Ashish Agarwal2013-08-231-19/+28
| | | | |\
| | | | | * WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7Ashish Agarwal2013-07-021-18/+27
| | | | |/
| | | | * Bug#11753779: MAX_CONNECT_ERRORS WORKS ONLY WHEN 1STHarin Vadodaria2012-09-171-0/+13
| | | | |\
| | | | * \ Bug#11753779: MAX_CONNECT_ERRORS WORKS ONLY WHEN 1STHarin Vadodaria2012-06-191-13/+0
| | | | |\ \
| | | | * \ \ Bug#11753779: MAX_CONNECT_ERRORS WORKS ONLY WHEN 1STHarin Vadodaria2012-06-131-0/+13
| | | | |\ \ \
| | | | * | | | Bug#14003080:65104: MAX_USER_CONNECTIONS WITH PROCESSLIST EMPTYPraveenkumar Hulakund2012-05-281-54/+80
* | | | | | | | Merge 10.0 to galera-10.0Jan Lindström2013-09-031-22/+134
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 10.0-monty mergeSergei Golubchik2013-07-211-22/+134
| |\ \ \ \ \ \ \
| | * | | | | | | MDEV-4058unknown2013-06-271-19/+131
| | * | | | | | | Applied all changes from Igor and SanjaMichael Widenius2013-06-151-1/+1
| | * | | | | | | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-2/+2
* | | | | | | | | Merged with lp:maria revision #3766Seppo Jaakola2013-07-131-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 10.0-base mergeSergei Golubchik2013-06-061-1/+1
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | 5.5 mergeSergei Golubchik2013-06-061-1/+1
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1)Sergei Golubchik2013-04-171-1/+1
* | | | | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-1/+38
|/ / / / / / / /
* | | | | | | | 10.0-base mergeSergei Golubchik2013-04-151-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | / / / / / | |_|/ / / / / |/| | | | | |
| * | | | | | prefer static inline functions to macros.Sergei Golubchik2013-04-091-1/+1
| * | | | | | remove ULL() and LL(), because they're totally unnecessarySergei Golubchik2013-04-071-2/+2
| |/ / / / /
* | | | | | 10.0-base mergeSergei Golubchik2013-01-311-0/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 5.3 mergeSergei Golubchik2013-01-151-0/+13
| |\ \ \ \ \
| | * \ \ \ \ 5.2->5.3 mergeSergei Golubchik2013-01-101-0/+13
| | |\ \ \ \ \
| | | * \ \ \ \ 5.1 mergeSergei Golubchik2013-01-101-0/+13
| | | |\ \ \ \ \
| | | | * \ \ \ \ mysql-5.1.67 mergeSergei Golubchik2013-01-091-5/+35
| | | | |\ \ \ \ \ | | | | | | |_|_|/ | | | | | |/| | |
| | | | | * | | | Bug#11753779: MAX_CONNECT_ERRORS WORKS ONLY WHEN 1STHarin Vadodaria2012-09-171-8/+60
| | | | | | |_|/ | | | | | |/| |
View Lorry Controller Status