summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-081-4/+6
|\
| * Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-061-4/+6
| |\
| | * Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUSTNirbhay Choubey2012-08-071-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SHOW 2012 INSTEAD OF 2011 * Added a new macro to hold the current year : COPYRIGHT_NOTICE_CURRENT_YEAR * Modified ORACLE_WELCOME_COPYRIGHT_NOTICE macro to take the initial year as parameter and pick current year from the above mentioned macro.
* | | Merge from 5.1.unknown2012-08-241-2/+1
|\ \ \ | |/ /
| * | Fix compiler warningsunknown2012-08-241-2/+1
| | |
| * | Merge with latest 5.1.unknown2012-08-241-0/+2
| |\ \
* | \ \ Merge into latest 5.2.unknown2012-08-241-0/+3
|\ \ \ \
| * \ \ \ Merge from 5.1.unknown2012-08-241-0/+3
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | MDEV-382: Incorrect quotingunknown2012-08-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Various places in the server replication code was incorrectly quoting strings, which could lead to incorrect SQL on the slave/mysqlbinlog.
* | | | | 5.1 mergeSergei Golubchik2012-08-222-5/+8
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | increase xtradb verson from 13.0 to 13.01
| * | | merge with MySQL 5.1.65Sergei Golubchik2012-08-222-5/+7
| |\ \ \ | | |/ / | |/| / | | |/
| | * Bug #13708485: malformed resultset packet crashes clientGeorgi Kodinov2012-06-281-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several fixes : * sql-common/client.c Added a validity check of the fields metadata packet sent by the server. Now libmysql will check if the length of the data sent by the server matches what's expected by the protocol before using the data. * client/mysqltest.cc Fixed the error handling code in mysqltest to avoid sending new commands when the reading the result set failed (and there are unread data in the pipe). * sql_common.h + libmysql/libmysql.c + sql-common/client.c unpack_fields() now generates a proper error when it fails. Added a new argument to this function to support the error generation. * sql/protocol.cc Added a debug trigger to cause the server to send a NULL insted of the packet expected by the client for testing purposes.
| | * Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING)Jon Olav Hauglid2012-06-291-2/+2
| | | | | | | | | | | | | | | | | | This patch fixes various compilation warnings of the type "error: narrowing conversion of 'x' from 'datatype1' to 'datatype2'
* | | Fixed LP bug #1008293.Igor Babaev2012-06-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the reported problems manifested itself in the scenario when one thread tried to to get statistics on a key cache while the second thread had not finished initialization of the key cache structure yet. The problem was resolved by forcing serialization of such operations on key caches. To serialize function calls to perform certain operations over a key cache a new mutex associated with the key cache now is used. It is stored in the field op_lock of the KEY_CACHE structure. It is locked when the operation is performed. Some of the serialized key cache operations utilize calls for other key cache operations. To avoid recursive locking of op_lock the new functions that perform the operations of key cache initialization, destruction and re-partitioning with an additional parameter were introduced. The parameter says whether the operation over op_lock are to be performed or are to be omitted. The old functions for the operations of key cache initialization, destruction,and re-partitioning now just call the corresponding new functions with the additional parameter set to true requesting to use op_lock while all other calls of these new function have this parameter set to false. Another problem reported in the bug entry concerned the operation of assigning an index to a key cache. This operation can be called while the key cache structures are not initialized yet. In this case any call of flush_key_blocks() should return without any actions. No test case is provided with this patch.
* | | 5.1 mergeSergei Golubchik2012-05-182-3/+8
|\ \ \ | |/ /
| * | merge with mysql-5.1.63Sergei Golubchik2012-05-172-3/+8
| |\ \ | | |/
| | * Bug#13635833: MULTIPLE CRASHES IN FOREIGN KEY CODE WITH CONCURRENT DDL/DMLAnnamalai Gurusami2012-03-011-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two threads. In one thread, dml operation is going on involving cascaded update operation. In another thread, alter table add foreign key constraint is happening. Under these circumstances, it is possible for the dml thread to access a dict_foreign_t object that has been freed by the ddl thread. The debug sync test case provides the sequence of operations. Without fix, the test case will crash the server (because of newly added assert). With fix, the alter table stmt will return an error message. Backporting the fix from MySQL 5.5 to 5.1 rb:961 rb:947
| | * BUG#13431369 - MAIN.VARIABLES-NOTEMBEDDED CRASHES THE SERVER SPORADICALLY ON ↵Tatjana Azundris Nuernberg2012-02-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WINDOWS On shutdown(), Windows can drop traffic still queued for sending even if that wasn't specifically requested. As a result, fatal errors (those after signaling which the server will drop the connection) were sometimes only seen as "connection lost" on the client side, because the server-side shutdown() erraneously discarded the correct error message before sending it. If on Windows, we now use the Windows API to access the (non-broken) equivalent of shutdown(). Backport from trunk include/violite.h: export mysql_socket_shutdown(). It lives in vio in the backport. sql/mysqld.cc: Go through our own shutdown() rather than straight to the POSIX one. vio/viosocket.c: Define mysql_socket_shutdown(). On UNIXoid systems, it's just a wrapper for shutdown(), but on Window, it uses DisconnectEx, which is magic.
* | | mergeSergei Golubchik2012-04-053-3/+8
|\ \ \ | |/ /
| * | mysql-5.1.62 mergeSergei Golubchik2012-04-053-3/+9
| |\ \ | | |/
| | * merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-02-172-2/+2
| | |\
| | | * Updated/added copyright headersKent Boortz2012-02-152-2/+2
| | | |\
| | | | * Updated/added copyright headersMySQL Build Team2012-02-152-3/+2
| | | | |
| | | | * auto-merge mysql-5.0->mysql-5.0-securityGeorgi Kodinov2011-10-122-1/+32
| | | | |\
| | * | | \ Merge compile fix for AIX into delivery tree.Joerg Bruehe2012-02-161-1/+3
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Compile fix needed for AIX,Joerg Bruehe2012-01-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to work around the lack of a bzero() prototype. include/m_string.h: AIX does have bzero() in its system libraries, and the configure phase detects it, including the prototype (sets both HAVE_BZERO and HAVE_DECL_BZERO), but the declaration is missing when the source is compiled. Several attempts all failed. This patch takes the brute force approach to always map "bzero()" to "memset()" on AIX, like is done on platforms where "bzero()" is not found at all.
| | * | | | Bug#11752408 - 43593: DUMP/BACKUP/RESTORE/UPGRADE TOOLS FAILS BECAUSE OF ↵Alexander Barkov2012-01-231-0/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UTF8_GENERAL_CI Introducing new collations: utf8_general_mysql500_ci and ucs2_general_mysql500_ci, to reproduce behaviour of utf8_general_ci and ucs2_general_ci from mysql-5.1.23 (and earlier). The collations are added to simplify upgrade from mysql-5.1.23 and earlier. Note: The patch does not make new server start over old data automatically. Some manual upgrade procedures are assumed. Paul: please get in touch with me to discuss upgrade procedures when documenting this bug. modified: include/m_ctype.h mysql-test/r/ctype_utf8.result mysql-test/t/ctype_utf8.test mysys/charset-def.c strings/ctype-ucs2.c strings/ctype-utf8.c
* | | | | mergeSergei Golubchik2012-03-212-44/+4
|\ \ \ \ \ | |/ / / /
| * | | | restore my_safe_printf_stderr for "crash-safe sigsegv handler"Sergei Golubchik2012-03-142-44/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use vsnprintf() use write() on windows, not WriteFile or fwrite() localtime_r is still a problem
* | | | | Merge with MariaDB 5.1 and MySQL 5.1.61Michael Widenius2012-02-201-4/+65
|\ \ \ \ \ | |/ / / /
| * | | | Merge with MYSQL 5.1.61Michael Widenius2012-02-201-4/+65
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-4/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Fix MDEV-49 : version_compile_machine server variable is 'unknown' for x64 ↵Vladislav Vaintroub2012-01-101-2/+2
| | | | | | | | | | | | | | | | | | | | builds
* | | | | 1. add --plugin-dir and --default-auth to mysqltest.Sergei Golubchik2011-12-025-22/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.1 + fixes for build failures in 5.2Michael Widenius2011-11-291-0/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmd-line-utils/libedit/map.c: Fixed compiler warning cmd-line-utils/libedit/terminal.c: Fixed compiler warning cmd-line-utils/libedit/tty.c: Fixed compiler warning sql/sql_base.cc: Fixed memory leak found by valgrind storage/maria/compat_aliases.cc: Ensure that recover_alias is also a set storage/maria/ma_bitmap.c: Proper fix for compiler warning support-files/compiler_warnings.supp: Fixed compiler warning
| * | | | Fixed that maria-recover works as expected.Michael Widenius2011-11-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - "" is now used if no option is set include/maria.h: Added HA_RECOVER_ANY storage/maria/ha_maria.cc: Insert of checking if maria_recover_options == 0, check if any bit is set. Fix maria_recover_names to match bitmap. This fixes that recover options works as expected. storage/maria/ha_maria.h: Insert of checking if maria_recover_options == 0, check if any bit is set. storage/maria/ma_check.c: Fixed wrong print
* | | | | merge, fix Windows warningsVladislav Vaintroub2011-11-291-0/+3
| | | | |
* | | | | Automatic mergeMichael Widenius2011-11-2428-58/+164
|\ \ \ \ \
| * \ \ \ \ Merge with MariaDB 5.1Michael Widenius2011-11-2428-58/+164
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge with MySQL 5.1.60Michael Widenius2011-11-232-0/+11
| | |\ \ \ \ | | | |/ / /
| | | * | | BUG#11759349 - 51655: CREATE TABLE IN MEMORY ENGINE DOESN'T STOREAshish Agarwal2011-09-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CREATE_TIME IN INFORMATION_SC It was impossible to determine MEMORY table creation time, since it wasn't stored/exposed. With this patch creation time is saved and it is available via I_S.TABLES.CREATE_TIME. Note: it was decided that additional analysis is required before implementing UPDATE_TIME. Thus this patch doesn't store UPDATE_TIME.
| | | * | | Merge from mysql-5.1.59-releaseunknown2011-09-151-0/+9
| | | |\ \ \
| | | | * \ \ Manual merge from mysql-5.1.Ramil Kalimullin2011-08-092-1/+32
| | | | |\ \ \
| | | | * \ \ \ merge 5.0-security => 5.1-securityTor Didriksen2011-07-151-0/+9
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| |
| | | | | * | | Bug#12406055 BUFFER OVERFLOW OF VARIABLE 'BUFF' IN STRING::SET_REALTor Didriksen2011-07-151-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The buffer was simply too small. In 5.5 and trunk, the size is 311 + 31, in 5.1 and below, the size is 331 client/sql_string.cc: Increase buffer size in String::set(double, ...) include/m_string.h: Increase FLOATING_POINT_BUFFER mysql-test/r/type_float.result: New test cases. mysql-test/t/type_float.test: New test cases. sql/sql_string.cc: Increase buffer size in String::set(double, ...) sql/unireg.h: Move definition of FLOATING_POINT_BUFFER
| | * | | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-2128-60/+156
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | Fixed up copyright messages.
| | | * | | | | BUG#12911710 - VALGRIND FAILURE IN ↵Tor Didriksen2011-08-291-0/+9
| | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ROW-DEBUG:PERFSCHEMA.SOCKET_SUMMARY_BY_INSTANCE_FUNC Converting the number zero to binary and back yielded the number zero, but with no digits, i.e. zero precision. This made the multiply algorithm go haywire in various ways. include/decimal.h: Document struct st_decimal_t mysql-test/r/type_newdecimal.result: New test case (valgrind warnings) mysql-test/t/type_newdecimal.test: New test case (valgrind warnings) sql/my_decimal.h: Remove the HAVE_purify enabled/disabled code. strings/decimal.c: Make a proper zero, with non-zero precision.
| | | * | | | BUG#12695969Luis Soares2011-07-121-1/+1
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually merged from mysql-5.0 into mysql-5.1. conflicts ========= include/Makefile.am
| | | | * | | BUG#12695969Luis Soares2011-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up patch that adds the newly added header file to Makefile.am noinst_HEADERS.
| | | * | | | BUG#12695969Luis Soares2011-07-111-0/+31
| | | |\ \ \ \ | | | | |/ / / | | | | | / / | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | Manually merged mysql-5.0 into mysql-5.1. conflicts ========= client/mysqlibinlog.cc
View Lorry Controller Status