Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-05-20 | 1 | -6/+4 |
|\ | |||||
| * | MDEV-15347: Valgrind or ASAN errors in mysql_make_view on query from informat... | Oleksandr Byelkin | 2018-05-15 | 1 | -6/+4 |
* | | Merge branch 'github/10.1' into 10.2 | Sergei Golubchik | 2018-02-06 | 1 | -28/+7 |
|\ \ | |/ | |||||
| * | MDEV-14857: problem with 10.2.11 server crashing when executing stored procedure | Oleksandr Byelkin | 2018-02-01 | 1 | -28/+7 |
* | | Ensure that thd->user_var_events_alloc is always relevant | Monty | 2018-02-01 | 1 | -1/+4 |
* | | Moving a change_list related methods from THD to Item_change_list | Alexander Barkov | 2018-01-16 | 1 | -4/+4 |
* | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-11-21 | 1 | -19/+23 |
|\ \ | |/ | |||||
| * | MDEV-13936: Server crashes in Time_and_counter_tracker::incr_loops | Oleksandr Byelkin | 2017-11-14 | 1 | -19/+23 |
* | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-10-24 | 1 | -3/+9 |
|\ \ | |/ | |||||
| * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-10-22 | 1 | -3/+9 |
| |\ | |||||
| | * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-10-18 | 1 | -2/+0 |
| | |\ | |||||
| | | * | MDEV-13459 Warnings, when compiling with gcc-7.x | Sergei Golubchik | 2017-10-17 | 1 | -1/+1 |
| | * | | MDEV-13676: Field "create Procedure" is NULL, even if the the user has role w... | Vicențiu Ciorbaru | 2017-10-11 | 1 | -1/+9 |
| | * | | Silence bogus GCC 7 warnings -Wimplicit-fallthrough | Marko Mäkelä | 2017-05-17 | 1 | -1/+2 |
* | | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -16/+16 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-09-06 | 1 | -1/+19 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-10972: Insert from select / view / union -- repeatable crash in 10.1, 10... | Oleksandr Byelkin | 2017-09-04 | 1 | -1/+19 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-22 | 1 | -1/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Silence bogus GCC 7 warnings -Wimplicit-fallthrough | Marko Mäkelä | 2017-05-17 | 1 | -1/+2 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-02-10 | 1 | -13/+9 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-01-16 | 1 | -13/+9 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge remote-tracking branch 'origin/5.5' into 10.0 | vicentiu | 2017-01-06 | 1 | -13/+9 |
| | |\ \ | | | |/ | |||||
| | | * | reduce code duplication a littlemariadb-5.5.54 | Sergei Golubchik | 2016-12-22 | 1 | -5/+1 |
| | | * | MDEV-11552 Queries executed by event scheduler are written to slow log incorr... | Sergei Golubchik | 2016-12-17 | 1 | -5/+5 |
* | | | | extend prelocking to FK-accessed tables | Sergei Golubchik | 2016-12-12 | 1 | -1/+1 |
* | | | | cleanup: sp_head::add_used_tables_to_table_list() | Sergei Golubchik | 2016-12-12 | 1 | -27/+6 |
* | | | | MDEV-10585 EXECUTE IMMEDIATE statement | Alexander Barkov | 2016-10-08 | 1 | -0/+1 |
* | | | | Use sql_mode_t for sql_mode. | Monty | 2016-10-05 | 1 | -1/+1 |
* | | | | MDEV-6112 multiple triggers per table | Monty | 2016-10-05 | 1 | -3/+4 |
* | | | | MDEV-8931: (server part of) session state tracking | Oleksandr Byelkin | 2016-08-31 | 1 | -2/+4 |
* | | | | MDEV-8931: (server part of) session state tracking | Oleksandr Byelkin | 2016-08-31 | 1 | -0/+5 |
* | | | | MDEV-8931: (server part of) session state tracking | Oleksandr Byelkin | 2016-08-31 | 1 | -0/+10 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-06-30 | 1 | -4/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 1 | -4/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '5.5' into bb-10.0 | Sergei Golubchik | 2016-06-21 | 1 | -4/+6 |
| | |\ \ | | | |/ | |||||
| | | * | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-06-14 | 1 | -4/+6 |
| | | |\ | |||||
| | | | * | BUG#22286421: NULL POINTER DEREFERENCE | Karthik Kamath | 2016-04-19 | 1 | -3/+4 |
| | | | * | Fix for bug#14188793 - "DEADLOCK CAUSED BY ALTER TABLE DOEN'T CLEAR | Dmitry Lenev | 2013-08-20 | 1 | -9/+25 |
| | | | * | Bug#16056537: MYSQLD CRASHES IN ITEM_FUNC_GET_USER_VAR::FIX_LENGTH_AND_DEC() | Alexander Nozdrin | 2013-02-15 | 1 | -1/+2 |
| | | | * | Merged fix for bug #15954896 "SP, MULTI-TABLE DELETE AND LONG ALIAS" | Dmitry Lenev | 2012-12-05 | 1 | -22/+28 |
| | | | |\ | |||||
| | | | | * | Bug #15954896 "SP, MULTI-TABLE DELETE AND LONG ALIAS". | Dmitry Lenev | 2012-12-05 | 1 | -22/+28 |
| | | | | * | Merge from mysql-5.1.62-release | karen.langford@oracle.com | 2012-03-20 | 1 | -0/+17 |
| | | | | |\ | |||||
| | | | * | \ | Merge the 5.5.22 release build into main 5.5, | Joerg Bruehe | 2012-03-20 | 1 | -0/+17 |
| | | | |\ \ \ | |||||
| | | | | * \ \ | Merge from mysql-5.1-security to mysql-5.5-security | Jon Olav Hauglid | 2012-01-09 | 1 | -0/+17 |
| | | | | |\ \ \ | | | | | | | |/ | | | | | | |/| | |||||
| | | | | | * | | Backport from mysql-trunk of: | Jon Olav Hauglid | 2012-01-09 | 1 | -0/+17 |
| | | | * | | | | Merge from 5.1 to 5.5 | Praveenkumar Hulakund | 2012-02-29 | 1 | -1/+1 |
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | / | | | | | | |/ | | | | | |/| | |||||
| | | | | * | | Bug#12601974 - STORED PROCEDURE SQL_MODE=NO_BACKSLASH_ESCAPES IGNORED AND BRE... | Praveenkumar Hulakund | 2012-02-29 | 1 | -1/+1 |
| | | | | |/ | |||||
| | | | * | | Bug12589870 post merge fixes - manual merge | Tatjana Azundris Nuernberg | 2011-10-19 | 1 | -1/+1 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | Bug12589870 post-merge fixes for Sparc64 and friends | Tatjana Azundris Nuernberg | 2011-10-19 | 1 | -1/+1 |
| | | | * | | Merge from 5.1-security | Magne Mahre | 2011-10-07 | 1 | -1/+11 |
| | | | |\ \ | | | | | |/ |