summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* add_executable => mysql_add_executable (just for uniformity)Vladislav Vaintroub2010-02-201-6/+4
* mergeVladislav Vaintroub2010-02-162-5/+5
|\
| * Merge next-mr -> next-4284.Konstantin Osipov2010-02-062-2/+3
| |\
| * \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-051-1/+1
| |\ \
| * \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-2/+2
| |\ \ \
| * \ \ \ Merge next-mr -> next-4284Konstantin Osipov2010-02-031-1/+13
| |\ \ \ \
| * \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-033-4/+8
| |\ \ \ \ \
| * \ \ \ \ \ Merge next-mr -> next-4284. Konstantin Osipov2010-02-021-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-1/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-161-1/+0
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Backport of:Konstantin Osipov2009-12-032-3/+2
| * | | | | | | | | Initial import of WL#3726 "DDL locking for all metadata objects".Konstantin Osipov2009-11-302-1/+2
* | | | | | | | | | merge, add plugin/audit_null/CMakeLists.txtVladislav Vaintroub2010-01-262-4/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge backport of WL#3771 with mysql-next-mr.Sergey Vojtovich2010-01-192-3/+4
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Merge backport of WL#3771 with mysql-next-mr.Sergey Vojtovich2010-01-192-3/+4
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | * | | | | | | Backport from 6.0-codebase.Sergey Vojtovich2009-12-152-3/+4
| | | | |/ / / / / | | | |/| | | | |
* | | | | | | | | Fix smaller stuff: disable transitive linking for MERGE_LIBRARIES results,Vladislav Vaintroub2010-01-251-1/+1
* | | | | | | | | mergeVladislav Vaintroub2010-01-182-1/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-132-3/+15
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | Manual merge from next-mr.unknown2010-01-123-4/+8
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Alfranio Correia2009-12-171-1/+0
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merging with mysql-5.1-rep+2Mats Kindahl2009-12-151-1/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | WL#5151: Conversion between different types when replicatingMats Kindahl2009-12-141-1/+1
| | * | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-301-0/+1
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-064-2/+17
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
* | | | | | | | | | | | mergeVladislav Vaintroub2010-01-132-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-111-1/+13
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | fixing wrong indentation in two Makefile.am, which prevented the Anjuta IDE f...Guilhem Bichot2010-01-061-2/+2
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | mergeVladislav Vaintroub2010-01-111-1/+13
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | WL#2360 Performance schemaMarc Alff2010-01-061-1/+13
| |/ / / / / / / / /
* | | | | | | | | | Do not use fvisibility flag if GCC does not support itVladislav Vaintroub2010-01-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
* | | | | | | | | | mergeVladislav Vaintroub2010-01-041-1/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
* | | | | | | | | | mergeVladislav Vaintroub2009-12-253-4/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | mergedSergei Golubchik2009-12-241-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| * | | | | | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-223-4/+8
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | mergeVladislav Vaintroub2009-12-231-0/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Auto-merge from mysql-trunk-bugfixing.Alexander Nozdrin2009-12-231-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fix build error with CMake 2.8 (mysql_stmt_next_result not exported Vladislav Vaintroub2009-12-221-0/+1
* | | | | | | | | Replace ADD_EXECUTABLE with MYSQL_ADD_EXECUTABLE for binaries that are insta...Vladislav Vaintroub2009-12-171-2/+0
* | | | | | | | | mergeVladislav Vaintroub2009-12-161-1/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-1/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-117-59/+77
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Automerge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-11-261-1/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | Post-merge fix for bug 41728: revert fix that was pushed in mistake to 5.1 an...Davi Arnaut2009-11-241-1/+0
| | | | |_|_|/ / | | | |/| | | |
* | | | | | | | Cleanup, use MYSQL_INSTALL_TARGETS macro instead of INSTALL(TARGETS) combined...Vladislav Vaintroub2009-12-121-4/+2
* | | | | | | | mergeVladislav Vaintroub2009-12-111-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge with next-mrKonstantin Osipov2009-11-201-0/+1
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Bug#32115: Bad use of Name_resolution_context from current LEX in partitioningMattias Jonsson2009-11-201-1/+0
| | |_|_|/ / / | |/| | | | |
* | | | | | | On Linux, support -Wl,--no-undefined (only client shared library)Vladislav Vaintroub2009-12-071-1/+2
View Lorry Controller Status