summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-011-5/+45
|\
| * perfschema 5.6.24Sergei Golubchik2015-05-051-5/+45
* | MDEV-7943 - pthread_getspecific() takes 0.76% in OLTP ROSergey Vojtovich2015-05-131-26/+31
* | MDEV-7951 - sql_alloc() takes 0.25% in OLTP ROSergey Vojtovich2015-05-131-4/+4
* | MDEV-8001 - mysql_reset_thd_for_next_command() takes 0.04% in OLTP ROSergey Vojtovich2015-05-131-12/+5
* | SET STATEMENT timestamp=xxx ....Sergei Golubchik2015-04-091-1/+1
* | MDEV-6572 "USE dbname" with a bad sequence erroneously connects to a wrong da...Alexander Barkov2015-03-161-2/+3
* | MDEV-6650 - LINT_INIT emits code in non-debug buildsSergey Vojtovich2015-03-161-2/+1
* | MDEV-6997: SET STATEMENT last_insert_id FOR ... does not affect the value wri...Oleksandr Byelkin2015-03-131-0/+12
* | Clean-up:Alexander Barkov2015-03-121-1/+1
* | MDEV-7006 MDEV-7007: SET STATEMENT and slow logOleksandr Byelkin2015-03-121-2/+16
* | MDEV-6956:SET STATEMENT default_master_connection = ... has no effectOleksandr Byelkin2015-03-121-0/+3
* | Merge branch '10.0' into 10.1Sergei Golubchik2015-03-071-4/+8
|\ \ | |/
| * MDEV-6769 DROP TRIGGER IF NOT EXIST binlogged on master but not on slaveSergei Golubchik2015-02-221-4/+8
* | MDEV-7281 EVENT: CREATE OR REPLACEAlexander Barkov2015-02-271-2/+1
* | Merge 10.0-galera into 10.1Sergei Golubchik2015-02-061-3/+1
|\ \
| * \ maria-10.0.16 mergeNirbhay Choubey2015-01-261-7/+117
| |\ \ | | |/
| * | MDEV-6832: ER_LOCK_WAIT_TIMEOUT on SHOW STATUSNirbhay Choubey2014-12-311-2/+2
| * | bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-051-15/+7
| |\ \
| * | | bzr merge -r4123..4144 codership/5.6Nirbhay Choubey2014-09-301-5/+1
| * | | bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-281-5/+9
| |\ \ \
| * | | | MDEV-6740 : Galera crash in rpl_sql_thread_info/cached_charset_compareNirbhay Choubey2014-09-221-2/+2
| * | | | bzr merge -c4123 codership/5.6/Nirbhay Choubey2014-08-121-5/+33
| * | | | bzr merge -r4104..4120 codership/5.6/Nirbhay Choubey2014-08-121-2/+4
| * | | | bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-111-5/+8
| |\ \ \ \
| * \ \ \ \ bzr merge -rtag:mariadb-10.0.12 maria/10.0Nirbhay Choubey2014-06-191-4/+4
| |\ \ \ \ \
| * | | | | | Merging changes from maria-5.5-galera andNirbhay Choubey2014-05-221-4/+6
| * | | | | | bzr merge -r4089..4091 codership/5.6Nirbhay Choubey2014-05-211-0/+3
| * | | | | | bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-81/+38
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merging mariadb-10.0.10.Nirbhay Choubey2014-04-081-18/+30
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merging revision from codership-mysql/5.5 (r3928..3968) andNirbhay Choubey2014-03-271-8/+16
| |\ \ \ \ \ \ \ \
| | * | | | | | | | bzr merge -r3933..3945 codership/5.5 (Non-InnoDB changes only).Nirbhay Choubey2014-03-251-5/+1
| | * | | | | | | | bzr merge -r3928..3932 codership/5.5Nirbhay Choubey2014-03-251-3/+15
| * | | | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-54/+123
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.Nirbhay Choubey2014-01-301-1/+12
| * | | | | | | | | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-251-9/+38
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed issue with retrying autocommitted transactions. We might need toJan Lindström2014-01-201-0/+5
| * | | | | | | | | | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-147/+274
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | bzr merge -r3904..3928 lp:codership-mysql/5.5Seppo Jaakola2013-11-271-6/+32
| * | | | | | | | | | | bzr merge -r3895..3903 lp:codership-mysql/5.5 Seppo Jaakola2013-11-261-6/+17
| * | | | | | | | | | | Merges from lp:codership-mysql/5.5 up to rev #3893, this changes to wsrep API...Seppo Jaakola2013-11-261-2/+0
| * | | | | | | | | | | bzr merge -r3890..3891 lp:codership-mysql/5.5Seppo Jaakola2013-11-061-690/+1
| * | | | | | | | | | | bzr merge -r3889..3890 lp:codership-mysql/5.5Seppo Jaakola2013-11-061-78/+75
| * | | | | | | | | | | Fixed performance schema instrumentation on galera and added correct mutexing...Jan Lindström2013-10-151-6/+16
| * | | | | | | | | | | Fix incorrect mergeJan Lindström2013-10-141-6/+6
| * | | | | | | | | | | Merged revisions 3425..3430 from mariadb-galera-5.5Seppo Jaakola2013-10-071-3/+6
| * | | | | | | | | | | Merged revisions 3418..3424 from mariadb-galera-5.5Seppo Jaakola2013-10-071-0/+24
| * | | | | | | | | | | Merged revisions 3411..3417 from mariadb-galera-5.5Seppo Jaakola2013-10-071-6/+19
| * | | | | | | | | | | Merged revisions 3409..3411 from mariadb-galera-5.5Seppo Jaakola2013-10-061-7/+5
| * | | | | | | | | | | After merge fixesJan Lindström2013-09-251-8/+7