summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-next-mr-bugfixing.Alexander Nozdrin2010-02-2313-29/+359
|\
| * Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-212-0/+9
| |\
| | * Patch for WL#3736: Extended Table, Column and Index Comments.Alexander Nozdrin2010-02-202-0/+9
| * | mergeVladislav Vaintroub2010-02-181-0/+17
| |\ \ | | |/
| | * Re-adding 'include/probes_mysql_nodtrace.h' removed by accidentAlexander Nozdrin2010-02-171-0/+129
| | * Merging from mysql-next-mrAlexander Barkov2010-02-176-137/+76
| | |\
| | * | Post-fix for WL#3090.Alexander Barkov2010-02-161-1/+1
| | * | WL#3090 Japanese Character Set adjustmentsAlexander Barkov2010-02-151-0/+17
| * | | mergeVladislav Vaintroub2010-02-165-8/+76
| |\ \ \ | | | |/ | | |/|
| * | | mergeVladislav Vaintroub2010-02-132-1/+8
| |\ \ \ | | | |/ | | |/|
| * | | mergeVladislav Vaintroub2010-02-063-8/+5
| |\ \ \
| * | | | 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
| |\ \ \ \
| * | | | | 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
| |\ \ \ \ \
| * \ \ \ \ \ mergeVladislav Vaintroub2010-01-181-0/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ mergeVladislav Vaintroub2010-01-131-1/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-2520-284/+172
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-231-1/+1
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix inconsistently defined THR_LOCK_myisam_mmapVladislav Vaintroub2009-12-201-1/+1
| * | | | | | | | | | mergeVladislav Vaintroub2009-12-201-5/+5
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-198-13/+47
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix missing 64 bit Solaris atomic prototypesVladislav Vaintroub2009-12-191-0/+44
| * | | | | | | | | | | | mergeVladislav Vaintroub2009-12-1910-55/+155
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-164-26/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-103-8/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix my_atomic.h on Solaris, do not redefine macros already definedVladislav Vaintroub2009-12-051-0/+2
| * | | | | | | | | | | | | | | | mergeVladislav Vaintroub2009-12-0415-34/+3833
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-11-302-0/+130
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-11-256-53/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-11-2511-218/+712
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-11-203-10/+76
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ automergeVladislav Vaintroub2009-11-134-2/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | WL#5161 : Cross-platform build with CMakeVladislav Vaintroub2009-11-098-29/+200
* | | | | | | | | | | | | | | | | | | | | | | Fix compiler warnings in my_atomic.hKonstantin Osipov2010-02-192-3/+3
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Auto-merge from mysql-next-4284.Alexander Nozdrin2010-02-151-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Followup to Bug#45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-151-1/+0
* | | | | | | | | | | | | | | | | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-152-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge mysql-next-mr (revno 2996) --> mysql-next-mr-marcMarc Alff2010-02-053-8/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge mysql-next-mr (revno 2965) --> mysql-next-mr-marcMarc Alff2010-01-275-205/+336
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Bug#44210 Performance schema: pool-of-threads threads instrumentation is missingMarc Alff2010-01-262-1/+8
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Bug #45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-112-4/+48
* | | | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-068-213/+341
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | 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
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | |