summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Expand)AuthorAgeFilesLines
* fix bad merge that broke make distcheckSergei Golubchik2010-09-141-1/+1
* merge with 5.1Sergei Golubchik2010-09-111-4/+1
|\
| * Merge with MySQL 5.1.50Michael Widenius2010-08-271-3/+0
| |\
| | * Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-091-16/+7
* | | Fixed compiler warnings and test failuresMichael Widenius2010-08-061-0/+1
* | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-7/+20
|\ \ \ | |/ /
| * | Merge with MySQL 5.1.49Michael Widenius2010-08-021-7/+20
| |\ \ | | |/
| | * Using an initial command with mysql_options(..., MYSQL_INIT_COMMAND, ...)Jim Winstead2010-05-091-7/+20
* | | fixes for windows buildsSergei Golubchik2010-04-021-2/+2
* | | Merge with 5.1Michael Widenius2010-04-011-2/+3
|\ \ \ | |/ /
| * | Fixed compiler warnings and sporadic failures in test casesMichael Widenius2010-03-281-1/+1
* | | pluggable auth with plugin examplesSergei Golubchik2010-03-293-242/+1304
* | | merge 5.1->5.2unknown2010-02-011-4/+24
|\ \ \ | |/ /
| * | Patch set contributed by Alex Budovski (MCA)Michael Widenius2010-01-291-2/+16
| * | Changed version number from RC to stableMichael Widenius2010-01-291-2/+8
| |\ \ | | |/
* | | Applied Antony T Curtis patch for declaring many CHARSET objects as constMichael Widenius2010-01-061-1/+1
|/ /
* | Ensure that mysql_get_server_version() also works if there is a non numerical...Michael Widenius2009-12-031-2/+6
* | Merge with MySQL 5.1, with following additions:unknown2009-11-162-5/+4
|\ \ | |/
| * Bug#47571: idle named pipe connection is unkillableVladislav Vaintroub2009-11-021-3/+3
| * Merge from 5.0Staale Smedseng2009-09-171-2/+1
| |\
| | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-171-2/+1
* | | Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-152-9/+18
|\ \ \ | |/ /
| * | Post fix patch for bug#20577 and bug#46362.Mattias Jonsson2009-09-011-2/+3
| * | manual mergeTatiana A. Nurnberg2009-08-311-0/+9
| |\ \ | | |/
| | * Bug#35132: MySQLadmin --wait ping always crashes on Windows systemsTatiana A. Nurnberg2009-08-311-0/+9
| * | Merge from 5.0 for 43414Staale Smedseng2009-08-282-4/+2
| |\ \ | | |/
| | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-282-5/+3
| * | Manual merge between bug#46362 and bug#20577.Mattias Jonsson2009-08-281-3/+1
| |\ \
| | * | Bug#46362: Endpoint should be set to false for TO_DAYS(DATE)Mattias Jonsson2009-08-261-3/+1
| * | | Merge from mysql-5.0-bugteam.Davi Arnaut2009-08-131-0/+3
| |\ \ \ | | |/ / | |/| / | | |/
| | * Bug#46013: rpl_extraColmaster_myisam fails on pb2Davi Arnaut2009-08-131-0/+3
* | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-35/+88
|\ \ \ | |/ /
| * | Bug#45017: Failure to connect if hostname maps to multiple addressesDavi Arnaut2009-07-301-7/+27
| * | Merge from mysql-5.0-bugteam.Davi Arnaut2009-06-101-4/+16
| |\ \ | | |/
| | * Bug#41190: shared memory connections do not work in Vista, if server started ...Davi Arnaut2009-06-101-4/+16
| * | Adding missing forward declaration for bug 43560Staale Smedseng2009-05-201-1/+2
| * | Recommit of bug 43560 after merge with mysql-5.1-bugteamStaale Smedseng2009-05-201-24/+44
* | | Fix memory leak in mysql_ssl_set() when called more than once.unknown2009-06-231-0/+5
* | | Merged with mysql-5.1 tree.Michael Widenius2009-04-252-4/+4
|\ \ \ | |/ /
| * | auto-mergeIgnacio Galarza2009-03-191-1/+1
| |\ \
| | * | Fix for bug #40552: Race condition around default_directories Alexey Kopytov2009-02-271-1/+1
| * | | auto-mergeIgnacio Galarza2009-03-171-1/+12
| |\ \ \ | | |/ /
| * | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-132-3/+3
| |\ \ \ | | | |/ | | |/|
| | * | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-102-3/+3
* | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-1/+12
|\ \ \ \ | | |_|/ | |/| |
| * | | Bug#42146 - DATETIME fractional seconds parse errorTatiana A. Nurnberg2009-02-131-1/+12
| |/ /
* | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-121-6/+7
|\ \ \ | |/ /
| * | auto-mergeTatiana A. Nurnberg2009-01-091-6/+7
| |\ \ | | |/
| | * Bug#41470: DATE_FORMAT() crashes the complete server with a valid dateTatiana A. Nurnberg2009-01-081-6/+7
| | * Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294unknown2008-04-031-3/+3
| | |\