summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Collapse)AuthorAgeFilesLines
* 5.2 mergeSergei Golubchik2012-05-201-0/+2
|\
| * 5.1 mergeSergei Golubchik2012-05-181-0/+2
| |\
| | * merge with mysql-5.1.63Sergei Golubchik2012-05-171-0/+2
| | |\
| | | * BUG#13738989 : 62136 : FAILED TO FETCH SELECT RESULT USING EMBEDDED MYSQLDMayank Prasad2012-04-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Background : In mysql-5.1, in a fix for bug#47485, code has been changed for mysql client (libmysql/libmysql.c) but corresponding code was not changed for embedded mysql. In that code change, after execution of a statement, mysql_stmt_store_result() checks for mysql->state to be MYSQL_STATUS_STATEMENT_GET_RESULT, instead of MYSQL_STATUS_GET_RESULT (earlier). Reason: In embedded mysql code, after execution, mysql->state was not set to MYSQL_STATUS_STATEMENT_GET_RESULT, so it was throwing OUT_OF_SYNC error. Fix: Fixed the code in libmysqld/lib_sql.cc to have mysql->state to be set to MYSQL_STATUS_STATEMENT_GET_RESULT after execution.
* | | | mergeSergei Golubchik2012-04-051-2/+1
|\ \ \ \ | |/ / /
| * | | mergeSergei Golubchik2012-04-051-2/+1
| |\ \ \ | | |/ /
| | * | mysql-5.1.62 mergeSergei Golubchik2012-04-051-2/+1
| | |\ \ | | | |/
| | | * Updated/added copyright headersKent Boortz2012-02-151-2/+1
| | | |\
* | | | \ Merge with MariaDB 5.2Michael Widenius2012-02-211-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge with MariaDB 5.1 and MySQL 5.1.61Michael Widenius2012-02-201-0/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge with MYSQL 5.1.61Michael Widenius2012-02-201-0/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed README with link to source Merged InnoDB change to XtraDB README: Added information of where to find MariaDB code storage/archive/ha_archive.cc: Removed memset() of rows, a MariaDB checksum's doesn't touch not used data.
| | | * | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2011-11-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handle_segfault is the signal handler code of mysqld. however, it makes calls to potentially unsafe functions localtime_r, fprintf, fflush. include/my_stacktrace.h: Add safe versions of itoa() write() and snprintf(). libmysqld/CMakeLists.txt: Move signal handler to separate file. mysys/stacktrace.c: Remove unsafe function calls. sql/CMakeLists.txt: Move signal handler to separate file. sql/Makefile.am: Move signal handler to separate file. sql/mysqld.cc: Move signal handler to separate file. sql/signal_handler.cc: Remove unsafe function calls.
* | | | | 5.2->5.3 mergeSergei Golubchik2011-12-121-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | 1. add --plugin-dir and --default-auth to mysqltest.Sergei Golubchik2011-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2. dialog plugin now always returns mysql->password if non-empty and the first question is of password type 3. split get_tty_password into get_tty_password_buff and strdup. 4. dialog plugin now uses get_tty_password by default 5. dialog.test 6. moved small tests of individual plugins into a dedicated suite
* | | | | Merge with 5.2.Michael Widenius2011-12-1111-13/+110
|\ \ \ \ \ | |/ / / / | | | | | | | | | | no_error handling for select (used by INSERT ... SELECT) still needs to be fixed, but I will do that in a separate commit
| * | | | Merge with MariaDB 5.1Michael Widenius2011-11-2411-13/+110
| |\ \ \ \ | | |/ / /
| | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-2111-13/+110
| | |\ \ \ | | | |/ / | | | | | | | | | | Fixed up copyright messages.
| | | * | Updated/added copyright headersKent Boortz2011-07-031-2/+26
| | | |\ \
| | | | * | Bug#11764633 : 57491: THD->MAIN_DA.IS_OK() ASSERT IN EMBEDDEDMayank Prasad2011-05-181-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: While running embedded server, if client issues TEE command (\T foo/bar) and "foo/bar" directory doesn't exist, it is suppose to give error. But it was aborting. This was happening because wrong error handler was being called. Solution: Modified calls to correct error handler. In embedded server case, there are two error handler (client and server) which are supposed to be called based on which context code is in. If it is in client context, client error handler should be called otherwise server. Test case: Test case automation is not possible as current (following) code doesn't allow '\T' to be executed from command line (OR command read from a file): [client/mysql.cc] ... static int com_tee(String *buffer __attribute__((unused)), char *line __attribute__((unused))) { char file_name[FN_REFLEN], *end, *param; if (status.batch) << THIS IS TRUE WHILE EXECUTING FROM COMMAND LINE. return 0; ... So, not adding test case in GA. WIll add a test case in mysql-trunk after removing above code so that this could be properly tested before GA. libmysqld/lib_sql.cc: Added code to call client/server error handler based on in control is in client/server code respectively. sql/mysql_priv.h: Added comments for THR_THD, THR_MALLOC keys. sql/sql_class.cc: Function definition of new function restore_global to removes thread specific data from stack (which was stored in store global). sql/sql_class.h: Function declaration of new function restore_global.
| | | * | | Updated/added copyright headersKent Boortz2011-06-3010-11/+84
| | | |\ \ \ | | | | |/ / | | | |/| / | | | | |/
| | | | * Updated/added copyright headersKent Boortz2011-06-302-5/+7
| | | | |
* | | | | merging.Alexey Botchkov2011-11-121-15/+12
|\ \ \ \ \
| * \ \ \ \ mergeSergei Golubchik2011-10-111-15/+12
| |\ \ \ \ \ | | |/ / / /
| | * | | | merge with 5.1Sergei Golubchik2011-10-071-15/+12
| | |\ \ \ \ | | | |/ / /
| | | * | | support for plugins on windowsSergei Golubchik2011-10-041-15/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMakeLists.txt: 1. add -DSAFEMALLOC -DSAFE_MUTEX in the top-level CMakeLists.txt don't force plugins to copy-paste these lines in their CMakeLists.txt 2.1 search plugin/* for plugins (not only storage/*), 2.2 recognize MYSQL_PLUGIN (not only MYSQL_STORAGE_ENGINE), 2.3 extract library names from the plug.in (don't force library names to be ha_<engine>.dll and <engine>.lib) include/mysql/plugin.h: define MYSQL_PLUGIN_EXPORT appropriately (backport from 5.5) libmysqld/CMakeLists.txt: remove unnecessary workaround plugin/fulltext/CMakeLists.txt: build fulltext example plugin on windows storage/maria/CMakeLists.txt: The library is called libmaria_s.lib, not maria.lib storage/maria/unittest/CMakeLists.txt: The library is called libmaria_s.lib, not maria.lib storage/myisam/CMakeLists.txt: The library is called libmyisam_s.lib, not myisam.lib storage/mysql_storage_engine.cmake: introduce MYSQL_PLUGIN macro. don't force library names to be ha_<engine>.dll and <engine>.lib storage/xtradb/CMakeLists.txt: remove a condition from include win/README: don't use deprecated syntax win/configure-mariadb.sh: don't use deprecated syntax win/configure.js: 1. support MYSQL_PLUGIN in addition to MYSQL_STORAGE_ENGINE. 2. support plugin/* in addition to storage/*
* | | | | | gis-related tests fixes.Alexey Botchkov2011-06-204-3/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | merging.
| * | | | | Merge with 5.2Michael Widenius2011-05-161-1/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix Windows embedded warningsVladislav Vaintroub2011-05-101-1/+0
| | | | | |
| * | | | | Merge with MariaDB 5.2Michael Widenius2011-05-101-0/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-0/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Added calls to cleanup_mutexes() for embedded library.Michael Widenius2011-04-281-0/+2
| | | | | |
| * | | | | Merge MWL#180, binlog checksum backport, into MariaDB 5.3-based tree.unknown2011-05-032-2/+3
| |\ \ \ \ \
| | * | | | | Backport MySQL WL#2540 into MariaDB.unknown2011-05-032-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch backported: bzr diff '-rrevid:alfranio.correia@oracle.com-20101121143257-se3vpqus73l4mum0 ..revid:luis.soares@oracle.com-20101124111752-9b8260bd1qak87hr' --old=lp:mysql-server --new=lp:mysql-server
* | | | | | | Precise GIS functions added.Alexey Botchkov2011-05-042-0/+2
|/ / / / / /
* | | | | | mergeVladislav Vaintroub2011-03-281-6/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | CMake/code signing: Vladislav Vaintroub2011-03-281-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use MYSQL_INSTALL_TARGETS() macro for DLLs (libmysql and libmysqld) to ensure that libraries are signed, if signing is requested.
* | | | | | merge mwl#55Vladislav Vaintroub2011-03-112-15/+20
|\ \ \ \ \ \ | |/ / / / /
| * | | | | merge 5.2Vladislav Vaintroub2011-03-101-14/+0
| |\ \ \ \ \ | | |/ / / /
| * | | | | workaround CMake bug 11240 (problems making mysqlserver.lib on Win64)Vladislav Vaintroub2011-02-011-1/+7
| | | | | |
| * | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-292-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | to be able to build MSI based installer
* | | | | | Merge with 5.2Michael Widenius2011-03-091-14/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-282-14/+6
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Fixed build failuresMichael Widenius2011-02-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed references to deleted files - If we link staticly, check for static zlib - This should fix the problem with 'no -lz found' link error - Fixed build failure on window (Patch from Wlad) - Fixed build problem with federatedx when using -Werror BUILD/Makefile.am: Remove removed file config/ac-macros/zlib.m4: If we compile with --all-static, test that we have a static libz libmysqld/CMakeLists.txt: Fix for build error on windows mysql-test/suite/pbxt/r/key_cache.result: Updated result mysql-test/suite/pbxt/t/key_cache.test: Fixed not updated test case sql/CMakeLists.txt: Fix for build error on windows storage/federatedx/Makefile.am: Don't use CFLAGS to compile C++ programs storage/pbxt/src/lock_xt.cc: Fixed compiler warning about using uninitialized b2 storage/xtradb/buf/buf0buf.c: Fixed wrong printf storage/xtradb/srv/srv0srv.c: Fixed assignment of different width and test with different sign/unsigned
| | * | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-14/+0
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed some issues with partitions and connection_string, which also fixed lp:716890 "Pre- and post-recovery crash in Aria" - Fixed wrong assert in Aria Now need to merge with latest xtradb before pushing sql/ha_partition.cc: Ensure that m_ordered_rec_buffer is not freed before close. sql/mysqld.cc: Changed to use opt_stack_trace instead of opt_pstack. Removed references to pstack sql/partition_element.h: Ensure that connect_string is initialized storage/maria/ma_key_recover.c: Fixed wrong assert
| | | * | MergeKent Boortz2010-12-292-14/+15
| | | |\ \ | | | | |/
| | | | * - Added/updated copyright headersKent Boortz2010-12-282-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed files specific to compiling on OS/2 - Removed files specific to SCO Unix packaging - Removed "libmysqld/copyright", text is included in documentation - Removed LaTeX headers for NDB Doxygen documentation - Removed obsolete NDB files - Removed "mkisofs" binaries - Removed the "cvs2cl.pl" script - Changed a few GPL texts to use "program" instead of "library"
| | | | * Bug#48983: Bad strmake calls (length one too long)Davi Arnaut2009-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is a somewhat common misusage of the strmake function. The strmake(dst, src, len) function writes at most /len/ bytes to the string pointed to by src, not including the trailing null byte. Hence, if /len/ is the exact length of the destination buffer, a one byte buffer overflow can occur if the length of the source string is equal to or greater than /len/. client/mysqldump.c: Make room for the trailing null byte. libmysql/libmysql.c: Add comment, there is enough room in the buffer. Increase buffer length, two strings are concatenated. libmysqld/lib_sql.cc: Make room for the trailing null byte. mysys/default.c: Make room for the trailing null bytes. mysys/mf_pack.c: Make room for the trailing null byte. server-tools/instance-manager/commands.cc: Copy only if overflow isn't possible in both cases. server-tools/instance-manager/listener.cc: Make room for the trailing null byte. sql/log.cc: Make room for the trailing null byte. sql/sp_pcontext.h: Cosmetic fix. sql/sql_acl.cc: MAX_HOSTNAME already specifies space for the trailing null byte. sql/sql_parse.cc: Make room for the trailing null byte. sql/sql_table.cc: Make room for the trailing null byte.
* | | | | Workaround CMake bug http://www.vtk.org/Bug/view.php?id=11240Vladislav Vaintroub2011-02-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Huge static libraries like libmysqld might not build if /MACHINE flag is missing for librarian with the correct processor architecture. Fix is to add /MACHINE flag for x64 builds
* | | | | mergeVladislav Vaintroub2010-12-061-2/+0
|\ \ \ \ \ | |/ / / /
| * | | | mergeVladislav Vaintroub2010-12-061-2/+0
| |\ \ \ \ | | |/ / /