summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* Auto-merge from mysql-next-mr-bugfixing.Alexander Nozdrin2010-02-2329-359/+633
|\
| * merge, CMake bugfixes, remove sp-error from experimentalVladislav Vaintroub2010-02-236-16/+3
| |\
| | * Bug#43201 : Stack overrun when running sp-error test.Vladislav Vaintroub2010-02-235-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that stack overflow checks for recusrive stored procedure calls, that run in the normal server, did not work in embedded and were dummified with preprocessor magic( #ifndef EMBEDDED_SERVER ). The fix is to remove ifdefs, there is no reason not to run overflow checks and crash in deeply recursive calls. Note: Start of the stack (thd->thread_stack variable) in embedded is not necessarily exact but stil provides the best guess. Unless the caller of mysql_read_connect() is already deep in the stack, thd->thread_stack variable should approximate stack start address well.
| * | Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-2211-118/+325
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: - mysql-test/r/mysqld--help-notwin.result - mysql-test/r/mysqld--help-win.result
| | * Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-219-64/+234
| | |\
| | * | Install static client and embedded debug librariesVladislav Vaintroub2010-02-201-37/+2
| | | |
| | * | postmerge fixVladislav Vaintroub2010-02-161-1/+1
| | | |
| | * | mergeVladislav Vaintroub2010-02-1673-6647/+10793
| | |\ \
| | * \ \ mergeVladislav Vaintroub2010-02-1332-221/+438
| | |\ \ \
| | * | | | remove /MAP option for good.Noone needs itvvaintroub2010-02-091-5/+0
| | | | | |
| | * | | | mergeVladislav Vaintroub2010-02-0648-6694/+794
| | |\ \ \ \
| | * | | | | Make DEBUGBUILDDIR cached variable, so it can be overriden with cmake -DVladislav Vaintroub2010-02-041-1/+1
| | | | | | |
| | * | | | | - Optionally, copy mysqld renamed to mysqld-debug from debug build directory ↵Vladislav Vaintroub2010-02-041-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into resulting package - Fix to mysql_install_db.pl to the correct place on Windows ( under scripts directory)
| | * | | | | prettification of package names and fix compile bug on OSX/ppcVladislav Vaintroub2010-01-281-3/+6
| | | | | | |
| | * | | | | merge, add plugin/audit_null/CMakeLists.txtVladislav Vaintroub2010-01-2614-63/+712
| | |\ \ \ \ \
| | * | | | | | Fix failing sys_vars.plugin_dir_basic - treat both '/' and '\' as path ↵Vladislav Vaintroub2010-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | separators in get_relative_path() on Windows
| | * | | | | | Handle different installation layouts.Vladislav Vaintroub2010-01-242-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using cmake option INSTALL_LAYOUT=STANDALONE would produce the layout as in tar.gz or zip packages. INSTALL_LAYOUT=UNIX will produce unixish install layout (with mysqld being in sbin subdirectory , libs in lib/mysql etc). This layout is used for RPM packages. Subtle differences in both packages unfortunately lead to the need to recompile MySQL to use with other package type - as otherwise for example default plugins or data directories would be wrong set. There are numerous other variables that allow fine-tuning packaging layout. (INSTALL_BINDIR, INSTALL_LIBDIR , INSTALL_PLUGINDIR etc). This options are different from autotools as they do not expect full paths to directories, but only subdirectory of CMAKE_INSTALL_PREFIX. There are 2 special options that expect full directory paths - MYSQL_DATADIR that defines default MYSQL data directory (autotools equivalent is --localstatedir) - SYSCONFDIR can be added to search my.cnf search path (autotools equivalent is --sysconfdir)
| | * | | | | | Replace another abort() under DBUG_EXECUTE_IF with DBUG_ABORT to avoid ↵Vladislav Vaintroub2010-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | popups on Windows.
| | * | | | | | mergeVladislav Vaintroub2010-01-2212-360/+825
| | |\ \ \ \ \ \
| | * | | | | | | Cherrypick fix for -DWITH_SSL=system by Marc Alff (Bug#50513)Vladislav Vaintroub2010-01-211-7/+14
| | | | | | | | |
| | * | | | | | | In DBUG_EXECUTE_IF, change abort() to DBUG_ABORT() to avoid popups on windowsVladislav Vaintroub2010-01-182-13/+13
| | | | | | | | |
| | * | | | | | | mergeVladislav Vaintroub2010-01-1847-1384/+3562
| | |\ \ \ \ \ \ \
| | * | | | | | | | fix for 32 bit Linux problem reported by TimothyVladislav Vaintroub2010-01-151-0/+3
| | | | | | | | | |
| | * | | | | | | | mergeVladislav Vaintroub2010-01-1417-173/+182
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | WITH_MYSQLD_LIBS=>WITH_MYSQLD_LDFLAGSVladislav Vaintroub2010-01-141-4/+4
| | | | | | | | | | |
| | * | | | | | | | | Do not link with mtmalloc on Solaris.Vladislav Vaintroub2010-01-131-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add WITH_MYSQLD_LIBS for extra linker flags for mysqld
| | * | | | | | | | | mergeVladislav Vaintroub2010-01-139-21/+79
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2010-01-1176-2272/+3979
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-2580-9208/+6917
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | enable Cygwin build againVladislav Vaintroub2009-12-251-1/+4
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | recompile partition plugin for embedded server, its behavior depends on ↵Vladislav Vaintroub2009-12-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WITH_EMBEDDED_SERVER preprocessor definition
| | * | | | | | | | | | | | mergeVladislav Vaintroub2009-12-216-35/+140
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-1934-402/+801
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-1931-564/+772
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Simplify embedding version info into executables with ADD_VERSION_INFOVladislav Vaintroub2009-12-181-2/+3
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Replace ADD_EXECUTABLE with MYSQL_ADD_EXECUTABLE for binaries that are ↵Vladislav Vaintroub2009-12-171-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installed. MYSQL_ADD_EXECUTABLE will instructs CPack where to install the exe. On Windows, it also adds version resource and if -DSIGNCODE was given, will sign the exe in packaging step.
| | * | | | | | | | | | | | | | | mergeVladislav Vaintroub2009-12-1645-865/+1450
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | fix windows errors with version resourceVladislav Vaintroub2009-12-161-0/+1
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Cleanup, use MYSQL_INSTALL_TARGETS macro instead of INSTALL(TARGETS) ↵Vladislav Vaintroub2009-12-121-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | combined with INSTALL_DEBUG_SYMBOLS
| | * | | | | | | | | | | | | | | | mergeVladislav Vaintroub2009-12-1157-597/+1616
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Introduce macro DTRACE_INSTRUMENT_STATIC_LIBS,to hide Vladislav Vaintroub2009-12-111-33/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the ugly Solaris dtrace workarounds
| | * | | | | | | | | | | | | | | | | Introduce a workaround for Solaris' inability to deal with dtrace in static ↵Vladislav Vaintroub2009-12-114-22/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libraries. Rerun dtrace -G on all objects that can contan dtrace probes (also objects that are part of static libs) before linking mysqld to produce dtrace_probes_all.o and link dtrace_probes_all.o with mysqld This ugly workaround was inspired by handling dtrace using autotools.
| | * | | | | | | | | | | | | | | | | mergeVladislav Vaintroub2009-12-103-9/+44
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | couple of tweaks for solaris on sparc, link with librt, as it defines ↵Vladislav Vaintroub2009-12-081-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sched_yield
| | * | | | | | | | | | | | | | | | | | On Linux, support -Wl,--no-undefined (only client shared library)Vladislav Vaintroub2009-12-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and --Wl,--as-needed (all shared modules). The later will remove unused dependencies (also from gcc and C++ runtime)
| | * | | | | | | | | | | | | | | | | | mergeVladislav Vaintroub2009-12-047-234/+616
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-0226-1320/+258
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | fix build errorsVladislav Vaintroub2009-12-011-3/+3
| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | - Introduce MYSQL_ADD_PLUGIN that replaces MYSQL_STORAGE_ENGINEVladislav Vaintroub2009-12-011-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix semisync library prefix (remove lib on Unixes) - restrict exported symbols from zlib and yassl (fvisibility=hidden)
| | * | | | | | | | | | | | | | | | | | | | mergeVladislav Vaintroub2009-11-2555-783/+753
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status