Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MDEV-5163 Merge WEIGHT_STRING function from MySQL-5.6 | Alexander Barkov | 2013-10-23 | 1 | -0/+112 |
* | Merge 10.0-base -> 10.0 | Sergey Petrunya | 2013-10-16 | 1 | -1/+10 |
|\ | |||||
| * | MDEV-3798: [SHOW] EXPLAIN UPDATE/DELETE | Sergey Petrunya | 2013-10-15 | 1 | -1/+10 |
| |\ | |||||
| | * | MDEV-3798: EXPLAIN UPDATE/DELETE | Sergey Petrunya | 2013-10-05 | 1 | -2/+3 |
| | * | [SHOW] EXPLAIN UPDATE/DELETE, code re-structuring | Sergey Petrunya | 2013-08-24 | 1 | -1/+9 |
| | |\ | |||||
| | | * | [SHOW] EXPLAIN UPDATE/DELETE, code re-structuring | Sergey Petrunya | 2013-08-24 | 1 | -1/+9 |
| | | |\ | |||||
| | | | * | [SHOW] EXPLAIN UPDATE/DELETE, code re-structuring | Sergey Petrunya | 2013-06-27 | 1 | -1/+9 |
| | | | |\ | |||||
| | | | | * | SHOW EXPLAIN UPDATE/DELETE: Merge with 10.0-base | Sergey Petrunya | 2013-05-27 | 1 | -1/+9 |
| | | | | |\ | |||||
| | | | | | * | [SHOW] EXPLAIN UPDATE/DELETE - Merge with 10.0-base | Sergey Petrunya | 2013-05-27 | 1 | -1/+9 |
| | | | | | |\ | |||||
| | | | | | | * | EXPLAIN DELETE for MariaDB | Sergey Petrunya | 2013-02-12 | 1 | -1/+9 |
* | | | | | | | | typo (or bad merge?) fixed | Sergei Golubchik | 2013-10-06 | 1 | -1/+1 |
* | | | | | | | | MDEV-4928 Merge collation customization improvements | Alexander Barkov | 2013-10-02 | 1 | -12/+3 |
* | | | | | | | | update ALTER ONLINE to mean ALTER LOCK=NONE, not ALTER ALGORITHM=INPLACE. | Sergei Golubchik | 2013-09-25 | 1 | -2/+2 |
* | | | | | | | | Added information about the MariaDB foundation | Michael Widenius | 2013-09-23 | 1 | -8/+0 |
* | | | | | | | | remove unused LEX::contains_plaintext_password | Sergei Golubchik | 2013-09-21 | 1 | -6/+0 |
* | | | | | | | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 1 | -519/+430 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 1 | -474/+372 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | mysql-5.5.33 merge | Sergei Golubchik | 2013-09-06 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Bug#16753869:INCORRECT TRUNCATION OF LONG SET EXPRESSION IN | Sujatha Sivakumar | 2013-06-24 | 1 | -3/+10 |
| | | * | | | | | | | 4371 Maitrayi Sabaratnam 2013-05-23 | Maitrayi Sabaratnam | 2013-05-24 | 1 | -2/+2 |
| | * | | | | | | | | MDEV-4902 - sql_yacc.yy incompatible with bison 3 | Sergey Vojtovich | 2013-08-30 | 1 | -467/+369 |
| * | | | | | | | | | MDEV-4911 - add KILL query id, and add query id information to processlist | Sergey Vojtovich | 2013-09-13 | 1 | -3/+10 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge | Igor Babaev | 2013-08-06 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| | * | | | | | | | MWL#205 DELETE with result set (mdev-3814) | Igor Babaev | 2013-08-06 | 1 | -0/+7 |
* | | | | | | | | | MDEV-4865 Change related to --log option/variable was merged partially | Sergei Golubchik | 2013-08-13 | 1 | -18/+0 |
* | | | | | | | | | MDEV-4786 merge 10.0-monty -> 10.0 | Sergei Golubchik | 2013-08-12 | 1 | -21/+2 |
* | | | | | | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -270/+739 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fix for alter_table_online test. | Sergei Golubchik | 2013-07-10 | 1 | -27/+30 |
| * | | | | | | | | | Finished merging wl5986 started by Igor. | unknown | 2013-06-19 | 1 | -111/+123 |
| * | | | | | | | | | Fixed some merge issues: | Michael Widenius | 2013-06-18 | 1 | -10/+92 |
| * | | | | | | | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -126/+498 |
| * | | | | | | | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -2/+2 |
* | | | | | | | | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -23/+85 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -18/+74 |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | / / / / | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| | * | | | | | | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -16/+72 |
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | |||||
| | | * | | | | | | Merge from 5.1 to 5.5 | Chaithra Gopalareddy | 2013-04-14 | 1 | -9/+19 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Bug#16347426:ASSERTION FAILED: (SELECT_INSERT && | Chaithra Gopalareddy | 2013-04-14 | 1 | -10/+20 |
| | | | * | | | | | | Updated/added copyright headers. | Murthy Narkedimilli | 2013-02-25 | 1 | -1/+1 |
| | | * | | | | | | | Bug#16359402 CRASH WITH AGGREGATES: ASSERTION FAILED: N < M_SIZE | Tor Didriksen | 2013-03-19 | 1 | -2/+7 |
| | | * | | | | | | | Bug #16076289 : BACKPORT FIX FOR BUG #14786792 TO 5.5 | Neeraj Bisht | 2013-03-18 | 1 | -5/+44 |
| | * | | | | | | | | MDEV-4752: Segfault during parsing of illegal query | unknown | 2013-07-04 | 1 | -0/+3 |
| * | | | | | | | | | MDEV-4660 SHUTDOWN command | Sergei Golubchik | 2013-06-24 | 1 | -2/+8 |
| * | | | | | | | | | plugin_hton helper | Sergei Golubchik | 2013-06-15 | 1 | -2/+2 |
* | | | | | | | | | | Adding support for the SQL-standard temporal literals. | Alexander Barkov | 2013-07-10 | 1 | -7/+72 |
* | | | | | | | | | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 1 | -9/+49 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -9/+49 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| | * | | | | | | | The bug | Alexander Barkov | 2013-05-08 | 1 | -3/+24 |
| | * | | | | | | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -4/+23 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING | Mattias Jonsson | 2013-01-30 | 1 | -3/+22 |
| | | |\ \ \ \ \ \ | | | | |/ / / / / | |||||
| | | * | | | | | | Bug#14466617 - INVALID WRITES AND/OR CRASH WITH USER | Praveenkumar Hulakund | 2012-11-07 | 1 | -2/+2 |