mariadb

Tree: 09387431c1

Author	SHA1	Message	Date
Matthias Leich	09387431c1	Fix for Bug#42602 main.status: random failures + minor improvements	17 years ago
Gleb Shchepa	a7435ddf49	after-push test update (bug #39265 )	17 years ago
Alexey Kopytov	4cd0e2fac4	Merge mysql-5.0-bugteam -> mysql-5.1-bugteam.	17 years ago
Alexey Kopytov	759b626d11	Merge to team tree.	17 years ago
Alexey Kopytov	20cdcaa3d5	Merge from team tree.	17 years ago
Gleb Shchepa	b9d02d4669	Bug #39265 : fix for the bug 33699 should be reverted Documented behaviour was broken by the patch for bug 33699 that actually is not a bug. This fix reverts patch for bug 33699 and reverts the UPDATE of NOT NULL field with NULL query to old behavior. mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test: Bug #39265: fix for the bug 33699 should be reverted mysql-test/include/ps_modify.inc: Bug #39265: fix for the bug 33699 should be reverted mysql-test/r/auto_increment.result: Bug #39265: fix for the bug 33699 should be reverted mysql-test/r/csv_not_null.result: Bug #39265: fix for the bug 33699 should be reverted mysql-test/r/null.result: Bug #39265: fix for the bug 33699 should be reverted mysql-test/r/ps_2myisam.result: Bug #39265: fix for the bug 33699 should be reverted mysql-test/r/ps_3innodb.result: Bug #39265: fix for the bug 33699 should be reverted mysql-test/r/ps_4heap.result: Bug #39265: fix for the bug 33699 should be reverted mysql-test/r/ps_5merge.result: Bug #39265: fix for the bug 33699 should be reverted mysql-test/r/warnings.result: Bug #39265: fix for the bug 33699 should be reverted mysql-test/suite/ndb/r/ps_7ndb.result: Bug #39265: fix for the bug 33699 should be reverted mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result: Bug #39265: fix for the bug 33699 should be reverted mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result: Bug #39265: fix for the bug 33699 should be reverted mysql-test/suite/rpl/t/rpl_err_ignoredtable.test: Bug #39265: fix for the bug 33699 should be reverted mysql-test/t/auto_increment.test: Bug #39265: fix for the bug 33699 should be reverted mysql-test/t/csv_not_null.test: Bug #39265: fix for the bug 33699 should be reverted mysql-test/t/null.test: Bug #39265: fix for the bug 33699 should be reverted mysql-test/t/warnings.test: Bug #39265: fix for the bug 33699 should be reverted sql/sql_update.cc: Bug #39265: fix for the bug 33699 should be reverted	17 years ago
Gleb Shchepa	ea15ebbbd4	automerge 5.0-bugteam --> 5.1-bugteam (bug 42037)	17 years ago
Gleb Shchepa	061bf717e0	Bug #42037 : Queries containing a subquery with DISTINCT and ORDER BY could cause a server crash Dependent subqueries like SELECT COUNT() FROM t1, t2 WHERE t2.b IN (SELECT DISTINCT t2.b FROM t2 WHERE t2.b = t1.a) caused a memory leak proportional to the number of outer rows. The make_simple_join() function has been modified to JOIN class method to store join_tab_reexec and table_reexec values in the parent join only (make_simple_join of tmp_join may access these values via 'this' pointer of the parent JOIN). NOTE: this patch doesn't include standard test case (this is "out of memory" bug). See bug #42037 page for test cases. sql/sql_select.cc: Bug #42037: Queries containing a subquery with DISTINCT and ORDER BY could cause a server crash The make_simple_join() function has been modified to JOIN class method to store join_tab_reexec and table_reexec values in the parent join only. sql/sql_select.h: Bug #42037: Queries containing a subquery with DISTINCT and ORDER BY could cause a server crash 1. The make_simple_join() function has been modified to JOIN class method. 2. Type of JOIN::table_reexec field has been changed from TABLE* to TABLE *table_reexec[1]: this field always was NULL or a pointer to one-element array of pointers, so a pointer to a pointer has been replaced with one pointer and unnecessary memory allocation has been eliminated.	17 years ago
Ramil Kalimullin	31d908d70b	Fix for bug#42014: Crash, name_const with collate Problem: some queries using NAME_CONST(.. COLLATE ...) lead to server crash due to failed type cast. Fix: return the underlying item's type in case of NAME_CONST(.. COLLATE ...) to avoid wrong casting. mysql-test/r/func_misc.result: Fix for bug#42014: Crash, name_const with coll - test result. mysql-test/t/func_misc.test: Fix for bug#42014: Crash, name_const with coll - test case. sql/item.cc: Fix for bug#42014: Crash, name_const with coll - in case of NAME_CONST('name', 'value' COLLATE collation) Item_name_const::type() returns type of 'value' argument to awoid wrong type casting of the Item_name_const items.	17 years ago
Alexey Botchkov	aa964b7913	merging	17 years ago
Ramil Kalimullin	9ee53cbcc0	Auto-merge	17 years ago
Alexey Botchkov	9036f1aa97	Bug#37995 Error message truncation in test "innodb" in embedded mode. code backported from 6.0 per-file messages: include/my_global.h Remove SC_MAXWIDTH. This is unused and irrelevant nowadays. include/my_sys.h Remove errbuf declaration and unused definitions. mysys/my_error.c Remove errbuf definition and move and adjust ERRMSGSIZE. mysys/my_init.c Declare buffer on the stack and use my_snprintf. mysys/safemalloc.c Use size explicitly. It's more than enough for the message at hand. sql/sql_error.cc Use size explicitly. It's more than enough for the message at hand. sql/sql_parse.cc Declare buffer on the stack. Use my_snprintf as it will result in less stack space being used than by a system provided sprintf -- this allows us to put the buffer on the stack without causing much trouble. Also, the use of errbuff here was not thread-safe as the function can be entered concurrently from multiple threads. sql/sql_table.cc Use MYSQL_ERRMSG_SIZE. Extra space is not needed as my_snprintf will nul terminate strings. storage/myisam/ha_myisam.cc Use MYSQL_ERRMSG_SIZE. sql/share/errmsg.txt Error message truncation in test "innodb" in embedded mode filename in the error message can safely take up to 210 symbols.	17 years ago
Chad MILLER	dc0f210a79	Merge from team tree.	17 years ago
Chad MILLER	078e413e88	Merge from 5.0-bugteam.	17 years ago
Alfranio Correia	0f57761141	auto-merge for BUG#42445.	17 years ago
Chad MILLER	243b2639cc	Merge from bug tree.	17 years ago
Matthias Leich	4c67bc0c76	Merge 5.0 -> 5.1, null merge necause everything is already in place	17 years ago
Matthias Leich	6f19c0fc46	Merge last changesets into tree, no conflicts	17 years ago
Sergey Vojtovich	aa13a4b95e	Merge 5.0-bugteam -> 5.1-bugteam.	17 years ago
Matthias Leich	7957622bfd	Automatic merge, no conflicts	17 years ago
Magnus Svensson	1177405381	Merge	17 years ago
Matthias Leich	2df0beee02	Merge last changesets, no conflicts	17 years ago
Staale Smedseng	dc3dcf4ffa	merge from upstream 5.1-bugteam	17 years ago
Sergey Vojtovich	97bd763544	BUG#32047 - 'Spurious' errors while opening MERGE tables Accessing well defined MERGE table may return an error stating that the merge table is incorrectly defined. This happens if MERGE child tables were accessed before and we failed to open another incorrectly defined MERGE table in this connection. myrg_open() internally used my_errno as a variable for determining failure, and thus could be tricked into a wrong decision by other uses of my_errno. With this fix we use function local boolean flag instead of my_errno to determine failure. myisammrg/myrg_open.c: There are two requirement for accessing/setting my_errno variable, which were not followed by myrg_open(): - it must be checked immediately after a function returned an error. There must be no calls to other functions that may change it's value between. - my_errno value must be set right before a function is going to return an error. There must be no calls to other functions that may change it's value between (that's why we have these tricks with save_errno at the bottom of myrg_open()). myrg_open() internally used my_errno as a variable for determining failure, and thus could be tricked into a wrong decision by other uses of my_errno. mysql-test/r/merge.result: A test case for BUG#32047. mysql-test/t/merge.test: A test case for BUG#32047.	17 years ago
Sergey Glukhov	1d09ec6208	Bug#42495 updatexml: Assertion failed: xpath->context, file .\item_xmlfunc.cc, line 2507 Problem: RelativeLocationPath can appear only after a node-set expression in the third and the fourth branches of this rule: PathExpr :: = LocationPath \| FilterExpr \| FilterExpr '/' RelativeLocationPath \| FilterExpr '//' RelativeLocationPath XPatch code didn't check the type of FilterExpr and crashed. Fix: If FilterExpr is a scalar expression (variable reference, literal, number, scalar function call) return error. mysql-test/r/xml.result: test result mysql-test/t/xml.test: test case sql/item_xmlfunc.cc: Problem: RelativeLocationPath can appear only after a node-set expression in the third and the fourth branches of this rule: PathExpr :: = LocationPath \| FilterExpr \| FilterExpr '/' RelativeLocationPath \| FilterExpr '//' RelativeLocationPath XPatch code didn't check the type of FilterExpr and crashed. Fix: If FilterExpr is a scalar expression (variable reference, literal, number, scalar function call) return error.	17 years ago
Davi Arnaut	ffdb6ac4bd	Merge from upstream 5.1-bugteam	17 years ago
Andrei Elkin	5aef51b5d3	Bug #41183 rpl_ndb_circular, rpl_ndb_circular_simplex need maintenance, crash fixing build issue, caused by the previous push. sql/log_event.cc: moving a new declaration out of mysqlbinlog compilation scope.	17 years ago
Matthias Leich	da304a175e	Merge of latest changesets into GCA tree	17 years ago
Andrei Elkin	9b11bc02ae	Bug #41183 rpl_ndb_circular, rpl_ndb_circular_simplex need maintenance, crash The bug happened because filtering-out a STMT_END_F-flagged event so that the transaction COMMIT finds traces of incomplete statement commit. Such situation is only possible with ndb circular replication. The filtered-out rows event is one that immediately preceeds the COMMIT query event. Fixed with deploying an the rows-log-event statement commit at executing of the transaction COMMIT event. Resources that were allocated by other than STMT_END_F-flagged event of the last statement are clean up prior execution of the commit logics. mysql-test/suite/rpl_ndb/t/disabled.def: re-enabling two tests. sql/log_event.cc: Adding the statement cleanup to execute at the transaction commit time. The statement might not be ended with execution of STMT_END_F-flagged event because of the event was filtered out by SERVER_ID rules. Small refactoring for Rows_log_event::do_update_pos() to be split on two parts: the statement commit that releases its execution time allocated resources, and the relay log update.	17 years ago
Magnus Svensson	4561831bf7	Bug#42588 system_mysql_db_fix30020 fails when run from bin dist with mtr2 - Properly set --bindir=$path_client_bindir and --basedir=$basedir by adding %s format specifier	17 years ago
Alexey Kopytov	dfbba6e7fd	Fix for bug #41868 : crash or memory overrun with concat + upper, date_format functions String::realloc() did not check whether the existing string data fits in the newly allocated buffer for cases when reallocating a String object with external buffer (i.e.alloced == FALSE). This could lead to memory overruns in some cases. mysql-test/r/func_str.result: Added a test case for bug #41868. mysql-test/t/func_str.test: Added a test case for bug #41868. sql/sql_class.cc: After each call to Item::send() in select_send::send_data() reset buffer to its original state to reduce unnecessary malloc() calls. See comments for bug #41868 for detailed analysis. sql/sql_string.cc: Fixed String::realloc() to check whether the existing string data fits in the newly allocated buffer for cases when reallocating a String object with external buffer.	17 years ago
Davi Arnaut	c9dc936a2b	Bug#40536: SELECT is blocked by INSERT DELAYED waiting on upgrading lock, even with low_priority_updates The problem is that there is no mechanism to control whether a delayed insert takes a high or low priority lock on a table. The solution is to modify the delayed insert thread ("handler") to take into account the global value of low_priority_updates when taking table locks. The value of low_priority_updates is retrieved when the insert delayed thread is created and will remain the same for the duration of the thread. include/thr_lock.h: Update prototype. mysql-test/r/delayed.result: Add test case result for Bug#40536 mysql-test/t/delayed.test: Add test case for Bug#40536 mysys/thr_lock.c: Add function parameter which specifies the write lock type. sql/sql_insert.cc: Take a low priority write lock if global value of low_priority_updates was ON when the thread was created.	17 years ago
Matthias Leich	99685a0b79	Merge 5.0 -> 5.1 + fix wrong resultfile have_outfile.require	17 years ago
Staale Smedseng	40eec6c544	Bug #41580 opt_threads option is not used anywhere at all Option opt_threads is deprecated in 5.1, and a warning is printed when used. Will remove in 6.0.	17 years ago
Alfranio Correia	c29994edb1	BUG#42445 Warning messages in innobase/handler/ha_innodb.cc There was a type casting problem in the storage/innobase/handler/ha_innodb.cc, (int ha_innobase::write_row(...)). Innobase uses has an internal error variable of type 'ulint' while mysql uses an 'int'. To fix the problem the function manipulates an error variable of type 'ulint' and only casts it into 'int' when needs to return the value.	17 years ago
Patrick Crews	a07a7afefa	merge 5.0 -> 5.1	17 years ago
Patrick Crews	9a3afd1a12	Bug#39369: execution of "variables.test" with "check-testcases" show differences. The original symptoms of this bug have been fixed as a consequence of other bug fixes. Taking this time to correct some formatting, such as replacing error numbers with names. Beginning this with 5.0	17 years ago
Serge Kozlov	84a237b914	Bug#38603: The patch adds restart of mysql server and replacing of binlog file when mysql server is stopped.	17 years ago
Matthias Leich	1a04fc03fe	1. Slice of fix for Bug#42003 tests missing the disconnect of connections <> default - If missing: add "disconnect <session>" - If physical disconnect of non "default" sessions is not finished at test end: add routine which waits till this happened + additional improvements like - remove superfluous files created by the test - replace error numbers by error names - remove trailing spaces, replace tabs by spaces - unify writing of bugs within comments - correct comments - minor changes of formatting Modifications according to the code review are included. Fixed tests: grant2 grant3 lock_tables_lost_commit mysqldump openssl_1 outfile	17 years ago
Andrei Elkin	d34ae8c724	Bug #41732 rpl_ndb_circular_2ch needs an updated configuration file There are two issues: 1. 6.0 uses the obsolate master-*** server options; 2. the test is not deterministic in that although master vs slave consistency is fine, two runs of the test can have different results. The reason of the non-determinism is the combination of a chosen way to demo results and the ndb_autoincrement_prefetch_sz feature. The current patch fixes the 2nd issue by putting out results via diff_table macro instead of the former run-sensitive method. The 1st issue is going to be fixed by a separate patch to 6.0. mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result: results changed mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test: Test is refined to put out results via diff_table macro instead of the former run-sensitive method.	17 years ago
Tatiana A. Nurnberg	9186df2422	auto-merge	17 years ago
Alexander Barkov	9a64fc52af	Bug#41084 full-text index added to custom UCA collation not working Problem: Custom UCA collations didn't set the MY_CS_STRNXFRM flag, which resulted in "prefix_search" method instead of the required "seq_search". Problem2: (not metioned in the bug report) Custom UCA collations didn't also set the MY_CS_UNICODE flag, so an attempt to compare a column with a custom UCA collation to another column with a non-Unicode character set led to the "illegal mix of collation" error. Fix: the two missing flags was added into collation initialization. Upgrade: - All fulltext indexes with custom UCA collations should be rebuilt. - Non-fulltext custom UCA indexes should likely be rebuild as well.	17 years ago
Tatiana A. Nurnberg	a73d9f3f05	auto-merge	17 years ago
Serge Kozlov	da44c30130	post-merge push with patch for rpl_ndb_log	17 years ago
Serge Kozlov	56fa095907	Post-merge patch for extra/rpl_test/rpl_log.test: Remove size of binlog file from SHOW BINARY LOGS. Changing size of binlog file is an affect of adding or removing events to/from binlog and it can be checked in next command of test: SHOW BINLOG EVENTS. For SHOW BINARY LOGS statement enough to show the list of file names.	17 years ago
Georgi Kodinov	8fe7b7effd	fixed system_mysql_db_fix30020 test faiilure fixed federated warnings	17 years ago
Sergey Glukhov	c08fe02122	automerge	17 years ago
Bjorn Munch	9128d3b7b0	merge	17 years ago
Sergey Glukhov	921a4e5eb5	fixed jp test failures mysql-test/suite/jp/r/jp_create_db_sjis.result: hide mtr database mysql-test/suite/jp/r/jp_create_db_ucs2.result: hide mtr database mysql-test/suite/jp/r/jp_create_db_ujis.result: hide mtr database mysql-test/suite/jp/r/jp_create_db_utf8.result: hide mtr database mysql-test/suite/jp/t/jp_create_db_sjis.test: hide mtr database mysql-test/suite/jp/t/jp_create_db_ucs2.test: hide mtr database mysql-test/suite/jp/t/jp_create_db_ujis.test: hide mtr database mysql-test/suite/jp/t/jp_create_db_utf8.test: hide mtr database	17 years ago
Bjorn Munch	d3f4c75e55	Bug #42535 MTR2 output format for skipped tests should be identical to MTR 1 Changed [ skip ] to [ skipped ] and removed optional .	17 years ago

1 2 3 4 5 ...

56307 Commits (09387431c180af5a719c923b81149792204b749d) All Branches Search

56307 Commits (09387431c180af5a719c923b81149792204b749d)

All Branches