mariadb

Tree: 7752ccec48

Author	SHA1	Message	Date
Alexander Nozdrin	7752ccec48	Patch for Bug#21818 (Return value of ROW_COUNT() is incorrect for ALTER TABLE, LOAD DATA). ROW_COUNT is now assigned according to the following rules: - In my_ok(): - for DML statements: to the number of affected rows; - for DDL statements: to 0. - In my_eof(): to -1 to indicate that there was a result set. We derive this semantics from the JDBC specification, where int java.sql.Statement.getUpdateCount() is defined to (sic) "return the current result as an update count; if the result is a ResultSet object or there are no more results, -1 is returned". - In my_error(): to -1 to be compatible with the MySQL C API and MySQL ODBC driver. - For SIGNAL statements: to 0 per WL#2110 specification. Zero is used since that's the "default" value of ROW_COUNT in the diagnostics area.	16 years ago
Jonathan Perkin	89aedeb06d	Revert back to new CMake names for audit_null/daemon_example plugins.	16 years ago
Jonathan Perkin	9d33e95474	Remove comments.	16 years ago
Jonathan Perkin	5b85121ca6	Changes to build using CMake according to existing release packages: - Update/fix file layouts for each package type, add new types for native package formats including deb, rpm and svr4. - Build all plugins, including debug versions - Update compiler flags to match current release - Add missing @VAR@ expansions - Install correct mysqclient library symlinks - Fix icc/ia64 builds - Fix install of libmysqld-debug - Don't include mysql_embedded - Remove unpackaged manual pages to avoid missing files warnings - Don't install mtr's test suite	16 years ago
Jonathan Perkin	cb327fd8c2	Large number of changes to support building RPMs using CMake, along with other merges from the old distribution-specific spec file. - update copyright notices - remove __os_install_post override, it was only necessary as a hack to build debuginfo packages - now that we no longer make them we can revert to the distribution macro which likely has other useful bits we might want - remove _unpackaged_files_terminate_build override, we want to know of any orphaned files - include native distribution support - no longer build separate debuginfo RPMs, instead just include debug/symbols in all binaries, which is more useful for support - include support for building commercial RPMs, requires a commercial source tree - remove cluster RPM support, we don't build them from this source tree - use CMake for building, and update package lists to match the new install layout/files. Remove any options which were only useful for automake builds (e.g. yassl/zlib). - other minor cleanups	16 years ago
Mats Kindahl	7f514f45e6	Bug #52737 : plugin_dir is set to /usr/local/mysql/lib/plugin while starting via mysqld_safe Plugin dir was set to a hard-coded path instead of relative the base dir. This patch fixes this by using a path relative the basedir instead of the plugin directory indicated by the configuration.	16 years ago
Alexander Nozdrin	3511c2e45a	Make innodb.innodb_information_schema experimental due to Bug 48883.	16 years ago
Alexander Nozdrin	a2d5ef0557	Null-merge from mysql-trunk.	16 years ago
Alexander Nozdrin	19fac19a93	Auto-merge from mysql-trunk-bugfixing.	16 years ago
Alexander Nozdrin	d91c271b2b	Patch for Bug#50511 (Sometimes wrong handling of user variables containing NULL). The bug happened under the following condition: - there was a user variable of type REAL, containing NULL value - there was a table with a NOT_NULL column of any type but REAL, having default value (or auto increment); - a row was inserted into the table with the user variable as value. A warning was emitted here. The problem was that handling of NULL values of REAL type was not properly implemented: it didn't expect that REAL NULL value can be assigned to other data type. Basically, the problem was that set_field_to_null() was used instead of set_field_to_null_with_conversions(). The fix is to use the right function, or more generally, to allow conversion of REAL NULL values to other data types.	16 years ago
Alexander Barkov	25d31b8f7c	Bug#51571 load xml infile causes server crash Problem: item->name was NULL for Item_user_var_as_out_param which made strcmp(something, item->name) crash in the LOAD XML code. Fix: - item_func.h: Adding set_name() in constuctor for Item_user_var_as_out_param - sql_load.cc: Changing the condition in write_execute_load_query_log_event() which distiguished between Item_user_var_as_out_param and Item_field from if (item->name == NULL) to if (item->type() == Item::FIELD_ITEM) - loadxml.result, loadxml.test: adding tests	16 years ago
Alexander Barkov	6bf10a8623	Bug#52849 [Com]: datetime index not work Problem: after introduction of "WL#2649 Number-to-string conversions" This query: SET NAMES cp850; -- Or any other non-latin1 ASCII-based character set SELECT * FROM t1 WHERE datetime_column='2010-01-01 00:00:00' started to add extra character set conversion: SELECT * FROM t1 WHERE CONVERT(datetime_column USING cp850)='2010-01-01 00:00:00'; so index on DATETIME column was not used anymore. Fix: avoid convertion of NUMERIC/DATETIME items (i.e. those with derivation DERIVATION_NUMERIC).	16 years ago
Horst.Hunger	8975d4766f	Patch for 47759 to trunk-bugfixing.	16 years ago
Omer BarNir	3cf56bb21b	Changes to result files in the engine suite - missed from previous commit	16 years ago
Omer BarNir	1c731cb0c6	Updates to test and result files in the 'engine' suites following changes in 5.5	16 years ago
Alexander Nozdrin	a0e2f8866c	Include mysql/innodb_priv.h into 'make dist'.	16 years ago
Alexander Nozdrin	a7cc09e01a	Mark 3 test cases experimental on FreeBSD due to Bug 43020, Bug 38965.	16 years ago
Alexander Nozdrin	c784ee2782	Patch for Bug#52356: query_cache_debug fails on Linux. There were two problems here: 1. misleading error message 2. abusing KILL QUERY in the test case 1. The server reported "'DELETE FROM t1' failed: 1689: Wait on a lock was aborted due to a pending exclusive lock", while the proper error message should be "'DELETE FROM t1' failed: 1317: Query execution was interrupted". The problem is that the server has two different flags for signalling that a query is being killed: THD::killed and mysys_var::abort. The test case triggers a race: sometimes mysys_var::abort is set earlier than THD::killed. That leads to the following situation: - thr_lock() checks mysys_var::abort and returns error status, since mysys_var::abort is set; - the caller (mysql_lock_tables()) gets an error from thr_lock(), but THD::killed is not set, so it decides that thr_lock() couldn't get a lock due to a pending exclusive lock. This is a known issue with the server and it's not going to be fixed soon. 5.5 differs from 5.1 here as follows: when thr_lock() returns an error: - 5.1 continues trying thr_lock() until success; - 5.5 propagates the error 2. The test case uses KILL QUERY is a highly concurent environment. The fix is to wait for the dying statement to rest in peace before executing another DELETE FROM t1.	16 years ago
Alfranio Correia	ae2eafc098	Post-merge fix for BUG#51894, BUG#53075 thread_temporary_used is not initialized causing valgrind's warnings.	16 years ago
Sven Sandberg	a651824329	BUG#50670: Slave stops with error code 1644 Clarified error messages related to unsafe statements: - avoid the internal technical term "row injection" - use 'binary log' instead of 'binlog' - avoid the word 'unsafeness'	16 years ago
	fa28ba8ba6	Bug #51839 mixup of DDL causes slave to stop Stored routine DDL statements use statement-based replication regardless of the current binlog format. The problem here was that if a DDL statement failed during metadata lock acquisition or opening of mysql.proc, the binlog format would not be reset before returning. So the following DDL or DML statements are binlogged with a wrong binlog format, which causes the slave to stop. The problem can be resolved by grabbing an exclusive MDL lock firstly instead of clearing the current binlog format. So that the binlog format will not be affected when the lock grab returns directly with an error. The same way is taken to open a proc table for update.	16 years ago
Luis Soares	a1b3955f32	BUG#53101: binlog.binlog_tmp_table fails on sol10 sparc64 max in parallel mode The failure has nothing to do with parallel, but rather on the order the tests are executed. In this case, the test binlog_tmp_table (lets call it test2) was not ensuring that the binary logs would be reset when it started. Later the test issues a mysqlbinlog .../master-bin.000002 \| mysql ... If the test that was executed before this one (lets call it test1) had issued a flush logs, then the file in use in test1 (master-bin.000002) would not actually match the one that was expected. Eventually, this would cause the statements logged in test1 to be replayed, instead of the ones logged in the beginning of test2. We fix this by: 1. adding RESET MASTER to the beginning of binlog_tmp_table 2. setting dynamically the file to use in binlog_tmp_table Only #1 was needed, but the two make the tests cases more robust.	16 years ago
Alexander Nozdrin	30fcc5f698	Auto-merge from remote repository.	16 years ago
Alexander Nozdrin	1ffdb5d691	Empty merge from mysql-trunk.	16 years ago
Alexander Nozdrin	0c8c4a7133	Auto-merge from mysql-trunk-bugfixing.	16 years ago
Vladislav Vaintroub	147d1c854e	Bug#48042 The description for Event ID ( 100 ) in Source ( MySQL ) cannot be found. The problem is that message resource (message.rc) is compiled as part of static library sql.lib rather than with executable mysqld.exe. resource files do not work in static libraries. The fix is to add message.rc to mysqld.exe source files list.	16 years ago
Horst.Hunger	4f4ed5d9e1	only This is a backport of the patch for 47739 into trunk.	16 years ago
Horst.Hunger	63e7004bcc	backport of patch for blckhole plugin (47748) to trunk-bugfixing.	16 years ago
Horst.Hunger	fca2aa6a4d	backport of cset for 47146 to trunk.	16 years ago
Alexander Nozdrin	b6131a36a2	Making few tests experimental as they fail on Open Solaris constantly.	16 years ago
Alfranio Correia	a6d6ac3dbe	BUG#53075 SBR: Strange warning around CONNECTION_ID Statements with CONNECTION_ID were forced to be kept in the transactional cache and by consequence non-transactional changes that were supposed to be flushed ahead of the transaction were kept in the transactional cache. This happened because after BUG#51894 any statement whose thd's thread_specific_used was set was kept in the transactional cache. The idea was to keep changes on temporary tables in the transactional cache. However, the thread_specific_used was set not only for statements that accessed temporary tables but also when the CONNECTION_ID was used. To fix the problem, we created a new variable to keep track of updates to temporary tables.	16 years ago
Alexander Nozdrin	53af29c086	Patch for Bug#53022: Compilation of "embedded" is broken. The bug was a side effect of WL#5030 (fix header files) and WL#5161 (CMake). The problem was that CMake-generated config.h (and my_config.h as a copy of it) had a header guard. GNU autotools-generated [my_]config.h did not. During WL#5030 the order of header files was changed, so the following started to happen (using GNU autotools, in embedded server): - my_config.h included, defining HAVE_OPENSSL - my_global.h included, un-defining HAVE_OPENSSL - zlib.h included, including config.h, defining HAVE_OPENSSL again. The fix is to check HAVE_OPENSSL in conjuction with EMBEDDED_LIBRARY. More common fix would be to define a macros as HAVE_OPENSSL && !EMBEDDED_LIBRARY and use it instead of HAVE_OPENSSL.	16 years ago
Alexander Nozdrin	dbe6981b30	Ignoring auto-generated libmysqld/des_key_file.cc.	16 years ago
Alexander Nozdrin	fd64b18545	Patch for Bug#53022: Compilation of "embedded" is broken. The bug was a side effect of WL#5030 (fix header files) and WL#5161 (CMake). The problem was that CMake-generated config.h (and my_config.h as a copy of it) had a header guard. GNU autotools-generated [my_]config.h did not. During WL#5030 the order of header files was changed, so the following started to happen (using GNU autotools, in embedded server): - my_config.h included, defining HAVE_OPENSSL - my_global.h included, un-defining HAVE_OPENSSL - zlib.h included, including config.h, defining HAVE_OPENSSL again. The fix is to change the order of header file, moving zlib.h to the top of the header list. More proper fix would be to wrap unguarded auto-generated [my_]config.h by guarded non-generated header file.	16 years ago
Alfranio Correia	2e99b0bef3	BUG#51894 Replication failure with SBR on DROP TEMPORARY TABLE inside a transaction BUG#52616 Temp table prevents switch binlog format from STATEMENT to ROW Post-merge fixes.	16 years ago
Jon Olav Hauglid	9cd21e8c93	merge from mysql-trunk-runtime	16 years ago
Jon Olav Hauglid	da1fbb375e	merge from mysql-trunk-bugfixing	16 years ago
Mats Kindahl	26d34c0324	Merging with mysql-trunk-bugfixing	16 years ago
Mats Kindahl	f96694f9c7	WL#5030: Splitting mysql_priv.h Removing traces of mysql_priv.h from comments and other non-source files that were missed before.	16 years ago
Alfranio Correia	9ba731c299	BUG#51894 Replication failure with SBR on DROP TEMPORARY TABLE inside a transaction BUG#52616 Temp table prevents switch binlog format from STATEMENT to ROW Before the WL#2687 and BUG#46364, every non-transactional change that happened after a transactional change was written to trx-cache and flushed upon committing the transaction. WL#2687 and BUG#46364 changed this behavior and non-transactional changes are now written to the binary log upon committing the statement. A binary log event is identified as transactional or non-transactional through a flag in the Log_event which is set taking into account the underlie storage engine on what it is stems from. In the current bug, this flag was not being set properly when the DROP TEMPORARY TABLE was executed. However, while fixing this bug we figured out that changes to temporary tables should be always written to the trx-cache if there is an on-going transaction. Otherwise, binlog events in the reversed order would be produced. Regarding concurrency, keeping changes to temporary tables in the trx-cache is also safe as temporary tables are only visible to the owner connection. In this patch, we classify the following statements as unsafe: 1 - INSERT INTO t_myisam SELECT * FROM t_myisam_temp 2 - INSERT INTO t_myisam_temp SELECT * FROM t_myisam 3 - CREATE TEMPORARY TABLE t_myisam_temp SELECT * FROM t_myisam On the other hand, the following statements are classified as safe: 1 - INSERT INTO t_innodb SELECT * FROM t_myisam_temp 2 - INSERT INTO t_myisam_temp SELECT * FROM t_innodb The patch also guarantees that transactions that have a DROP TEMPORARY are always written to the binary log regardless of the mode and the outcome: commit or rollback. In particular, the DROP TEMPORARY is extended with the IF EXISTS clause when the current statement logging format is set to row. Finally, the patch allows to switch from STATEMENT to MIXED/ROW when there are temporary tables but the contrary is not possible.	16 years ago
Jon Olav Hauglid	f2587df7ba	merge from mysql-trunk-bugfixing	16 years ago
Alfranio Correia	4ca8066fa9	auto-merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixing	16 years ago
Jon Olav Hauglid	b12af816d5	Additional test coverage for Bug#30977 Concurrent statement using stored function and DROP FUNCTION breaks SBR Bug#48246 assert in close_thread_table	16 years ago
Vladislav Vaintroub	6d1ee1ada6	Remove confusing comment	16 years ago
Alfranio Correia	de3e233b8a	auto-merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixing	16 years ago
Alexey Kopytov	3f0f8048d9	Automerge.	16 years ago
Joerg Bruehe	8dcbf6e20c	Merge the changes of the 5.5.3-m3 release build back into the development branches.	16 years ago
Daniel Fischer	29f098f2d3	Make the libraries we produce on Windows actually usable	16 years ago
Luis Soares	24b9ff294c	automerge: merged bundle from bug report into latest mysql-trunk-bugfixing (bug 52341).	16 years ago
Luis Soares	697da8cf16	Automerge: merged bug bundle from bug report into latest mysql-trunk-bugfixing.	16 years ago

1 2 3 4 5 ...

61693 Commits (7752ccec48efdc6ce834065681868dc7e95f6bbd) All Branches Search

61693 Commits (7752ccec48efdc6ce834065681868dc7e95f6bbd)

All Branches