Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-04-24 | 1 | -3/+3 |
|\ | |||||
| * | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-04-24 | 1 | -3/+3 |
| |\ | |||||
| | * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-04-20 | 1 | -3/+3 |
| | |\ | |||||
| | | * | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2018-04-19 | 1 | -3/+3 |
| | | |\ | |||||
| | | | * | BUG#26881798: SERVER EXITS WHEN PRIMARY KEY IN MYSQL.PROC | Karthik Kamath | 2017-12-05 | 1 | -2/+2 |
* | | | | | Merge branch 'github/10.1' into 10.2 | Sergei Golubchik | 2018-02-06 | 1 | -1/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-14857: problem with 10.2.11 server crashing when executing stored procedure | Oleksandr Byelkin | 2018-02-01 | 1 | -1/+0 |
* | | | | | MDEV-14249 Wrong character set info of Query_log_event and the query in Query... | Alexander Barkov | 2017-12-27 | 1 | -2/+2 |
* | | | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -7/+7 |
* | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-09-06 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-10972: Insert from select / view / union -- repeatable crash in 10.1, 10... | Oleksandr Byelkin | 2017-09-04 | 1 | -0/+1 |
* | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-05-09 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.0' 10.1 | Sergei Golubchik | 2017-04-28 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-04-21 | 1 | -2/+2 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55 | Sergei Golubchik | 2017-04-11 | 1 | -3/+3 |
| | | |\ \ | | | | |/ | |||||
| | | | * | (no commit message) | Arun Kuruvila | 2016-11-28 | 1 | -2/+2 |
| | | * | | Fix for bug#11759114 - '51401: GRANT TREATS NONEXISTENT | Dmitry Lenev | 2017-02-27 | 1 | -12/+10 |
| * | | | | Followup for 2783fc7: return an error to the caller if mysql.proc cannot be o...mariadb-10.1.13 | Oleksandr Byelkin | 2016-03-24 | 1 | -0/+1 |
* | | | | | MDEV-11597 Assertion when doing select from virtual column with impossible value | Monty | 2017-01-11 | 1 | -6/+7 |
* | | | | | Use sql_mode_t for sql_mode. | Monty | 2016-10-05 | 1 | -9/+10 |
* | | | | | after merge fixes | Sergei Golubchik | 2016-03-23 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | MDEV-717 LP:1003679 - Wrong binlog order on concurrent DROP schema and CREATE... | Alexey Botchkov | 2016-03-23 | 1 | -27/+52 |
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-09-03 | 1 | -12/+10 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-5997 - MySQL bug#11759114 - '51401: GRANT TREATS NONEXISTENT | Dmitry Lenev | 2015-07-23 | 1 | -12/+10 |
* | | | | - Renaming variables so that they don't shadow others (After this patch one c... | Monty | 2015-07-06 | 1 | -8/+9 |
* | | | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 1 | -1/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-05-04 | 1 | -1/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | post-merge changes, fixes, and tests | Sergei Golubchik | 2015-04-28 | 1 | -7/+2 |
| | * | | Merge remote-tracking branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2015-04-27 | 1 | -1/+10 |
| | |\ \ | | | |/ | |||||
| | | * | BUG#19875331 - HANDLE_FATAL_SIGNAL 11 IN STRMAKE | Thayumanavar | 2015-01-19 | 1 | -1/+9 |
| | | * | Bug #14036214 MYSQLD CRASHES WHEN EXECUTING UPDATE IN TRX WITH | Annamalai Gurusami | 2012-10-08 | 1 | -3/+14 |
| | | * | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -2/+50 |
| | | |\ | |||||
| | | | * | Manual merge of patch for bug#11756013 from mysql-5.1 tree. | Dmitry Shulga | 2011-06-24 | 1 | -1/+48 |
| | | | |\ | |||||
| | | | | * | Fixed Bug#11756013 (formerly known as bug#47870): | Dmitry Shulga | 2011-06-23 | 1 | -1/+41 |
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| | | |\ \ \ | | | | |/ / | | | |/| | | |||||
| | | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | | | |\ \ | | | | | |/ | | | | |/| | |||||
| | | | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | | | | * | Bug #45287: phase 2 : 5.0 64 bit compilation warnings | Georgi Kodinov | 2009-07-16 | 1 | -3/+3 |
| | | | * | | Manual merge from the bugfix tree. | Alexey Kopytov | 2010-06-11 | 1 | -1/+6 |
| | | | |\ \ | |||||
| | | * | | | | Bug #58414 mysql_upgrade fails on dump upgrade between 5.1.53 -> 5.5.8 | Jon Olav Hauglid | 2010-11-30 | 1 | -0/+2 |
| | | * | | | | Bug#45445: cannot execute procedures with thread_stack set to 128k. | Alexander Nozdrin | 2010-11-24 | 1 | -6/+0 |
| | | * | | | | Bug #57663 Concurrent statement using stored function and DROP DATABASE | Jon Olav Hauglid | 2010-11-17 | 1 | -0/+100 |
| | | * | | | | Patch that refactors global read lock implementation and fixes | Dmitry Lenev | 2010-11-11 | 1 | -10/+13 |
| | | * | | | | Fixed bug#45445 - cannot execute procedures with thread_stack | Dmitry Shulga | 2010-10-21 | 1 | -0/+6 |
| | | * | | | | Fix for bug#57061 "User without privilege on routine can | Dmitry Lenev | 2010-10-07 | 1 | -32/+0 |
| | | * | | | | Bug #56137 "Assertion `thd->lock == 0' failed on upgrading | Dmitry Lenev | 2010-08-31 | 1 | -0/+4 |
| | | * | | | | A pre-requisite patch for the fix for Bug#52044. | Konstantin Osipov | 2010-07-27 | 1 | -8/+8 |
| | | * | | | | Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-06-11 | 1 | -1/+8 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | Manual merge from the bugfix tree. | Alexey Kopytov | 2010-06-11 | 1 | -1/+6 |
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| / / | | | | | |/ / | |||||
| | | | | * | | Bug #42064: low memory crash when importing hex strings, in | Alexey Kopytov | 2010-05-21 | 1 | -1/+6 |