Commit graph

54890 commits

Author SHA1 Message Date
He Zhenxing
bd35cfe22e BUG#38734 rpl_server_id2 sync_with_master failed
Rotate event is automatically generated and written when rotating binary
log or relay log. Rotate events for relay logs are usually ignored by slave
SQL thread becuase they have the same server id as that of the slave.
However, if --replicate-same-server-id is enabled, rotate event
for relay log would be treated as if it's a rotate event from master, and
would be executed by slave to update the rli->group_master_log_name and
rli->group_master_log_pos to a wrong value and cause the MASTER_POS_WAIT
function to fail and return NULL.

This patch fixed this problem by setting a flag bit (LOG_EVENT_RELAY_LOG_F)
in the event to tell the SQL thread to ignore these Rotate events generated
for relay logs.

This patch also added another binlog event flag bit (LOG_EVENT_ARTIFICIAL_F)
to distinquish faked events, the method used before this was by checking if
log_pos was zero.


sql/log.h:
  Add a member to MYSQL_BIN_LOG to distinguish binary log from relay log.
sql/log_event.cc:
  Change artificial_event member to LOG_EVENT_ARTIFICIAL_F flag
  
  If LOG_EVENT_RELAY_LOG_F is set in the event flags for a rotate event, ignore it when updating position
  
  Refactored the code in Rotate_log_event::do_update_pos
sql/log_event.h:
  Add LOG_EVENT_RELAY_LOG_F flag to Log_event flags
  Add RELAY_LOG flag to Rotate_log_event flags
sql/sql_repl.cc:
  Set LOG_EVENT_ARTIFICIAL_F for fake rotate events
2008-09-28 15:34:25 +08:00
Magnus Svensson
6b9e2b9a1a Bug#36616 rpl tests without 'source include/have_log_bin.inc' fail starting server 2008-08-29 14:46:22 +02:00
Magnus Svensson
8676a302b5 Bug#33337, silently convert --gdb(etc.) to --client-gdb in embedded mode 2008-08-29 12:33:02 +02:00
Magnus Svensson
13ccc61f9d 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
d86c7d6013 Automerging 2008-08-27 12:00:16 +02:00
Andrei Elkin
b7f04d0c6c Bug #36968 rpl_temporary_errors.test produces warning in pushbuild
Backporting fixes to 5.1 from 6.0.

mysql-test/include/mtr_warnings.sql:
  removing the global rule for deadlock, use per-test intead.
mysql-test/suite/rpl/r/rpl_temporary_errors.result:
  deploying the expected deadlock error suppression in the test.
mysql-test/suite/rpl/t/rpl_temporary_errors.test:
  deploying the expected deadlock error suppression in the test.
2008-08-25 15:40:44 +03:00
Mats Kindahl
aa67166ef2 Eliminating some compiler warnings.
sql/sql_class.h:
  Adding default return clause.
2008-08-25 14:23:49 +02:00
Mats Kindahl
8b637b2847 Fixning compiler warnings. Fixing build failure for valgrind platform.
include/my_global.h:
  Moving YESNO() macro here from log.cc (it prints either "yes" or "no" depending on a boolean value).
sql/log.cc:
  Moving YESNO() function to my_global.h.
sql/sql_class.cc:
  Adding default case to printout function to avoid warning.
  Only defining function for debug builds since it isn't used 
  in non-debug build (hence produce a warning).
sql/sql_class.h:
  Printing yes/no answer instead of memory address since the
  case produces an error/warning on valgrind platform.
2008-08-22 12:40:21 +02:00
Mats Kindahl
7207b18b25 Merging with 5.1-rpl. 2008-08-20 10:42:39 +02:00
Mats Kindahl
be0acc4bcb 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.

mysql-test/extra/binlog_tests/database.test:
  Added test to ensure that DROP DATABASE does not affect the replication mode.
mysql-test/suite/binlog/r/binlog_database.result:
  Result file change.
sql/sql_db.cc:
  Removed code that clears the current_stmt_binlog_row_based flag.
  Added code to disable the binary log while dropping the objects
  in a database.
2008-08-20 10:06:50 +02:00
Mats Kindahl
09271b1e13 Merging with 5.1-rpl 2008-08-19 15:42:10 +02:00
Mats Kindahl
5cd9d96a68 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.

mysql-test/suite/rpl/r/rpl_row_create_table.result:
  Result file change.
mysql-test/suite/rpl/t/rpl_row_create_table.test:
  Added test to check that CREATE-SELECT into another database than the
  current one replicates.
sql/sql_insert.cc:
  Adding parameter to calls to store_create_info().
sql/sql_show.cc:
  Adding parameter to calls to store_create_info().
  
  Extending store_create_info() with parameter 'show_database' that will cause
  the database to be written before the table name.
sql/sql_show.h:
  Adding parameter to call to store_create_info() to tell if the database should be shown or not.
sql/sql_table.cc:
  Adding parameter to calls to store_create_info().
2008-08-19 13:18:59 +02:00
He Zhenxing
5e4d34d742 post fixes after merge
mysql-test/suite/binlog/r/binlog_killed_simulate.result:
  update result
mysql-test/suite/rpl/r/rpl_stm_log.result:
  update result
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test:
  correct a typo
2008-08-15 10:31:04 +08:00
He Zhenxing
4ddeb426cc auto merge 2008-08-14 17:59:12 +08:00
He Zhenxing
113deaec30 Merge 5.1-rpl-testfixes -> 5.1-rpl 2008-08-14 17:38:22 +08:00
He Zhenxing
193a8f9735 fix after merge
mysql-test/extra/rpl_tests/rpl_row_basic.test:
  remove extra sync_slave_with_master
2008-08-14 16:27:28 +08:00
He Zhenxing
ef58dcfcc8 auto merge 2008-08-14 14:47:48 +08:00
He Zhenxing
7bf8e29b99 Auto merge from mysql-5.1 main 2008-08-14 14:27:18 +08:00
He Zhenxing
29cc45d0ce 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.

sql/sql_binlog.cc:
  Delete the event if apply it failed
2008-08-14 10:42:10 +08:00
Andrei Elkin
7e290cccdb 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.


mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test:
  positioning have_ndb prior ndb_master-slave
2008-08-14 00:18:31 +03:00
Serge Kozlov
f2188dc323 Bug#18817, removing --binlog-format option from .opt files 2008-08-13 23:12:51 +04:00
Timothy Smith
88329eafd9 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
f1715b2b35 Merge in new test case 2008-08-13 00:12:06 -06:00
Timothy Smith
d7c36eb334 Merge some 5.0 innodb changes 2008-08-13 00:11:11 -06:00
Davi Arnaut
7e35139c8f Merge mysql-5.0-bugteam into mysql-5.0 2008-08-12 15:51:00 -03:00
Davi Arnaut
f18bc40caa Merge mysql-5.1-bugteam into mysql-5.1 main. 2008-08-12 11:28:43 -03:00
He Zhenxing
44d0fcddf1 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
88d10290e7 Merge mysql-5.0-bugteam into mysql-5.1-bugteam 2008-08-11 21:27:17 -03:00
Davi Arnaut
1912eaacc4 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.

tests/mysql_client_test.c:
  Don't mix declarations and code.
2008-08-11 20:27:09 -03:00
Marc Alff
7f228cf20e 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
2f3b860305 Merge mysql-5.0-bugteam -> local bugfix branch 2008-08-11 15:21:29 -06:00
Marc Alff
b4418b5c3a 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
26ed51d095 Merge from bugteam 5.0 trunk. 2008-08-11 13:56:54 -04:00
Marc Alff
e04dfffb59 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
b0d5c8a10b null-merge of backported changes. 2008-08-11 11:30:29 -04:00
Chad MILLER
b615e3d535 Backport compiler warning fix from 5.1-bugteam. 2008-08-11 11:28:35 -04:00
Davi Arnaut
1c108906c6 Post-merge fix: Remove Remove unused variable.
client/mysql_upgrade.c:
  Remove Remove unused variable.
2008-08-11 10:13:12 -03:00
Davi Arnaut
d622b04f39 Post-merge fix: Silence warning due to type mismatch.
client/mysql_upgrade.c:
  Silence warning due to type mismatch.
2008-08-11 10:08:21 -03:00
Kristofer Pettersson
2c01793a73 Null merging 5.0->5.1; Changeset is a back port. 2008-08-11 13:06:16 +02:00
Kristofer Pettersson
861c06f0b8 Automerge 2008-08-11 13:00:48 +02:00
Kristofer Pettersson
75a5ecbd72 Bug#38486 Crash when using cursor protocol
Server side cursors were not initialized properly and this caused a reference to
uninitialized memory.
2008-08-11 11:40:54 +02:00
Magnus Svensson
93d835213e Debug printouts 2008-08-11 10:41:23 +02:00
Magnus Svensson
75b4bdef13 Don't use slots 200-249 since they are also used by PB 2008-08-11 10:41:12 +02:00
Magnus Svensson
97bb894646 fix distcheck 2008-08-10 20:52:49 +02:00
Magnus Svensson
182b14114a Fixup mtr_unique. Remove usage of ps and grep. Make it a module. Move _process_alive to Platform.pm. Rename opt_baseport to baseport, it's not an option 2008-08-10 19:46:43 +02:00
Magnus Svensson
36bebcc13c Fix VS8 build error 2008-08-09 14:59:57 +02:00
Magnus Svensson
fba319490a Open result file in binary moe to avoid CR/LF problems 2008-08-09 14:52:39 +02:00
Magnus Svensson
cda4f08ff3 Add analyze-timeout.test 2008-08-09 11:33:59 +02:00
Magnus Svensson
4e06f6a855 Ad missing ) to CmakeLists.txt 2008-08-09 11:31:17 +02:00
Magnus Svensson
95dbffe2f5 Improve printout for 'found warnings' and add an exit to please mysqltest 2008-08-09 11:29:35 +02:00