Commit graph

54903 commits

Author SHA1 Message Date
Magnus Svensson
1d8583f5a2 Bug#38817 please make mtr analyze crashes better 2008-09-06 08:57:05 +02:00
Magnus Svensson
189ac2c7d4 Bug#35482 mysql-test-run have_innodb does not detect external server has Innodb support 2008-09-05 18:28:20 +02:00
Magnus Svensson
d266e9d553 Bug#32052 Small inconsistency with the big_test and ndb_extra test options 2008-09-05 17:37:55 +02:00
Magnus Svensson
b0750d6843 Bug #39071 mtr's check-testcase reports extra failures for correct test cases 2008-09-05 16:22:02 +02:00
Magnus Svensson
8a08ec32af Merge 2008-09-05 16:06:54 +02:00
Magnus Svensson
40db2c21e4 Bug #39213 Could not find reason for skipping test 2008-09-05 16:06:08 +02:00
Magnus Svensson
9dbcf1b26f WL#4350 Options in my.cnf style config file should not start with -- 2008-09-05 15:31:09 +02:00
Magnus Svensson
5834ef2c4a WL#4350
- fix scheduler bug
2008-09-05 15:09:29 +02:00
Magnus Svensson
e1524b2f1c Bug #38540 rpl_server_id2 uses show slave status unnecessarily 2008-09-05 15:08:55 +02:00
Magnus Svensson
d616caa6bc Bug#39008 perl warning in mtr: 'use of uninitialized value in concatenation' in mtr:3995 2008-09-05 14:40:07 +02:00
Magnus Svensson
8fb38c6b78 Make mysql-test-run.pl executable by user 2008-09-05 14:23:52 +02:00
Magnus Svensson
913ec830b3 WL#4350
- Rearrange spawn worker code
2008-09-05 14:09:39 +02:00
Magnus Svensson
7f954bd287 Fix misspelled variable in mtr.pl 2008-09-05 14:06:22 +02:00
Magnus Svensson
c3e7b68995 Fix gcov in mtr.pl 2008-09-05 11:32:33 +02:00
Magnus Svensson
6a4af260cc Bug#36616 rpl tests without 'source include/have_log_bin.inc' fail starting server 2008-08-29 14:46:22 +02:00
Magnus Svensson
a846ab811e Bug#33337, silently convert --gdb(etc.) to --client-gdb in embedded mode 2008-08-29 12:33:02 +02:00
Magnus Svensson
37e6f0c6ab Print error message in diff_files if any of the two files to diff does not exist 2008-08-29 12:25:19 +02:00
Mats Kindahl
020fdf33c8 Automerging 2008-08-27 12:00:16 +02:00
Andrei Elkin
3a1c50bc53 Bug #36968 rpl_temporary_errors.test produces warning in pushbuild
Backporting fixes to 5.1 from 6.0.
2008-08-25 15:40:44 +03:00
Mats Kindahl
ec6019f9b9 Eliminating some compiler warnings. 2008-08-25 14:23:49 +02:00
Mats Kindahl
77b7ad3398 Fixning compiler warnings. Fixing build failure for valgrind platform. 2008-08-22 12:40:21 +02:00
Mats Kindahl
25bb56accb Merging with 5.1-rpl. 2008-08-20 10:42:39 +02:00
Mats Kindahl
1bfa707a7a Bug #38773: DROP DATABASE cause switch to stmt-mode when there are temporary tables open
When executing a DROP DATABASE statement in ROW mode and having temporary
tables open at the same time, the existance of temporary tables prevent
the server from switching back to row mode after temporarily switching to
statement mode to handle the logging of the statement.

Fixed the problem by removing the code to switch to statement mode and added
code to temporarily disable the binary log while dropping the objects in the
database.
2008-08-20 10:06:50 +02:00
Mats Kindahl
e28826766f Merging with 5.1-rpl 2008-08-19 15:42:10 +02:00
Mats Kindahl
f0bf4a47ca Bug #34707: Row based replication: slave creates table within wrong database
The failure was caused by executing a CREATE-SELECT statement that creates a
table in another database than the current one. In row-based logging, the
CREATE statement was written to the binary log without the database, hence
creating the table in the wrong database, causing the following inserts to
fail since the table didn't exist in the given database.

Fixed the bug by adding a parameter to store_create_info() that will make
the function print the database name before the table name and used that
in the calls that write the CREATE statement to the binary log. The database
name is only printed if it is different than the currently selected database.

The output of SHOW CREATE TABLE has not changed and is still printed without
the database name.
2008-08-19 13:18:59 +02:00
He Zhenxing
f94e914d47 post fixes after merge 2008-08-15 10:31:04 +08:00
He Zhenxing
ea30bcda06 auto merge 2008-08-14 17:59:12 +08:00
He Zhenxing
c6c2e66c67 Merge 5.1-rpl-testfixes -> 5.1-rpl 2008-08-14 17:38:22 +08:00
He Zhenxing
e2516c53fe fix after merge 2008-08-14 16:27:28 +08:00
He Zhenxing
84187687d3 auto merge 2008-08-14 14:47:48 +08:00
He Zhenxing
646c509b18 Auto merge from mysql-5.1 main 2008-08-14 14:27:18 +08:00
He Zhenxing
316e463cc5 BUG#38290 valgrind warnings in binlog_base64_flag
The problem was because the event allocated in mysql_client_binlog_statement
was not freed when an error occured while applying the event.
2008-08-14 10:42:10 +08:00
Andrei Elkin
2923e91b5a Bug #38738 rpl_ndb_mixed_engines_transactions result content mismatch
pb notices differences in results at the very beginning of the test.

Absense of mysql.ndb_apply_status must be benign anyway, but the warning should not happen
if have_ndb.inc is invoked ahead of ndb_master-slave.
Fixed with relocation of the macros.
2008-08-14 00:18:31 +03:00
Serge Kozlov
35e47b31a2 Bug#18817, removing --binlog-format option from .opt files 2008-08-13 23:12:51 +04:00
Timothy Smith
d62d3f34a7 Up-merge from 5.0; adds test for innodb bug 34286 (but no code changes). 2008-08-13 01:27:22 -06:00
Timothy Smith
793a928127 Merge in new test case 2008-08-13 00:12:06 -06:00
Timothy Smith
492a83a5e3 Merge some 5.0 innodb changes 2008-08-13 00:11:11 -06:00
Davi Arnaut
b9a9ae561a Merge mysql-5.0-bugteam into mysql-5.0 2008-08-12 15:51:00 -03:00
Davi Arnaut
0be4d2c0df Merge mysql-5.1-bugteam into mysql-5.1 main. 2008-08-12 11:28:43 -03:00
He Zhenxing
87b43cf0df Apply tomas's patch to fix rpl_row_basic.test, this can fix BUG#37884,
BUG#38369, enable rpl_row_basic_7ndb test
2008-08-12 17:09:36 +08:00
Davi Arnaut
f4313a4d2d Merge mysql-5.0-bugteam into mysql-5.1-bugteam 2008-08-11 21:27:17 -03:00
Davi Arnaut
d5620961a6 Bug#38486: Crash when using cursor protocol
Post-merge fix: mysql_client_test.c is compiled by C compilers
and some C compilers don't support mixed declarations and code
and it's explicitly forbidden by ISO C90.
2008-08-11 20:27:09 -03:00
Marc Alff
385b4bf7ff Manual merge of mysql-5.0-bugteam -> mysql-5.1-bugteam
Note: NULL merge of sql/sql_yacc.yy, the fix for bug#38296 will be provided separately for 5.1
2008-08-11 16:44:13 -06:00
Marc Alff
e087c05d3d Merge mysql-5.0-bugteam -> local bugfix branch 2008-08-11 15:21:29 -06:00
Marc Alff
fd324dd3ff Bug#37302 (missing DBUG_RETURN macro in function "find_key_block" (5.0 only))
Fixed missing DBUG_RETURN in the function find_key_block
2008-08-11 15:08:12 -06:00
Chad MILLER
318d288a34 Merge from bugteam 5.0 trunk. 2008-08-11 13:56:54 -04:00
Marc Alff
394691cd90 Bug#38296 (low memory crash with many conditions in a query)
This fix is for 5.0 only : back porting the 6.0 patch manually

The parser code in sql/sql_yacc.yy needs to be more robust to out of
memory conditions, so that when parsing a query fails due to OOM,
the thread gracefully returns an error.

Before this fix, a new/alloc returning NULL could:
- cause a crash, if dereferencing the NULL pointer,
- produce a corrupted parsed tree, containing NULL nodes,
- alter the semantic of a query, by silently dropping token values or nodes

With this fix:
- C++ constructors are *not* executed with a NULL "this" pointer
when operator new fails.
This is achieved by declaring "operator new" with a "throw ()" clause,
so that a failed new gracefully returns NULL on OOM conditions.

- calls to new/alloc are tested for a NULL result,

- The thread diagnostic area is set to an error status when OOM occurs.
This ensures that a request failing in the server properly returns an
ER_OUT_OF_RESOURCES error to the client.

- OOM conditions cause the parser to stop immediately (MYSQL_YYABORT).
This prevents causing further crashes when using a partially built parsed
tree in further rules in the parser.

No test scripts are provided, since automating OOM failures is not
instrumented in the server.
Tested under the debugger, to verify that an error in alloc_root cause the
thread to returns gracefully all the way to the client application, with
an ER_OUT_OF_RESOURCES error.
2008-08-11 10:10:00 -06:00
Chad MILLER
cf43a69a39 null-merge of backported changes. 2008-08-11 11:30:29 -04:00
Chad MILLER
fe39a901bb Backport compiler warning fix from 5.1-bugteam. 2008-08-11 11:28:35 -04:00
Davi Arnaut
44a162597f Post-merge fix: Remove Remove unused variable. 2008-08-11 10:13:12 -03:00