summaryrefslogtreecommitdiff
path: root/include/my_global.h
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-trunk.Alexander Nozdrin2010-04-271-4/+13
|\
| * Merge the changes of the 5.5.3-m3 release buildJoerg Bruehe2010-04-181-4/+13
| |\
| | * Make the libraries we produce on Windows actually usableDaniel Fischer2010-04-161-4/+13
* | | Manual merge of mysql-5.1-bugteam toAlexey Kopytov2010-04-191-1/+29
|\ \ \ | |/ /
| * | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-1/+29
| |/
* | Automerge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-04-111-1/+1
|\ \ | |/ |/|
| * Bug #47095: Can't open_files_limit really be larger than 65535?Georgi Kodinov2010-04-091-1/+1
* | Bug#41103 6.0 Windows embedded-server tests failAlexey Botchkov2010-02-251-6/+0
* | mergeVladislav Vaintroub2010-02-161-1/+20
|\ \
| * \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-7/+32
| |\ \
| * \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-1/+1
| |\ \ \
| * \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-0/+2
| |\ \ \ \
| * \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-151-1/+11
| |\ \ \ \ \
| * | | | | | Backport of:Konstantin Osipov2009-12-031-1/+1
| * | | | | | Backport of:Konstantin Osipov2009-12-031-0/+19
* | | | | | | Fix failing sys_vars.plugin_dir_basic - treat both '/' and '\' as path separa...Vladislav Vaintroub2010-01-241-0/+2
* | | | | | | mergeVladislav Vaintroub2009-12-251-7/+32
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-7/+32
| | |_|_|/ / | |/| | | |
* | | | | | mergeVladislav Vaintroub2009-12-191-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-171-1/+1
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Automerge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2009-12-171-1/+1
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-12-171-1/+1
| | | |\ \ \
| | | | * | | Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap()Satya B2009-12-171-0/+3
* | | | | | | mergeVladislav Vaintroub2009-12-191-0/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MergeMikael Ronstrom2009-12-141-1/+11
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge WL#5138 to mysql-next-mrMikael Ronstrom2009-11-271-11/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | WL#5138 merged to mysql-next-mrMikael Ronstrom2009-11-201-0/+2
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Backported my_atomic from 6.0-codebase and added support for 64-bit atomics t...Mikael Ronstrom2009-10-121-0/+2
* | | | | | | mergeVladislav Vaintroub2009-12-041-1/+11
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | WL#2360 Performance schemaMarc Alff2009-11-301-1/+11
| | |_|/ / / | |/| | | |
* | | | | | mergeVladislav Vaintroub2009-11-251-11/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Backport of:Konstantin Osipov2009-11-241-11/+0
| |/ / / /
* | | | | WL#5161 : Cross-platform build with CMakeVladislav Vaintroub2009-11-091-15/+96
|/ / / /
* | | | backport of dbug extensions from 6.0:Sergei Golubchik2009-10-301-2/+2
* | | | Merging mysql-next-mr-merge to mysql-next-mr.Alexander Barkov2009-10-211-0/+1
|\ \ \ \
| * | | | A postfix for WL#751Alexander Barkov2009-10-161-0/+1
* | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-141-6/+0
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge from 5.0Staale Smedseng2009-09-171-6/+0
| |\ \ \ | | | |/ | | |/|
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-171-6/+0
* | | | mergeVladislav Vaintroub2009-09-231-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
* | | This is the downport ofVladislav Vaintroub2009-09-111-4/+37
|/ /
* | 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.hkent.boortz@sun.com2009-03-191-34/+35