Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Automerge with 5.1 | Michael Widenius | 2010-08-25 | 1 | -5/+12 |
|\ | |||||
| * | Automatic merge | Michael Widenius | 2010-08-24 | 1 | -1/+1 |
| * | Trivial fixes, more safe DBUG_ASSERT()'s and some more DBUG_ | Michael Widenius | 2010-08-23 | 1 | -4/+11 |
* | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -80/+97 |
|\ \ | |/ | |||||
| * | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -80/+97 |
| |\ | |||||
| | * | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -79/+96 |
* | | | Merge with MariaDB 5.1 | Michael Widenius | 2010-07-17 | 1 | -4/+7 |
|\ \ \ | |/ / | |||||
| * | | mysql client: Ignore --comments at start of command line. This allows one to ... | Michael Widenius | 2010-07-16 | 1 | -4/+7 |
* | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -28/+35 |
|\ \ \ | |/ / | |||||
| * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -28/+35 |
| |\ \ | | |/ | |||||
| | * | Bug #44178: mysql cli does not comply with GPLv2 clause 2c | Georgi Kodinov | 2010-03-11 | 1 | -9/+11 |
| | * | Recommit of Bug#49447. | Staale Smedseng | 2010-02-04 | 1 | -20/+24 |
* | | | mysql: don't crash when --show-warnings is enabled | Sergei Golubchik | 2010-05-21 | 1 | -1/+1 |
* | | | Fixed compiler warnings | Michael Widenius | 2010-04-08 | 1 | -2/+3 |
* | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -0/+65 |
|/ / | |||||
* | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -7/+17 |
|\ \ | |/ | |||||
| * | WL#5182 Remove more deprecated 4.1/5.0 features | Magne Mahre | 2010-01-27 | 1 | -1/+1 |
| * | WL#5154 Remove deprecated 4.1 features | Magne Mahre | 2010-01-21 | 1 | -4/+13 |
| * | merge | Georgi Kodinov | 2009-12-24 | 1 | -1/+1 |
| |\ | |||||
| | * | Bug #48866: mysql.test fails under Fedora 12 | Georgi Kodinov | 2009-12-16 | 1 | -1/+1 |
| | * | Backport fix for Bug #27884. | Jim Winstead | 2009-11-23 | 1 | -4/+7 |
| * | | Merge approved bug fix | Jim Winstead | 2009-12-17 | 1 | -1/+2 |
| |\ \ | |||||
| | * | | The mysql command line client ignored the --skip-column-names option | Jim Winstead | 2009-09-21 | 1 | -1/+2 |
* | | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -5/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | merge to mysql-5.1-bugteam | Satya B | 2009-11-26 | 1 | -3/+1 |
| |\ \ \ | |||||
| | * | | | Bug#47655: Memory free error when connecting to 4.1 server from 5.1+ client | Tatiana A. Nurnberg | 2009-11-02 | 1 | -3/+1 |
| * | | | | Fix for BUG#47671 - wrong character-set after upgrade from 5.1.34 to 5.1.39 | Satya B | 2009-11-25 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | Merge | Michael Widenius | 2009-12-03 | 1 | -11/+8 |
|\ \ \ \ | |||||
| * \ \ \ | Merge with maria-5.1-federatedx; A patch to fix bugs in federatedx and enable... | Michael Widenius | 2009-12-03 | 1 | -11/+8 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge with MySQL 5.1, with following additions: | Michael Widenius | 2009-11-11 | 1 | -7/+21 |
| | |\ \ \ \ | | | |/ / / | |||||
* | | | | | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. | unknown | 2009-11-30 | 1 | -7/+21 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -7/+21 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | manual merge of 28141 | Tatiana A. Nurnberg | 2009-10-20 | 1 | -6/+20 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | Bug#28141: Control C on query waiting on lock causes ERROR 1053 (server shutd... | Tatiana A. Nurnberg | 2009-10-19 | 1 | -3/+19 |
| | * | | | merge | Georgi Kodinov | 2009-10-14 | 1 | -1/+1 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | "MySQL Network" => "MySQL Enterprise" | Kent Boortz | 2009-10-08 | 1 | -1/+1 |
| | * | | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-09-23 | 1 | -1/+1 |
| | | |/ | | |/| | |||||
* | | | | Fixed LPBUG#485443 --with-fast-mutexes and without safe mutexes (debug build)... | Michael Widenius | 2009-11-26 | 1 | -3/+2 |
|/ / / | |||||
* | | | Merge Mysql 5.1.39 merge into MariaDB trunk | unknown | 2009-11-06 | 1 | -9/+10 |
|\ \ \ | |||||
| * \ \ | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -10/+11 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge from 5.0 for 43414 | Staale Smedseng | 2009-08-28 | 1 | -1/+2 |
| | |\ \ | | | |/ | |||||
| | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-08-28 | 1 | -1/+2 |
| | * | | Fix for a few assorted compiler warnings. | Davi Arnaut | 2009-08-28 | 1 | -9/+9 |
* | | | | Fixed compiler warning message | Michael Widenius | 2009-10-26 | 1 | -3/+8 |
|/ / / | |||||
* | | | Fixed typo | Michael Widenius | 2009-10-02 | 1 | -1/+1 |
* | | | Added client functions: | Michael Widenius | 2009-10-02 | 1 | -5/+13 |
* | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -52/+112 |
|\ \ \ | |/ / | |||||
| * | | Merge bug fix. | Jim Winstead | 2009-07-30 | 1 | -3/+28 |
| |\ \ | |||||
| | * | | The handling of NUL bytes in column data in the various output formats | Jim Winstead | 2009-07-14 | 1 | -3/+28 |
| * | | | Merge in bug fixes for client tools | Jim Winstead | 2009-07-14 | 1 | -1/+21 |
| |\ \ \ | | |/ / |