summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
...
| | | | * | | | | | | | | | | | mergeVladislav Vaintroub2010-01-132-3/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ / / | | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | | mergeVladislav Vaintroub2010-01-111-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
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / /
| | | | * | | | | | | | | | | | mergeVladislav Vaintroub2009-12-231-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
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ / / | | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | | Cleanup, use MYSQL_INSTALL_TARGETS macro instead of INSTALL(TARGETS) combined...Vladislav Vaintroub2009-12-121-4/+2
| | | | * | | | | | | | | | | | mergeVladislav Vaintroub2009-12-111-1/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ / / | | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | | On Linux, support -Wl,--no-undefined (only client shared library)Vladislav Vaintroub2009-12-071-1/+2
| | | | * | | | | | | | | | | | add --disable-shared equivalentVladislav Vaintroub2009-11-251-1/+3
| | | | * | | | | | | | | | | | implement convenience librariesVladislav Vaintroub2009-11-241-29/+28
| | | | * | | | | | | | | | | | mergeVladislav Vaintroub2009-11-201-0/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ / / | | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | | automergeVladislav Vaintroub2009-11-131-0/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Fix problems found by Joro (Xcode generator specific)Vladislav Vaintroub2009-11-091-2/+6
| | | | * | | | | | | | | | | | | WL#5161 : Cross-platform build with CMakeVladislav Vaintroub2009-11-093-120/+102
| | | * | | | | | | | | | | | | | A post-fix for WL#2649 Number-to-string conversionAlexander Barkov2010-02-111-2/+2
| | | | |_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | 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
| | | | | | |_|_|/ / / / / / / | | | | | |/| | | | | | | | |
| | | * | | | | | | | | | | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-132-3/+15
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / /
| | | | * | | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-111-1/+13
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ / / | | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | | WL#2360 Performance schemaMarc Alff2010-01-061-1/+13
| | | | | | |_|_|_|_|_|/ / / | | | | | |/| | | | | | | |
| | | | * | | | | | | | | | fixing wrong indentation in two Makefile.am, which prevented the Anjuta IDE f...Guilhem Bichot2010-01-061-2/+2
| | | | |/ / / / / / / / /
| | | * | | | | | | | | | Manual merge from next-mr.2010-01-123-4/+8
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | mergedSergei Golubchik2009-12-241-0/+1
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / / | | | | | |/| | | | | | |
| | | | * | | | | | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-223-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
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | |/| | | | | | | |
| | | * | | | | | | | | | | 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
| | | * | | | | | | | | | | 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
| | | | | | |_|_|/ / / / | | | | | |/| | | | | |
| | | * | | | | | | | | Merge with next-mrKonstantin Osipov2009-11-201-0/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / | | | | |/| | | | | | |
| | | | * | | | | | | | Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-191-0/+1
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | Backport of Bug#47304 to mysql-next-mrDavi Arnaut2009-11-101-0/+1
| | | | | | |_|_|_|/ / | | | | | |/| | | | |
| | | * | | | | | | | Bug#32115: Bad use of Name_resolution_context from current LEX in partitioningMattias Jonsson2009-11-201-1/+0
| | | |/ / / / / / /
| | | * | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-0/+1
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| / / / / / | | | | |/ / / / /
| | | | * | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-051-0/+1
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | Automerge.Davi Arnaut2009-11-021-0/+1
| | | | | |\ \ \ \ | | | | | | |_|/ / | | | | | |/| | / | | | | | | | |/ | | | | | | |/|
| | | | | | * | Bug#41728: Dropped symbol but no soname changeDavi Arnaut2009-09-291-0/+1
| | | * | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-282-2/+3
| | | |\ \ \ \ \
| | | | * \ \ \ \ manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-222-2/+3
| | | | |\ \ \ \ \ | | | | | | |_|_|/ | | | | | |/| | |