Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with MySQL 5.1.42mariadb-merge-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.mariadb-merge-mysql-5.1.39 | 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->MariaDBmariadb-merge-mysql-5.1.38minus | 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 |
| |\ \ \ | | |/ / | |||||
| | * | | The mysql command-line client would include superfluous spaces at the end of | Jim Winstead | 2009-05-20 | 1 | -1/+4 |
| | * | | The mysql command-line client didn't implement the readline magic-space | Jim Winstead | 2009-05-19 | 1 | -0/+17 |
| * | | | Bug#37274 client 'status' command doesn't print all info after losing connect... | Kristofer Pettersson | 2009-07-03 | 1 | -31/+32 |
| * | | | Merge from 5.0 | Staale Smedseng | 2009-06-29 | 1 | -3/+3 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge from 5.0-bt | Staale Smedseng | 2009-06-29 | 1 | -3/+3 |
| * | | | Bug#44834 strxnmov is expected to behave as you'd expect | Sergey Glukhov | 2009-06-19 | 1 | -1/+1 |
| * | | | Automerge. | Alexey Kopytov | 2009-06-17 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug #45236: large blob inserts from mysqldump fail, possible | Alexey Kopytov | 2009-06-10 | 1 | -1/+1 |
| * | | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2009-05-28 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#37268 'binary' character set makes CLI-internal commands case sensitive | Sergey Glukhov | 2009-05-28 | 1 | -2/+2 |
| * | | | Merge from 5.0-bugteam | Jim Winstead | 2009-05-13 | 1 | -3/+9 |
| |\ \ \ | | |/ / | | | / | | |/ | |/| | |||||
| | * | Fix support for -i (--ignore-spaces) in the mysql command line application, | Jim Winstead | 2009-05-07 | 1 | -3/+8 |
| * | | The mysql command-line client did not properly handle MYSQL_HISTFILE being set | Jim Winstead | 2009-05-07 | 1 | -2/+8 |
| * | | Remove extraneous space in --debug-check usage info. | Jim Winstead | 2009-04-28 | 1 | -1/+1 |
| * | | Bug #27884: mysql --html does not quote HTML special characters in output | Jim Winstead | 2009-04-28 | 1 | -4/+7 |
| * | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2009-04-14 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Bug#41268 Help Text for \c is misleading in client command line interface(addon) | Sergey Glukhov | 2009-04-14 | 1 | -1/+1 |
| | * | auto-merge | Tatiana A. Nurnberg | 2009-03-23 | 1 | -13/+32 |
| | |\ | |||||
| | | * | auto-merge | Ignacio Galarza | 2009-03-19 | 1 | -10/+14 |
| | | |\ | |||||
| | | * \ | auto-merge | Ignacio Galarza | 2009-03-19 | 1 | -3/+17 |
| | | |\ \ | |||||
| | | * | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 1 | -3/+4 |
* | | | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -23/+38 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | auto-merge | Tatiana A. Nurnberg | 2009-03-23 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / |