summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Expand)AuthorAgeFilesLines
* lots of post-merge changesSergei Golubchik2011-04-252-13/+10
* merge.Sergei Golubchik2010-11-254-249/+1350
|\
| * 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
| | |\
| * | | 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
| | |\ \
| * | | | 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
| |\ \ \ \ | | |/ / /
| * | | | Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-152-9/+18
| |\ \ \ \
| * \ \ \ \ Merge MySQL->MariaDBSergey Petrunya2009-09-081-35/+88
| |\ \ \ \ \
| * | | | | | 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
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-1/+12
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-121-6/+7
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merged 5.1 with maria 5.1Michael Widenius2008-10-101-3/+3
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | wt_thd_lazy_init(), per-thread deadlock search depths and timeoutsSergei Golubchik2008-08-081-1/+1
* | | | | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge.Davi Arnaut2010-07-151-63/+61
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-151-3/+3
| * | | | | | | | | | | WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-151-4/+4
| * | | | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-081-56/+54
* | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-091-16/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-091-16/+7
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Manual merge from mysql-trunk.Alexander Nozdrin2010-05-201-3/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Another incarnation of the patch for Bug#30708Alexander Nozdrin2010-05-191-3/+0
* | | | | | | | | | | Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-05-111-7/+20
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| / / / / / / / / / | |/ / / / / / / / /
| * | | | | | | | | Using an initial command with mysql_options(..., MYSQL_INIT_COMMAND, ...)Jim Winstead2010-05-091-7/+20
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge the changes of the 5.5.3-m3 release buildJoerg Bruehe2010-04-181-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix a syntax error:Joerg Bruehe2010-03-161-1/+1
* | | | | | | | | | Backport of:Konstantin Osipov2010-04-131-12/+12
* | | | | | | | | | Fix use of uninitialized variable.Alexander Nozdrin2010-03-261-1/+1
|/ / / / / / / / /
* | | | | | | | | Bug#51166 mysql client defaults to charset 'ascii' Alexander Barkov2010-03-041-4/+4
* | | | | | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-3/+3
* | | | | | | | | Backport of WL#798 (MySQL IPv6 support) from 6.0.Alexander Nozdrin2009-11-251-77/+121
* | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-101-1/+1
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-051-122/+140
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | backport of dbug extensions from 6.0:Sergei Golubchik2009-10-301-1/+1
* | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | / / / / / / / / | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Bug#47571: idle named pipe connection is unkillableVladislav Vaintroub2009-11-021-3/+3
* | | | | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-281-37/+285
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-271-0/+2
| |\ \ \ \ \ \ \ \ \
View Lorry Controller Status