Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 3 | -7/+14 |
|\ | |||||
| * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 3 | -6/+13 |
| |\ | |||||
| | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -1/+2 |
| | |\ | |||||
| | * \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 3 | -6/+13 |
| | |\ \ | |||||
| | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 3 | -6/+8 |
| * | | | | typos fixed | Sergei Golubchik | 2011-11-08 | 1 | -1/+1 |
* | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -2/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -2/+3 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Bug#11889186 60503: CRASH IN MAKE_DATE_TIME WITH DATE_FORMAT / STR_TO_DATE C... | Sergey Glukhov | 2011-04-27 | 1 | -1/+2 |
| | |/ / | |||||
| | * | | merge to 5.1. | Georgi Kodinov | 2011-02-02 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Fixes for Bug #55755 and Bug #52315 part 2 | Georgi Kodinov | 2011-02-02 | 1 | -1/+1 |
* | | | | fix VS warning about variable 'unused' being used | Vladislav Vaintroub | 2011-03-29 | 1 | -0/+5 |
* | | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm... | Michael Widenius | 2011-03-18 | 1 | -2/+6 |
* | | | | Merge with 5.1 to get fixes for tests and compiler warnings | Michael Widenius | 2011-03-01 | 1 | -0/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Get rid of compiler warnings | Michael Widenius | 2011-02-28 | 1 | -0/+3 |
* | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -0/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | - Reduced memory requirements for mysqltest to 1/4.th This also gave a speed... | Michael Widenius | 2011-02-24 | 1 | -0/+3 |
* | | | | lp:705210 - Compiling with BUILD/compile-pentium64-debug fails | Sergei Golubchik | 2011-01-20 | 1 | -4/+5 |
* | | | | lp:700982 - Non-portable code in client plugin (fails on ARM). | Sergei Golubchik | 2011-01-20 | 1 | -2/+7 |
* | | | | MBug#698132: Fix wrong buffer calculation in send_change_user_packet() | unknown | 2011-01-06 | 1 | -1/+1 |
* | | | | fix bad merge that broke make distcheck | Sergei Golubchik | 2010-09-14 | 1 | -1/+1 |
* | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -4/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -3/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-09 | 1 | -16/+7 |
* | | | | Fixed compiler warnings and test failures | Michael Widenius | 2010-08-06 | 1 | -0/+1 |
* | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -7/+20 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -7/+20 |
| |\ \ \ | | |/ / | |||||
| | * | | Using an initial command with mysql_options(..., MYSQL_INIT_COMMAND, ...) | Jim Winstead | 2010-05-09 | 1 | -7/+20 |
* | | | | fixes for windows builds | Sergei Golubchik | 2010-04-02 | 1 | -2/+2 |
* | | | | Merge with 5.1 | Michael Widenius | 2010-04-01 | 1 | -2/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | 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 | 3 | -242/+1304 |
* | | | | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -4/+24 |
|\ \ \ \ | |/ / / | |||||
| * | | | Patch set contributed by Alex Budovski (MCA) | Michael Widenius | 2010-01-29 | 1 | -2/+16 |
| * | | | Changed version number from RC to stable | Michael Widenius | 2010-01-29 | 1 | -2/+8 |
| |\ \ \ | | |/ / | |||||
* | | | | Applied Antony T Curtis patch for declaring many CHARSET objects as const | Michael Widenius | 2010-01-06 | 1 | -1/+1 |
|/ / / | |||||
* | | | Ensure that mysql_get_server_version() also works if there is a non numerical... | Michael Widenius | 2009-12-03 | 1 | -2/+6 |
* | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 2 | -5/+4 |
|\ \ \ | |/ / | |||||
| * | | Bug#47571: idle named pipe connection is unkillable | Vladislav Vaintroub | 2009-11-02 | 1 | -3/+3 |
| * | | Merge from 5.0 | Staale Smedseng | 2009-09-17 | 1 | -2/+1 |
| |\ \ | | |/ | |||||
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-09-17 | 1 | -2/+1 |
* | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 2 | -9/+18 |
|\ \ \ | |/ / | |||||
| * | | Post fix patch for bug#20577 and bug#46362. | Mattias Jonsson | 2009-09-01 | 1 | -2/+3 |
| * | | manual merge | Tatiana A. Nurnberg | 2009-08-31 | 1 | -0/+9 |
| |\ \ | | |/ | |||||
| | * | Bug#35132: MySQLadmin --wait ping always crashes on Windows systems | Tatiana A. Nurnberg | 2009-08-31 | 1 | -0/+9 |
| * | | Merge from 5.0 for 43414 | Staale Smedseng | 2009-08-28 | 2 | -4/+2 |
| |\ \ | | |/ | |||||
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-08-28 | 2 | -5/+3 |
| * | | Manual merge between bug#46362 and bug#20577. | Mattias Jonsson | 2009-08-28 | 1 | -3/+1 |
| |\ \ | |||||
| | * | | Bug#46362: Endpoint should be set to false for TO_DAYS(DATE) | Mattias Jonsson | 2009-08-26 | 1 | -3/+1 |
| * | | | Merge from mysql-5.0-bugteam. | Davi Arnaut | 2009-08-13 | 1 | -0/+3 |
| |\ \ \ | | |/ / | |/| / | | |/ |