Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | 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 | 2 | -4/+4 |
|\ \ \ | |/ / | |||||
| * | | auto-merge | Ignacio Galarza | 2009-03-19 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fix for bug #40552: Race condition around default_directories | Alexey Kopytov | 2009-02-27 | 1 | -1/+1 |
| * | | | auto-merge | Ignacio Galarza | 2009-03-17 | 1 | -1/+12 |
| |\ \ \ | | |/ / | |||||
| * | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 2 | -3/+3 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 2 | -3/+3 |
* | | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -1/+12 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Bug#42146 - DATETIME fractional seconds parse error | Tatiana A. Nurnberg | 2009-02-13 | 1 | -1/+12 |
| |/ / | |||||
* | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -6/+7 |
|\ \ \ | |/ / | |||||
| * | | auto-merge | Tatiana A. Nurnberg | 2009-01-09 | 1 | -6/+7 |
| |\ \ | | |/ | |||||
| | * | Bug#41470: DATE_FORMAT() crashes the complete server with a valid date | Tatiana A. Nurnberg | 2009-01-08 | 1 | -6/+7 |
| | * | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294 | unknown | 2008-04-03 | 1 | -3/+3 |
| | |\ |