summaryrefslogtreecommitdiff
path: root/include/my_global.h
Commit message (Expand)AuthorAgeFilesLines
* Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-0/+19
|\
| * Merge from 5.0 for 43414Staale Smedseng2009-08-281-0/+19
| |\
| | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-281-0/+13
| | * MySQL 5.0 backport of Chad Miller's patch for Bug#34309:Davi Arnaut2009-05-301-1/+0
* | | MWL#17: Table elimination: fixes for windowsSergey Petrunya2009-09-161-0/+1
* | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-2/+1
|\ \ \
| * | | MWL#17: Table-eliminationSergey Petrunya2009-09-011-2/+1
* | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-38/+62
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-141-1/+1
| |\ \
| | * | Bug #43397 mysql headers redefine pthread_mutex_initStaale Smedseng2009-07-081-1/+1
| * | | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-0/+13
| |/ /
| * | merge -5.0 into -5.1 (minor conflicts resolved)Timothy Smith2009-04-011-34/+35
| |\ \ | | |/
| | * auto-merge -build into -bugteamTimothy Smith2009-04-011-34/+35
| | |\
| | | * cmd-line-utils/libedit/readline/readline.hunknown2009-03-191-34/+35
| | * | Automerge.Alexey Kopytov2009-03-251-2/+12
| | |\ \ | | | |/ | | |/|
| * | | Manual merge.Alexey Kopytov2009-03-251-3/+13
| |\ \ \ | | | |/ | | |/|
| | * | Fix for bug #42965: isinf() on 32bit x86 with gcc 4.3 can Alexey Kopytov2009-03-241-2/+12
* | | | Fixed problems in mergeMichael Widenius2009-05-191-8/+8
|\ \ \ \
| * | | | We are now using Valgrind rather than purify, and have for quite some time.unknown2009-05-061-8/+8
* | | | | bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-251-4/+36
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-3/+36
| |\ \ \ \ | | |/ / /
| | * | | Automerge.Alexey Kopytov2009-02-251-0/+3
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Fixed a build failure on Ubuntu 8.10 introduced by the patchAlexey Kopytov2009-02-251-0/+3
| | * | | Manual merge to 5.1.Alexey Kopytov2009-02-231-2/+33
| | |\ \ \ | | | |/ /
| | | * | Fix for bug #15936: "round" differs on Windows to UnixAlexey Kopytov2009-02-231-2/+33
| | | |/
| | * | Merge from bugteam team tree.Chad MILLER2009-02-101-1/+3
| | |\ \
| | * | | Bug#34309: '_PC' macro redefinitionChad MILLER2009-01-271-1/+0
| * | | | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-1/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Bug#37995 Error message truncation in test "innodb" in embedded mode.Alexey Botchkov2009-02-051-1/+0
| * | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-121-0/+6
| |\ \ \ \ | | |/ / /
* | | | | Fix Valgrind errors seen in buildbot.unknown2009-04-081-0/+6
* | | | | Merge with base MySQL 5.1Michael Widenius2009-02-151-0/+6
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | merge: 5.1 -> 5.1-rplLuis Soares2009-01-231-0/+3
| |\ \ \ | | |/ /
| | * | Merge from mysql-5.0-bugteam to mysql-5.1-bugteam.Alexey Kopytov2008-12-071-0/+3
| | |\ \ | | | |/
| | | * Fix for bug #27483: Casting 'scientific notation type' to 'unsigned Alexey Kopytov2008-12-031-0/+3
| | | * Correct failing build.unknown2008-04-281-2/+6
| | | * Merge mysql.com:/misc/mysql/mysql-5.0unknown2008-03-271-1/+1
| | | |\
| * | | \ merge 5.1 --> 5.1-rplAlfranio Correia2008-12-131-5/+5
| |\ \ \ \ | | |/ / /
| * | | | Fixning compiler warnings. Fixing build failure for valgrind platform.Mats Kindahl2008-08-221-0/+3
* | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my...Guilhem Bichot2008-12-101-27/+61
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | wt needs to use its own implementation of rwlocks withSergei Golubchik2008-10-241-0/+9
| * | | | typedef is better than __attribute__ ((unused))Sergei Golubchik2008-10-221-2/+1
| * | | | mergedSergei Golubchik2008-10-211-1/+1
| |\ \ \ \
| | * | | | Fix for bug#39226 Maria: crash with FLUSH TABLES WITH READ LOCK after LOCK TA...Michael Widenius2008-10-121-1/+1
| * | | | | win32: compilation failures, maria.test failureSergei Golubchik2008-10-211-1/+1
| |/ / / /
| * | | | proc_info_hook, mysys access to thd->proc_infoSergei Golubchik2008-08-271-1/+20
| * | | | Fix for BUG#36319 "Maria: table is not empty but DELETE and SELECT find no ro...Guilhem Bichot2008-06-101-3/+8
| * | | | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-13/+13
| |\ \ \ \
| * | | | | Injecting more "const" declarations into code which does not changeunknown2008-04-031-15/+15
| * | | | | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gcaunknown2008-02-181-0/+4
| |\ \ \ \ \
View Lorry Controller Status