Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -1/+18 |
|\ | |||||
| * | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -1/+18 |
| |\ | |||||
| | * | Fixed compiler and gmake warnings | Michael Widenius | 2010-11-29 | 1 | -1/+12 |
| | * | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -0/+6 |
| | |\ | |||||
| | | * | Fixed bug#36742 - GRANT hostname case handling inconsistent. | Dmitry Shulga | 2010-10-13 | 1 | -0/+6 |
* | | | | Code cleanup to get fewer reallocs() during execution. | Michael Widenius | 2010-11-24 | 1 | -1/+1 |
|/ / / | |||||
* | | | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -4/+42 |
|\ \ \ | |/ / | |||||
| * | | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -4/+42 |
| |\ \ | | |/ | |||||
| | * | Bug #53034: Multiple-table DELETE statements not accepting | Gleb Shchepa | 2010-08-31 | 1 | -1/+17 |
| | * | WL#5370 Keep forward-compatibility when changing | unknown | 2010-08-18 | 1 | -3/+25 |
* | | | Fix usage of mysqld option --new, --old, --safe and --skip_new to not disable... | Michael Widenius | 2010-09-23 | 1 | -2/+0 |
* | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -16/+11 |
|\ \ \ | |/ / | |||||
| * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -16/+11 |
| |\ \ | | |/ | |||||
| | * | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -16/+11 |
| | * | Bug #53371: COM_FIELD_LIST can be abused to bypass table level grants. | Georgi Kodinov | 2010-05-04 | 1 | -1/+1 |
| | |\ | |||||
* | | \ | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -3/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Automerge MariaDB 5.1.44b release. | unknown | 2010-05-10 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -3/+3 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Bug #49829 Many "hides virtual function" warnings with | Staale Smedseng | 2010-03-14 | 1 | -3/+3 |
| | * | | | Revert of a change introduced by Bug#47974 | Magne Mahre | 2010-02-23 | 1 | -1/+1 |
| | * | | | Bug#47974 'TYPE=storage_engine' is deprecated and will be | Magne Mahre | 2010-02-09 | 1 | -1/+1 |
* | | | | | WL#43: initialize lex->option_list for foreign keys | Sergei Golubchik | 2010-05-28 | 1 | -0/+1 |
* | | | | | merged | Sergei Golubchik | 2010-05-15 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Automerge MariaDB 5.1.44b into trunk. | unknown | 2010-05-11 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| | | |||||
| | * | | | Cherry-pick fix for Bug#53371, security hole with bypassing grants using spec... | unknown | 2010-05-09 | 1 | -1/+1 |
* | | | | | small changes to WL#43: | Sergei Golubchik | 2010-04-30 | 1 | -3/+4 |
* | | | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -10/+96 |
* | | | | | Merge with 5.1 | Michael Widenius | 2010-04-01 | 1 | -1/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed compiler warnings and sporadic failures in test cases | Michael Widenius | 2010-03-28 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -1/+21 |
* | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -74/+127 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -74/+127 |
| |\ \ \ | | |/ / | |||||
| | * | | Revert a patch for Bug#48231, which introduced valgrind warnings. | Alexander Nozdrin | 2010-02-02 | 1 | -29/+7 |
| | * | | Bug #48321 CURRENT_USER() incorrectly replicated for DROP/RENAME USER; | unknown | 2010-01-30 | 1 | -7/+29 |
| | * | | WL#5154 Remove deprecated 4.1 features | Magne Mahre | 2010-01-21 | 1 | -1/+1 |
| | * | | Automerge | Alexey Kopytov | 2009-12-13 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Bug #42849: innodb crash with varying time_zone on partitioned | Alexey Kopytov | 2009-12-13 | 1 | -1/+1 |
| | * | | | merge of bug #49250 to 5.1-bugteam | Georgi Kodinov | 2009-12-11 | 1 | -72/+125 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | Bug #49250 : spatial btree index corruption and crash | Georgi Kodinov | 2009-12-10 | 1 | -41/+65 |
* | | | | | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -118/+202 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge MySQL 5.1.42 and XtraDB 9 into MariaDB trunk, after fixing test failures. | unknown | 2010-01-17 | 1 | -100/+197 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -100/+197 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Automerge. | Davi Arnaut | 2009-11-25 | 1 | -12/+33 |
| | | |\ \ \ | |||||
| | | | * \ \ | merge | Kristofer Pettersson | 2009-11-20 | 1 | -12/+25 |
| | | | |\ \ \ | |||||
| | | | | * | | | Bug#45613 handle failures from my_hash_insert | Kristofer Pettersson | 2009-11-20 | 1 | -12/+25 |
| | | | * | | | | BUG#47995: Mark system functions as unsafe | Sven Sandberg | 2009-11-18 | 1 | -0/+8 |
| | | * | | | | | Bug#47627 SET @@{global.session}.local_variable in stored routine causes crash | Davi Arnaut | 2009-11-12 | 1 | -88/+164 |
| | | |/ / / / | |||||
| * | | | | | | Fixed that we use same flags when testing for assembler as by makefiles. | Michael Widenius | 2010-01-15 | 1 | -18/+5 |
| |/ / / / / | |||||
* | | | | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -13/+12 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -13/+12 |
| |\ \ \ \ \ | | |/ / / / |