summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Add components to INSTALL, some eraly Wix supportVladislav Vaintroub2010-02-101-2/+2
* mergeVladislav Vaintroub2010-02-063-8/+5
|\
| * Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-311-1/+1
| |\
| | * Merging from 5.0-bugteamStaale Smedseng2010-01-271-1/+1
| | |\
| * | \ Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-255-205/+336
| |\ \ \
| * \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-211-3/+11
| |\ \ \ \
| * \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-191-6/+3
| |\ \ \ \ \
| | * \ \ \ \ Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-251-6/+3
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | mergeGeorgi Kodinov2009-12-241-6/+3
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | Bug #48866: mysql.test fails under Fedora 12Georgi Kodinov2009-12-161-6/+3
| * | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-01-1821-286/+183
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-12-241-1/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-231-1/+1
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Bug#43397 mysql headers redefine pthread_mutex_init Staale Smedseng2009-12-201-1/+1
* | | | | | | | prettification of package names and fix compile bug on OSX/ppcVladislav Vaintroub2010-01-281-1/+1
* | | | | | | | merge, add plugin/audit_null/CMakeLists.txtVladislav Vaintroub2010-01-266-205/+339
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge backport of WL#3771 with mysql-next-mr.Sergey Vojtovich2010-01-225-205/+336
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Merge backport of WL#3771 with mysql-next-mr.Sergey Vojtovich2010-01-195-205/+336
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | Merge backport of WL#3771 with mysql-next-mr.Sergey Vojtovich2010-01-195-205/+336
| | | |\ \ \ \ \
| | | | * | | | | Backport from 6.0-codebase.Sergey Vojtovich2009-12-161-2/+1
| | | | * | | | | Backport from 6.0-codebase.Sergey Vojtovich2009-12-155-205/+337
* | | | | | | | | Fix failing sys_vars.plugin_dir_basic - treat both '/' and '\' as path separa...Vladislav Vaintroub2010-01-241-0/+2
* | | | | | | | | Handle different installation layouts.Vladislav Vaintroub2010-01-241-3/+2
* | | | | | | | | mergeVladislav Vaintroub2010-01-221-3/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-181-0/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | WL#4583 Case conversion in Asian character setsAlexander Barkov2010-01-141-3/+11
| | |/ / / / / / | |/| | | | | |
* | | | | | | | mergeVladislav Vaintroub2010-01-181-0/+6
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-1/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Manual merge from next-mr.unknown2010-01-1220-285/+173
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-0/+6
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Alfranio Correia2009-12-173-22/+2
| | |\ \ \ \ \ \ \
| | * | | | | | | | WL#5142 FLUSH LOGS should take optional arguments for which log(s) to flushunknown2009-12-031-0/+6
| | * | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-304-2/+30
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-063-14/+62
| | |\ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2010-01-131-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Backporting revision from mysql-6.0-codebase-bugfixing.Alexander Nozdrin2010-01-111-1/+4
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | mergeVladislav Vaintroub2009-12-2520-284/+172
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Manual merge of WL#4738 from mysql-next-mr: Alexey Kopytov2009-12-2820-282/+139
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ mergedSergei Golubchik2009-12-241-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | * | | | | | | | | | fix atomic/solaris.h to conformSergei Golubchik2009-12-233-226/+32
| | * | | | | | | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-2217-56/+107
| * | | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-252-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Backport of WL #2934: Make/find library for doing float/double Alexey Kopytov2009-12-221-3/+34
* | | | | | | | | | | | mergeVladislav Vaintroub2009-12-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Fix inconsistently defined THR_LOCK_myisam_mmapVladislav Vaintroub2009-12-201-1/+1
| | |/ / / / / / / / /
| * | | | | | | | | | Force use of c-register in CAS instruction on x86-32 bit architecture, b-regi...Mikael Ronstrom2009-12-211-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Fix inconsistently defined THR_LOCK_myisam_mmapVladislav Vaintroub2009-12-201-1/+1
* | | | | | | | | | mergeVladislav Vaintroub2009-12-201-5/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Yet one more fix for Solaris atomics in buildsMikael Ronstrom2009-12-191-1/+1