Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2019-03-15 | 1 | -49/+18 |
|\ | |||||
| * | MDEV-15945 --ps-protocol does not test some queries | Sergei Golubchik | 2019-03-12 | 1 | -6/+1 |
| * | cleanup: misc | Sergei Golubchik | 2019-03-12 | 1 | -43/+17 |
* | | MDEV-9947: COM_MULTI united response | Oleksandr Byelkin | 2016-05-17 | 1 | -1/+1 |
|/ | |||||
* | Remove THD argment from Log_event->net_send() and Protocol::pack_info() as | Michael Widenius | 2015-10-22 | 1 | -4/+1 |
* | MDEV-8010 - Avoid sql_alloc() in Items (Patch #1) | Sergey Vojtovich | 2015-08-21 | 1 | -0/+4 |
* | MDEV-6702: analyze_stmt test fails in --embedded 10.1 | Sergei Petrunia | 2014-10-10 | 1 | -0/+41 |
* | MDEV-406: ANALYZE $stmt: get ANALYZE work for subqueries | Sergei Petrunia | 2014-06-24 | 1 | -0/+36 |
* | 5.5 merge | Sergei Golubchik | 2014-05-09 | 1 | -2/+6 |
|\ | |||||
| * | MDEV-5138 Numerous test failures in "mtr --ps --embedded". | Alexey Botchkov | 2014-04-15 | 1 | -2/+6 |
* | | MWL#182: Explain running statements: address review feedback | Sergey Petrunya | 2012-07-10 | 1 | -14/+0 |
* | | MWL#182: SHOW EXPLAIN: Merge 5.3->5.5 | Sergey Petrunya | 2012-05-16 | 1 | -0/+19 |
|\ \ | |/ |/| | |||||
| * | MWL#182: Explain running statements: merge with 5.3-main (needs fixing) | Sergey Petrunya | 2012-01-03 | 1 | -0/+19 |
| |\ | |||||
| | * | MWL#182: Explain running statements | Sergey Petrunya | 2011-08-23 | 1 | -0/+19 |
| * | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+5 |
| |\ \ | | |/ | |/| | |||||
| | * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+5 |
| | |\ | |||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+5 |
| | | |\ | |||||
* | | | \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+5 |
| | |\ \ \ \ | |||||
| | | * | | | | Backport of TIME->MYSQL_TIME / Y2K fixset | unknown | 2007-05-16 | 1 | -9/+9 |
| * | | | | | | WL#1054: Pluggable authentication support | Georgi Kodinov | 2010-08-09 | 1 | -1/+0 |
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -6/+7 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table... | Michael Widenius | 2011-07-01 | 1 | -0/+1 |
| * | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -6/+6 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| | * | | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -6/+6 |
| | | |/ / / | | |/| | | | |||||
* | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -1/+0 |
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | | |||||
| * | | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -1/+0 |
| | |_|/ | |/| | | |||||
| * | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| * | | | Added MY_CS_NONASCII marker for character sets that are not compatible with l... | Michael Widenius | 2009-07-02 | 1 | -0/+2 |
* | | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -0/+2 |
* | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-28 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * \ \ \ | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Luis Soares | 2009-10-22 | 1 | -0/+4 |
| |\ \ \ \ | |||||
| | * | | | | WL#5016: Fix header file include guards | Mats Kindahl | 2009-09-23 | 1 | -0/+4 |
| | | |/ / | | |/| | | |||||
* | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, | Konstantin Osipov | 2009-10-22 | 1 | -8/+28 |
|/ / / / | |||||
* | | | | Backporting WL#3759 Optimize identifier conversion in client-server protocol | Alexander Barkov | 2009-09-30 | 1 | -0/+2 |
* | | | | WL#2110 (SIGNAL) | Marc Alff | 2009-09-10 | 1 | -1/+3 |
|/ / / | |||||
* | | | Bug#44521 Executing a stored procedure as a prepared statement can sometimes ... | Kristofer Pettersson | 2009-07-29 | 1 | -1/+1 |
|/ / | |||||
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint | unknown | 2007-12-20 | 1 | -3/+2 |
|\ \ | |||||
| * | | Bug#12713 "Error in a stored function called from a SELECT doesn't | unknown | 2007-12-12 | 1 | -3/+2 |
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint | unknown | 2007-12-14 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Doxygenize comments. | unknown | 2007-10-16 | 1 | -1/+1 |
* | | | Remove net_printf_error(). Do not talk to network directly in | unknown | 2007-11-01 | 1 | -1/+0 |
|/ / | |||||
* | | WL#3817: Simplify string / memory area types and make things more consistent ... | unknown | 2007-05-10 | 1 | -13/+13 |
* | | Removed not used define YY_MAGIC_BELOW | unknown | 2007-03-23 | 1 | -9/+9 |
* | | Fix for BUG#735 "Prepared Statements: there is no support for Query | unknown | 2007-03-09 | 1 | -0/+11 |
* | | manual merge | unknown | 2007-03-09 | 1 | -6/+6 |
|\ \ | |||||
| * | | Mechanical class renaming: | unknown | 2007-01-30 | 1 | -6/+6 |
| |/ | |||||
* | | Merge dev3-63.(none):/home/zhl/mysql/tree-merge/5.1/mysql-5.1-new-ndb-bj | unknown | 2007-02-01 | 1 | -0/+2 |
|\ \ | |/ |/| | |||||
| * | Merge dli@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj | unknown | 2006-12-22 | 1 | -0/+2 |
| |\ |