Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge MariaDB 5.1.66 -> 5.2 -> 5.3 | unknown | 2012-11-09 | 1 | -8/+17 |
|\ | |||||
| * | Merge MariaDB 5.1.66 -> 5.2.12 | unknown | 2012-11-08 | 1 | -8/+17 |
| |\ | |||||
| | * | Merge MySQL 5.1.66 -> MariaDB 5.1.65 | unknown | 2012-11-06 | 1 | -8/+17 |
| | |\ | |||||
| | | * | Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUST | Nirbhay Choubey | 2012-08-07 | 1 | -3/+3 |
| | | * | Bug #12615411 - server side help doesn't work as first statement | Venkata Sidagam | 2012-07-19 | 1 | -3/+11 |
* | | | | 5.2->5.3 merge | Sergei Golubchik | 2011-12-12 | 1 | -3/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | 1. add --plugin-dir and --default-auth to mysqltest. | Sergei Golubchik | 2011-12-02 | 1 | -3/+4 |
* | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | BUG#11758062 - 50206: ER_TOO_BIG_SELECT REFERS TO OUTMODED | Raghav Kapoor | 2011-09-28 | 1 | -1/+1 |
| | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Manual merge from mysql-5.0. | Alexander Nozdrin | 2011-07-22 | 1 | -7/+3 |
| | | |\ | |||||
| | | | * | For for Bug#12696072: FIX OUTDATED COPYRIGHT NOTICES IN RUNTIME RELATED CLIENT | Alexander Nozdrin | 2011-07-22 | 1 | -6/+5 |
| | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+5 |
* | | | | | Added handler and temporary table usage to mytop | Michael Widenius | 2011-12-03 | 1 | -0/+2 |
* | | | | | Added MariaDB executable comment syntax: /*M!##### */ | Michael Widenius | 2011-08-29 | 1 | -2/+2 |
* | | | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table... | Michael Widenius | 2011-07-01 | 1 | -3/+54 |
|/ / / / | |||||
* | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -5/+11 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -5/+11 |
| |\ \ \ | | |/ / | |||||
| | * | | Follow up fix for bug#57450. | Dmitry Shulga | 2011-02-09 | 1 | -0/+2 |
| | * | | Fixed bug#57450 - mysql client enter in an infinite loop | Dmitry Shulga | 2011-02-05 | 1 | -6/+10 |
* | | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm... | Michael Widenius | 2011-03-18 | 1 | -1/+2 |
* | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -3/+7 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -3/+7 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug #54899 : --one-database option cannot handle DROP/CREATE DATABASE commands | Nirbhay Choubey | 2010-11-26 | 1 | -2/+6 |
* | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -5/+10 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -5/+10 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#45288: pb2 returns a lot of compilation warnings | Davi Arnaut | 2010-10-19 | 1 | -5/+10 |
* | | | | Automatic merge with 5.1 | Michael Widenius | 2010-11-04 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix for: LP #634955: Assert in _ma_update_at_original_place() | Michael Widenius | 2010-11-02 | 1 | -1/+1 |
* | | | | Automatic merge | Michael Widenius | 2010-10-01 | 1 | -2/+3 |
|\ \ \ \ | |||||
| * | | | | Change some my_bool in C++ classes and a few functions to bool to detect wron... | Michael Widenius | 2010-09-24 | 1 | -2/+3 |
* | | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-20 | 1 | -2/+2 |
| | * | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -1/+0 |
* | | | | 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 |