mariadb

Tree: f4b49e55cd

Author	SHA1	Message	Date
Davi Arnaut	8c7c09cc63	Bug#45611: Minor code cleanup Remove a self assignment. Rework a few constructs to avoid a potential overflow. Based upon patch contributed by Michal Hrusecky storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Remove self assignment, the object is being initialized. storage/ndb/src/mgmsrv/InitConfigFileParser.cpp: Setup the string in a single snprintf.	16 years ago
Bjorn Munch	3a78dbe482	46996 workaruond	16 years ago
Mattias Jonsson	82a5cfa5ab	Post fix patch for bug#20577 and bug#46362. On 64-bits machines the calculation gets the wrong types and results in very large numbers. Fixed by explicitly cast month to (int)	16 years ago
Jonathan Perkin	71f4bfd6c7	Only install the innodb plugin if the plugin directory exists.	16 years ago
Tatiana A. Nurnberg	ff50b26457	auto-merge	16 years ago
Tatiana A. Nurnberg	6bc9610022	auto-merge	16 years ago
Tatiana A. Nurnberg	cf69196922	manual merge	16 years ago
Tatiana A. Nurnberg	d85148d84c	Bug#35132: MySQLadmin --wait ping always crashes on Windows systems Failing to connect would release parts of the MYSQL struct. We would then proceed to try again to connect without re- initializing the struct. We prevent the unwanted freeing of data we'll still need now. client/mysqladmin.cc: Losing a connection (or not even getting on in the first place) should not trash the MYSQL-struct. Add a lot of comments. Rewrite re-connection fu. sql-common/client.c: Assert against bad parameters usually caused by de-initing a MYSQL-struct without re-initing it again before re-use.	16 years ago
Georgi Kodinov	75b3cf1e83	automerge	16 years ago
Georgi Kodinov	c6fd09d097	automerge 5.1-main -> 5.1-bugteam	16 years ago
Georgi Kodinov	e1ed161285	merge 5.0-main -> 5.0-bugteam	16 years ago
Georgi Kodinov	38cb188e24	automerge	16 years ago
Bjorn Munch	822f810375	merge	16 years ago
Anurag Shekhar	e3f7f7a5c9	merging bugfix from 5.0	16 years ago
Anurag Shekhar	df51d1cea0	merging with changes in bugteam branch.	16 years ago
Bjorn Munch	5166a56d04	forgot : in rpl's disabled.def	16 years ago
unknown	a00ba9ebea	Bug #44331 Restore of database with events produces warning in replication Update the test case for BUG#44331 to fix the push build failure.	16 years ago
Staale Smedseng	4d7202a02b	Merge from 5.1-bugteam	16 years ago
Bjorn Munch	02f67d5b1f	yet another 42408 followup	16 years ago
Alexey Kopytov	54e4516063	Automerge.	16 years ago
Alexey Kopytov	6ce48392ea	Bug #46607 : Assertion failed: (cond_type == Item::FUNC_ITEM) results in server crash check_group_min_max_predicates() assumed the input condition item to be one of COND_ITEM, SUBSELECT_ITEM, or FUNC_ITEM. Since a condition of the form "field" is also a valid condition equivalent to "field <> 0", using such a condition in a query where the loose index scan was chosen resulted in a debug assertion failure. Fixed by handling conditions of the FIELD_ITEM type in check_group_min_max_predicates(). mysql-test/r/group_min_max.result: Added a test case for bug #46607. mysql-test/t/group_min_max.test: Added a test case for bug #46607. sql/opt_range.cc: Handle conditions of the FUNC_ITEM type in check_group_mix_max_predicates().	16 years ago
Bjorn Munch	aa7e21c68f	even more suppression fixes	16 years ago
Joerg Bruehe	905d715f10	Merge 5.1 up into 5.4-build ("trunk").	16 years ago
unknown	f32c08bd0c	Bug #44331 Restore of database with events produces warning in replication If an EVENT is created without the DEFINER clause set explicitly or with it set to CURRENT_USER, the master and slaves become inconsistent. This issue stems from the fact that in both cases, the DEFINER is set to the CURRENT_USER of the current thread. On the master, the CURRENT_USER is the mysqld's user, while on the slave, the CURRENT_USER is empty for the SQL Thread which is responsible for executing the statement. To fix the problem, we do what follows. If the definer is not set explicitly, a DEFINER clause is added when writing the query into binlog; if 'CURRENT_USER' is used as the DEFINER, it is replaced with the value of the current user before writing to binlog. mysql-test/suite/rpl/r/rpl_create_if_not_exists.result: Updated the result file after fixing bug#44331 mysql-test/suite/rpl/r/rpl_drop_if_exists.result: Updated the result file after fixing bug#44331 mysql-test/suite/rpl/r/rpl_events.result: Test result of Bug#44331 mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result: Updated the result file after fixing bug#44331 mysql-test/suite/rpl/t/rpl_events.test: Added test to verify if the definer is consistent between master and slave when the event is created without the DEFINER clause set explicitly or the DEFINER is set to CURRENT_USER sql/events.cc: The "create_query_string" function is added to create a new query string for removing executable comments. sql/sql_yacc.yy: The remember_name token was added for recording the offset of EVENT_SYM.	16 years ago
Bjorn Munch	abe47a0ebe	A few more suppression fixes after 42408	16 years ago
Davi Arnaut	dc7106f5ca	Reduce test case runtime. mysql-test/r/lock_multi_bug38499.result: Update test case result. mysql-test/r/lock_multi_bug38691.result: Update test case result. mysql-test/t/lock_multi_bug38499.test: Do not sync .frm files. mysql-test/t/lock_multi_bug38691.test: Do not sync .frm files.	16 years ago
Staale Smedseng	5be4c38226	Merge from 5.0 for 43414	16 years ago
Staale Smedseng	1ba25ae47c	Bug #43414 Parenthesis (and other) warnings compiling MySQL with gcc 4.3.2 This patch fixes a number of GCC warnings about variables used before initialized. A new macro UNINIT_VAR() is introduced for use in the variable declaration, and LINT_INIT() usage will be gradually deprecated. (A workaround is used for g++, pending a patch for a g++ bug.) GCC warnings for unused results (attribute warn_unused_result) for a number of system calls (present at least in later Ubuntus, where the usual void cast trick doesn't work) are also fixed. client/mysqlmanager-pwgen.c: A fix for warn_unused_result, adding fallback to use of srand()/rand() if /dev/random cannot be used. Also actually adds calls to rand() in the second branch so that it actually creates a random password.	16 years ago
Davi Arnaut	169f7da04c	Fix for a few assorted compiler warnings. client/mysql.cc: Remove leading whitespace. Remove extra text after #else directive. client/mysqldump.c: Function does not take a parameter. mysys/array.c: buffer is a uchar pointer. sql/item.cc: Assert if it should not happen. storage/myisam/mi_check.c: Cast to expected type. This is probably a bug, but it is casted in a similar way in another part of the code. storage/ndb/include/mgmapi/ndb_logevent.h: Apply fix from cluster team. tests/mysql_client_test.c: Remove extraneous slash.	16 years ago
Bjorn Munch	fa4f05139d	Bug #42408 Faulty regex for detecting [Warning] and [ERROR] in mysqld error log Some follow-up test fixes after seeing effect in PB2	16 years ago
Bjorn Munch	de5ab42de6	Bug #46973 MTR: extract_warning_lines does not check it's extracting lines for current test Rewrote logic (first commit was incomplete, sorry)	16 years ago
Mattias Jonsson	99413e461f	merge	16 years ago
Mattias Jonsson	0a76397171	Manual merge between bug#46362 and bug#20577. sql/opt_range.cc: Removed duplicate code (if statement must have been duplicated during earlier merge). sql/sql_partition.cc: After mergeing bug#46362 and bug#20577, the NULL partition was also searched when col = const, fixed by checking if = or range.	16 years ago
Alfranio Correia	f9e413a1a5	merge mysql-5.0-bugteam --> mysql-5.1-bugteam	16 years ago
Alfranio Correia	5edd807a7a	auto-merge mysql-5.0-bugteam (local) --> mysql-5.0-bugteam	16 years ago
Alfranio Correia	ea06bbd2b0	BUG#46861 Auto-closing of temporary tables broken by replicate-rewrite-db When a connection is dropped any remaining temporary table is also automatically dropped and the SQL statement of this operation is written to the binary log in order to drop such tables on the slave and keep the slave in sync. Specifically, the current code base creates the following type of statement: DROP /!40005 TEMPORARY / TABLE IF EXISTS `db`.`table`; Unfortunately, appending the database to the table name in this manner circumvents the replicate-rewrite-db option (and any options that check the current database). To solve the issue, we started writing the statement to the binary as follows: use `db`; DROP /!40005 TEMPORARY / TABLE IF EXISTS `table`;	16 years ago
Bjorn Munch	9a8ef8f7a4	Bug #46322 Sporadic timeout in mysql_upgrade.test Apparently caused by logging to table Turn on logging to file only, add to .opt file for tests needing log to table	16 years ago
Alexander Nozdrin	4bf2c41df4	Merge from mysql-trunk.	16 years ago
Alfranio Correia	354f5f7bac	BUG#46864 Incorrect update of InnoDB table on slave when using trigger with myisam table Slave does not correctly handle "expected errors" leading to inconsistencies between the mater and slave. Specifically, when a statement changes both transactional and non-transactional tables, the transactional changes are automatically rolled back on the master but the slave ignores the error and does not roll them back thus leading to inconsistencies. To fix the problem, we automatically roll back a statement that fails on the slave but note that the transaction is not rolled back unless a "rollback" command is in the relay log file. mysql-test/extra/rpl_tests/rpl_mixing_engines.test: Enabled item 13.e which was disabled because of the bug fixed by the current and removed item 14 which was introduced by mistake.	16 years ago
Georgi Kodinov	a22c29d5e4	Bug #46749 : Segfault in add_key_fields() with outer subquery level field references This error requires a combination of factors : 1. An "impossible where" in the outermost SELECT 2. An aggregate in the outermost SELECT 3. A correlated subquery with a WHERE clause that includes an outer field reference as a top level WHERE sargable predicate When JOIN::optimize detects an "impossible WHERE" it will bail out without doing the rest of the work and initializations. It will not call make_join_statistics() as well. And make_join_statistics fills in various structures for each table referenced. When processing the result of the "impossible WHERE" the query must send a single row of data if there are aggregate functions in it. In this case the server marks all the aggregates as having received no rows and calls the relevant Item::val_xxx() method on the SELECT list. However if this SELECT list happens to contain a correlated subquery this subquery is evaluated in a normal evaluation mode. And if this correlated subquery has a reference to a field from the outermost "impossible where" SELECT the add_key_fields will mistakenly consider the outer field reference as a "local" field reference when looking for sargable predicates. But since the SELECT where the outer field reference refers to is not completely initialized due to the "impossible WHERE" in this level we'll get a NULL pointer reference. Fixed by making a better condition for discovering if a field is "local" to the SELECT level being processed. It's not enough to look for OUTER_REF_TABLE_BIT in this case since for outer references to constant tables the Item_field::used_tables() will return 0 regardless of whether the field reference is from the local SELECT or not.	16 years ago
Sergey Glukhov	51f4ccfa43	5.0-bugteam->5.1-bugteam merge	16 years ago
Bjorn Munch	d059ac1410	Bug #46164 memory leak in mysqltest after parse error with --debug Moved some dynstr_free() further up	16 years ago
Alexander Nozdrin	f76fb67e7c	Merge from mysql-trunk-build.	16 years ago
Sergey Glukhov	367c14b854	Bug#46184 Crash, SELECT ... FROM derived table procedure analyze The crash happens because select_union object is used as result set for queries which have derived tables. select_union use temporary table as data storage and if fields count exceeds 10(count of values for procedure ANALYSE()) then we get a crash on fill_record() function. mysql-test/r/analyse.result: test result mysql-test/r/subselect.result: result fix mysql-test/t/analyse.test: test case mysql-test/t/subselect.test: test fix sql/sql_yacc.yy: The crash happens because select_union object is used as result set for queries which have derived tables. select_union use temporary table as data storage and if fields count exceeds 10(count of values for procedure ANALYSE()) then we get a crash on fill_record() function.	16 years ago
Alfranio Correia	1759f9ecb4	Post-fix for BUG#28976. Updated main.mysqlbinlog_row_trans's result file as TRUNCATE statements are wrapped in BEGIN...COMMIT.	16 years ago
Joerg Bruehe	ee696e4163	Automerge "trunk" (5.4.2 cloning + version number increase to 5.4.3) into "trunk-build".	16 years ago
Georgi Kodinov	f10e85f5f2	merged 5.0-bugteam -> 5.1-bugteam	16 years ago
Alfranio Correia	6c2b32515e	BUG#28976 Mixing trans and non-trans tables in one transaction results in incorrect binlog Mixing transactional (T) and non-transactional (N) tables on behalf of a transaction may lead to inconsistencies among masters and slaves in STATEMENT mode. The problem stems from the fact that although modifications done to non-transactional tables on behalf of a transaction become immediately visible to other connections they do not immediately get to the binary log and therefore consistency is broken. Although there may be issues in mixing T and M tables in STATEMENT mode, there are safe combinations that clients find useful. In this bug, we fix the following issue. Mixing N and T tables in multi-level (e.g. a statement that fires a trigger) or multi-table table statements (e.g. update t1, t2...) were not handled correctly. In such cases, it was not possible to distinguish when a T table was updated if the sequence of changes was N and T. In a nutshell, just the flag "modified_non_trans_table" was not enough to reflect that both a N and T tables were changed. To circumvent this issue, we check if an engine is registered in the handler's list and changed something which means that a T table was modified. Check WL 2687 for a full-fledged patch that will make the use of either the MIXED or ROW modes completely safe. mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result: Truncate statement is wrapped in BEGIN/COMMIT. mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: Truncate statement is wrapped in BEGIN/COMMIT.	16 years ago
Alexander Nozdrin	0108660d12	Fix default.conf	16 years ago
Alexander Nozdrin	09d01ba615	Merge from mysql-5.1-bugteam	16 years ago

... 2 3 4 5 6 ...

58456 Commits (f4b49e55cd430187b0b4ee627f29eb518e1bb958) All Branches Search

58456 Commits (f4b49e55cd430187b0b4ee627f29eb518e1bb958)

All Branches