Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.2 merge | Sergei Golubchik | 2013-04-11 | 1 | -0/+6 |
|\ | |||||
| * | 5.1 merge | Sergei Golubchik | 2013-04-11 | 1 | -0/+6 |
| |\ | |||||
| | * | MDEV-4088 Replication 10.0 -> 5.5 fails | Sergei Golubchik | 2013-04-04 | 1 | -0/+6 |
* | | | 5.2->5.3 merge | Sergei Golubchik | 2013-01-10 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | one-byte overflow with old passwords | Sergei Golubchik | 2012-12-11 | 1 | -2/+2 |
* | | | 5.2 merge. | Sergei Golubchik | 2012-08-22 | 1 | -3/+12 |
|\ \ \ | |/ / | |||||
| * | | 5.1 merge | Sergei Golubchik | 2012-08-22 | 1 | -3/+12 |
| |\ \ | | |/ | |||||
| | * | merge with MySQL 5.1.65 | Sergei Golubchik | 2012-08-22 | 1 | -3/+12 |
| | |\ | |||||
| | | * | Bug #13708485: malformed resultset packet crashes client | Georgi Kodinov | 2012-06-28 | 1 | -3/+12 |
* | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | |\ \ | | | |/ | |||||
| | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | | |\ | |||||
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table... | Michael Widenius | 2011-07-01 | 1 | -9/+71 |
* | | | | | Removed check_license() function | Sergei Golubchik | 2011-07-01 | 1 | -56/+0 |
|/ / / / | |||||
* | | | | 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 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 |
* | | | | MBug#698132: Fix wrong buffer calculation in send_change_user_packet() | unknown | 2011-01-06 | 1 | -1/+1 |
* | | | | 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 | 1 | -241/+867 |
* | | | | 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 | 1 | -3/+3 |
|\ \ \ | |/ / | |||||
| * | | Bug#47571: idle named pipe connection is unkillable | Vladislav Vaintroub | 2009-11-02 | 1 | -3/+3 |
* | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -2/+13 |
|\ \ \ | |/ / | |||||
| * | | 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 | 1 | -2/+1 |
| |\ \ | | |/ | |||||
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-08-28 | 1 | -3/+2 |
| * | | Merge from mysql-5.0-bugteam. | Davi Arnaut | 2009-08-13 | 1 | -0/+3 |
| |\ \ | | |/ | |||||
| | * | Bug#46013: rpl_extraColmaster_myisam fails on pb2 | Davi Arnaut | 2009-08-13 | 1 | -0/+3 |
* | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -35/+88 |
|\ \ \ | |/ / | |||||
| * | | Bug#45017: Failure to connect if hostname maps to multiple addresses | Davi Arnaut | 2009-07-30 | 1 | -7/+27 |
| * | | Merge from mysql-5.0-bugteam. | Davi Arnaut | 2009-06-10 | 1 | -4/+16 |
| |\ \ | | |/ | |||||
| | * | Bug#41190: shared memory connections do not work in Vista, if server started ... | Davi Arnaut | 2009-06-10 | 1 | -4/+16 |
| * | | Adding missing forward declaration for bug 43560 | Staale Smedseng | 2009-05-20 | 1 | -1/+2 |
| * | | Recommit of bug 43560 after merge with mysql-5.1-bugteam | Staale Smedseng | 2009-05-20 | 1 | -24/+44 |
* | | | Fix memory leak in mysql_ssl_set() when called more than once. | unknown | 2009-06-23 | 1 | -0/+5 |
* | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -2/+2 |
|\ \ \ | |/ / |