summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge fix.Jan Lindström2013-09-091-10/+15
* Merge 10.0 to galera-10.0Jan Lindström2013-09-031-93/+236
|\
| * MDEV-4702 - Reduce usage of LOCK_openSergey Vojtovich2013-08-141-2/+2
| * cosmetic fixesSergei Golubchik2013-07-211-7/+6
| * 10.0-monty mergeSergei Golubchik2013-07-211-78/+199
| |\
| | * fix pfs_digest* tests.Sergei Golubchik2013-07-141-6/+5
| | * remove unused functionSergei Golubchik2013-07-111-30/+0
| | * fix alter_table.test: remove old assert as it was removed from 5.6,Sergei Golubchik2013-07-111-1/+0
| | * fix status.test - don't use lock_tables_precheck() for SHOW PROC STATUS,Sergei Golubchik2013-07-101-6/+2
| | * MDEV-4058unknown2013-06-271-4/+4
| | * merge of 2876.430.11 & 2876.430.1unknown2013-06-271-21/+101
| | * Fixed some merge issues:Michael Widenius2013-06-181-2/+70
| | * Applied all changes from Igor and SanjaMichael Widenius2013-06-151-39/+46
| | * Temporary commit of 10.0-mergeMichael Widenius2013-03-261-2/+2
| * | 10.0-base mergeSergei Golubchik2013-07-181-0/+22
| |\ \
| | * \ 5.5 mergeSergei Golubchik2013-07-171-0/+11
| | |\ \
| | | * \ mysql-5.5.32 mergeSergei Golubchik2013-07-161-0/+5
| | | |\ \
| | | | * | Bug#16169063: SECURITY CONCERN BECAUSE OF INSUFFICIENT LOGGINGAshish Agarwal2013-03-071-0/+5
| | | | * | Bug #15948123: SERVER WORKS INCORRECT WITH LONG TABLE ALIASESGleb Shchepa2012-12-051-2/+7
| | | | * | BUG#14458232 - CRASH IN THD_IS_TRANSACTION_ACTIVE DURINGThayumanavar2012-11-091-2/+8
| | | * | | MDEV-4752: Segfault during parsing of illegal queryunknown2013-07-041-0/+2
| | | * | | MDEV-4683 query start_time not reset when going to sleepSergei Golubchik2013-07-011-0/+1
| | | * | | MDEV-4578 information_schema.processlist reports incorrect value for Time (21...Sergei Golubchik2013-06-131-0/+3
| | * | | | MDEV-4660 SHUTDOWN commandSergei Golubchik2013-06-241-0/+11
| * | | | | MDEV-4547 [PATCH] Make REFRESH_* constants to be 64-bit in 32-bit compilationunknown2013-07-161-1/+1
* | | | | | Initial fixes after mariadb 10 merge, basic replication works nowSeppo Jaakola2013-07-161-0/+9
* | | | | | Merged with lp:maria revision #3766Seppo Jaakola2013-07-131-1/+23
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 10.0-base mergeSergei Golubchik2013-06-061-1/+23
| |\ \ \ \ \ | | |/ / / /
| | * | | | 5.5 mergeSergei Golubchik2013-06-061-1/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-4206 : log all slow statements (do not use filters), if log_slow_filte...Vladislav Vaintroub2013-05-081-1/+2
| | * | | | MDEV-26: Global transaction ID.unknown2013-06-051-0/+21
* | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-7/+1145
|/ / / / /
* | | | | 10.0 mergeSergei Golubchik2013-04-191-28/+84
|\ \ \ \ \
| * \ \ \ \ Merge 10.0-base -> 10.0Igor Babaev2013-04-171-2/+9
| |\ \ \ \ \ | | |/ / / /
| | * | | | Makeing rpl_filter for each Master_info.Lixun Peng2013-04-161-2/+9
| * | | | | Merge 10.0-base -> 10.0 (GTID).unknown2013-04-171-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-26: Global transaction ID. First alpha release.unknown2013-04-151-2/+2
| | |\ \ \ \
| | | * | | | MDEV-500: Session variable for server_idunknown2012-10-231-2/+2
| * | | | | | 10.0-base mergeSergei Golubchik2013-04-151-23/+72
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).Alexey Botchkov2013-04-131-10/+10
| | * | | | | prefer static inline functions to macros.Sergei Golubchik2013-04-091-1/+1