summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | add --disable-shared equivalentVladislav Vaintroub2009-11-251-1/+3
* | | | | implement convenience librariesVladislav Vaintroub2009-11-241-29/+28
* | | | | mergeVladislav Vaintroub2009-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
* | | | | automergeVladislav Vaintroub2009-11-131-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | 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
|/ / / /
* | | | 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
| |\ \ \ \
| | * | | | Backporting WL#4398 WL#1720He Zhenxing2009-09-262-1/+3
* | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-234-3/+26
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merging mysql-next-mr-merge to mysql-next-mr.Alexander Barkov2009-10-211-1/+9
| |\ \ \ \ \
| | * | | | | WL#751 Error message construction, backportSergey Glukhov2009-10-151-1/+9
| * | | | | | Merge from mysql-trunk-merge.Alexander Nozdrin2009-10-191-2/+11
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge from mysql-5.1.Alexander Nozdrin2009-10-191-2/+11
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Bug #47795 CMake, storage engine name different from directory nameMagnus BlÄudd2009-10-081-2/+11
| * | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-144-0/+6
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | |
| | * | | | Merge from mysql-5.1.Alexander Nozdrin2009-10-134-0/+6
| | |\ \ \ \ | | | |/ / /
| | | * | | auto-mergeIngo Struewing2009-10-021-0/+3
| | | |\ \ \
| | | | * \ \ mergingAlexey Botchkov2009-09-295-69/+41
| | | | |\ \ \
| | | | * | | | Bug#43733 Select on processlist let the embedded server crash (concurren...Alexey Botchkov2009-06-041-0/+3