Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.1807 05/04/18 13:14:08 mats@stripped +30 -0
Merging WL#1012 with WL#2325 clone.
mysql-test/t/rpl_row_basic_myisam.test
1.7 05/04/18 13:14:01 mats@stripped +2 -6
Merging WL#1012 with WL#2325 clone.
sql/ha_ndbcluster.cc
1.211 05/04/18 13:14:00 mats@stripped +2 -1
Merging WL#1012 with WL#2325 clone.
mysql-test/r/user_var.result
1.35 05/04/18 13:14:00 mats@stripped +0 -1
Merging WL#1012 with WL#2325 clone.
mysql-test/r/rpl_until.result
1.27 05/04/18 13:14:00 mats@stripped +3 -22
Merging WL#1012 with WL#2325 clone.
mysql-test/r/rpl_row_basic_myisam.result
1.7 05/04/18 13:14:00 mats@stripped +0 -9
Merging WL#1012 with WL#2325 clone.
mysql-test/r/rpl_rotate_logs.result
1.73 05/04/18 13:14:00 mats@stripped +0 -4
Merging WL#1012 with WL#2325 clone.
mysql-test/r/rpl_replicate_do.result
1.35 05/04/18 13:14:00 mats@stripped +0 -1
Merging WL#1012 with WL#2325 clone.
mysql-test/r/rpl_relayrotate.result
1.23 05/04/18 13:14:00 mats@stripped +0 -1
Merging WL#1012 with WL#2325 clone.
mysql-test/r/rpl_max_relay_size.result
1.26 05/04/18 13:14:00 mats@stripped +0 -6
Merging WL#1012 with WL#2325 clone.
mysql-test/r/rpl_log_pos.result
1.47 05/04/18 13:14:00 mats@stripped +0 -10
Merging WL#1012 with WL#2325 clone.
mysql-test/r/rpl_log.result
1.63 05/04/18 13:14:00 mats@stripped +0 -51
Merging WL#1012 with WL#2325 clone.
mysql-test/r/rpl_loaddata.result
1.34 05/04/18 13:14:00 mats@stripped +0 -5
Merging WL#1012 with WL#2325 clone.
mysql-test/r/rpl_flush_log_loop.result
1.29 05/04/18 13:14:00 mats@stripped +0 -1
Merging WL#1012 with WL#2325 clone.
mysql-test/r/rpl_error_ignored_table.result
1.26 05/04/18 13:14:00 mats@stripped +0 -2
Merging WL#1012 with WL#2325 clone.
mysql-test/r/rpl_deadlock.result
1.9 05/04/18 13:14:00 mats@stripped +0 -5
Merging WL#1012 with WL#2325 clone.
mysql-test/r/rpl_change_master.result
1.23 05/04/18 13:14:00 mats@stripped +0 -2
Merging WL#1012 with WL#2325 clone.
mysql-test/r/rpl000015.result
1.39 05/04/18 13:14:00 mats@stripped +0 -2
Merging WL#1012 with WL#2325 clone.
mysql-test/r/mix_innodb_myisam_binlog.result
1.28 05/04/18 13:14:00 mats@stripped +0 -62
Merging WL#1012 with WL#2325 clone.
mysql-test/r/ctype_ucs.result
1.38 05/04/18 13:14:00 mats@stripped +0 -1
Merging WL#1012 with WL#2325 clone.
sql/log_event.cc
1.177 05/04/18 12:57:15 mats@stripped +0 -0
Auto merged
sql/handler.h
1.138 05/04/18 12:57:14 mats@stripped +0 -0
Auto merged
sql/ha_innodb.h
1.92 05/04/18 12:57:14 mats@stripped +0 -0
Auto merged
mysql-test/r/rpl_user_variables.result
1.19 05/04/18 12:57:13 mats@stripped +0 -1
Auto merged
mysql-test/r/rpl_server_id2.result
1.13 05/04/18 12:57:13 mats@stripped +0 -1
Auto merged
mysql-test/r/rpl_server_id1.result
1.12 05/04/18 12:57:12 mats@stripped +0 -1
Auto merged
mysql-test/r/rpl_reset_slave.result
1.18 05/04/18 12:57:12 mats@stripped +0 -3
Auto merged
mysql-test/r/rpl_multi_query.result
1.8 05/04/18 12:57:11 mats@stripped +0 -1
Auto merged
mysql-test/r/rpl_loaddata_rule_s.result
1.12 05/04/18 12:57:10 mats@stripped +0 -1
Auto merged
mysql-test/r/rpl_loaddata_rule_m.result
1.18 05/04/18 12:57:10 mats@stripped +0 -1
Auto merged
mysql-test/r/rpl_charset.result
1.23 05/04/18 12:57:09 mats@stripped +0 -1
Auto merged
mysql-test/t/rpl_row_basic_myisam.test
1.6 05/04/18 12:57:08 mats@stripped +0 -0
Merge rename: mysql-test/t/rpl_row_basic.test -> mysql-test/t/rpl_row_basic_myisam.test
mysql-test/r/rpl_row_basic_myisam.result
1.6 05/04/18 12:57:08 mats@stripped +0 -0
Merge rename: mysql-test/r/rpl_row_basic.result -> mysql-test/r/rpl_row_basic_myisam.result
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: mats
# Host: romeo.kindahl.net
# Root: /home/bk/w2325-mysql-5.1/RESYNC
--- 1.137/sql/handler.h 2005-04-14 14:19:43 +02:00
+++ 1.138/sql/handler.h 2005-04-18 12:57:14 +02:00
@@ -76,6 +76,12 @@
*/
#define HA_CAN_INSERT_DELAYED (1 << 14)
#define HA_PRIMARY_KEY_IN_READ_INDEX (1 << 15)
+/*
+ The position of an arbitrary record can be retrieved using position() when
+ the table has a primary key, effectively allowing random access on the
+ table based on a given record.
+*/
+#define HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS (1 << 16)
#define HA_NOT_DELETE_WITH_CACHE (1 << 18)
#define HA_NO_PREFIX_CHAR_KEYS (1 << 20)
#define HA_CAN_FULLTEXT (1 << 21)
@@ -87,7 +93,6 @@
#define HA_NO_VARCHAR (1 << 27)
#define HA_CAN_BIT_FIELD (1 << 28) /* supports bit fields */
#define HA_NEED_READ_RANGE_BUFFER (1 << 29) /* for read_multi_range */
-
/* bits in index_flags(index_number) for what you can do with index */
#define HA_READ_NEXT 1 /* TODO really use this flag */
--- 1.176/sql/log_event.cc 2005-04-15 15:30:51 +02:00
+++ 1.177/sql/log_event.cc 2005-04-18 12:57:15 +02:00
@@ -5034,9 +5034,10 @@
DBUG_PRINT("info", ("row_start = %p, m_rows_end = %p",
row_start, m_rows_end));
char const* row_end = do_prepare_row(thd, table, row_start);
- DBUG_ASSERT(row_end != NULL);
DBUG_PRINT("info", ("row_start = %p, row_end = %p, (length %u)",
row_start, row_end, row_end - row_start));
+ DBUG_ASSERT(row_end != NULL);
+ DBUG_ASSERT(row_end <= m_rows_end);
error = do_exec_row(table, rli);
DBUG_PRINT("info", ("error = %d", error));
row_start = row_end;
@@ -5411,6 +5412,86 @@
}
return 0;
}
+
+
+/*
+ Find the row given by 'key', if the table has keys, or else use a table scan
+ to find (and fetch) the row. If the engine allows random access of the
+ records, a combination of position() and rnd_pos() will be used.
+
+ The 'record_buf' will be used as buffer for records while locating the
+ correct row.
+ */
+static int find_and_fetch_row(TABLE* table, byte* key, byte* record_buf)
+{
+ if ((table->file->table_flags() & HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS)
+ && table->s->primary_key < MAX_KEY)
+ {
+ // Use a more efficient method to fetch the record given by
+ // table->record[0] if the engine allows it.
+
+ DBUG_PRINT("info", ("Fetching row using random access methods"));
+ table->file->position(table->record[0]);
+ table->file->rnd_pos(table->record[0], table->file->ref);
+ return 0;
+ }
+
+ if (table->s->keys > 0)
+ {
+ DBUG_PRINT("info", ("Fetching row using index"));
+ if (int error = table->file->index_read(record_buf, key,
+ table->key_info->key_length,
+ HA_READ_KEY_EXACT))
+ {
+ return error;
+ }
+
+ while (record_compare(table, table->record[0], record_buf) != 0)
+ {
+ if (int error = table->file->index_next(record_buf))
+ {
+ return error;
+ }
+ }
+ }
+ else
+ {
+ DBUG_PRINT("info", ("Fetching row by scanning table"));
+
+#if 0 // Save the position
+ table->file->position(record_buf);
+ byte* const last_rowid = table->file->ref;
+#endif
+
+ // Continue until we find the right record or have made a full loop
+ do
+ {
+ if (int const error = table->file->rnd_next(record_buf))
+ {
+ switch (error)
+ {
+ case HA_ERR_END_OF_FILE:
+ table->file->ha_rnd_init(1);
+ continue;
+ case HA_ERR_RECORD_DELETED:
+ continue;
+ default:
+ return error;
+ }
+ }
+
+#if 0
+ // Check if we've scanned the entire table.
+ table->file->position(record_buf);
+ if (table->file->cmp_ref(last_rowid, table->file->ref) == 0)
+ return HA_ERR_END_OF_FILE;
+#endif
+ }
+ while (record_compare(table, table->record[0], record_buf) != 0);
+ }
+
+ return 0;
+}
#endif
/*
@@ -5527,57 +5608,13 @@
DBUG_ENTER("Delete_rows_log_event::do_exec_row(TABLE*,...)");
DBUG_ASSERT(table != NULL);
- if (table->s->keys > 0) {
- if (int error = table->file->index_read(m_search_record, m_key,
- table->key_info->key_length,
- HA_READ_KEY_EXACT))
- {
- DBUG_PRINT("return", ("error = %d", error));
- DBUG_RETURN(error);
- }
-
- while (record_compare(table, table->record[0], m_search_record) != 0)
- {
- if (int error = table->file->index_next(m_search_record))
- {
- DBUG_PRINT("return", ("error = %d", error));
- DBUG_RETURN(error);
- }
- }
- }
- else
+ if (int error = find_and_fetch_row(table, m_key, m_search_record))
{
- if (int const error = table->file->rnd_next(m_search_record))
- {
- DBUG_PRINT("return", ("error = %d", error));
- DBUG_RETURN(error);
- }
-
- // Save the position
- table->file->position(m_search_record);
- byte* const last_rowid = table->file->ref;
-
- // Continue until we find the right record or have made a full loop
- while (record_compare(table, table->record[0], m_search_record) != 0)
- {
- if (int const error = table->file->rnd_next(m_search_record))
- {
- switch (error) {
- case HA_ERR_END_OF_FILE:
- table->file->ha_rnd_init(1);
- continue;
- case HA_ERR_RECORD_DELETED:
- continue;
- default:
- DBUG_PRINT("return", ("error = %d", error));
- DBUG_RETURN(error);
- }
- }
- }
+ DBUG_PRINT("return", ("error = %d", error));
+ DBUG_RETURN(error);
}
-
+
// Now we should have the right row to delete
-
int const error = table->file->ha_delete_row(m_search_record);
DBUG_PRINT("return", ("error = %d", error));
@@ -5636,6 +5673,7 @@
NULL);
if (!m_memory)
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+
if (table->s->keys > 0)
{
// We have a key: search the table using the index
@@ -5698,57 +5736,14 @@
{
DBUG_ENTER("Update_rows_log_event::do_exec_row(TABLE*,...)");
DBUG_ASSERT(table != NULL);
- if (table->s->keys > 0) {
- if (int error = table->file
- ->index_read(m_search_record, m_key,
- table->key_info->key_length,
- HA_READ_KEY_EXACT))
- {
- DBUG_PRINT("return", ("error = %d", error));
- DBUG_RETURN(error);
- }
- while (record_compare(table, table->record[0], m_search_record) != 0)
- {
- if (int error = table->file->index_next(m_search_record))
- {
- DBUG_PRINT("return", ("error = %d", error));
- DBUG_RETURN(error);
- }
- }
- }
- else
+ if (int error = find_and_fetch_row(table, m_key, m_search_record))
{
- if (int const error = table->file->rnd_next(m_search_record))
- {
- DBUG_PRINT("return", ("error = %d", error));
- DBUG_RETURN(error);
- }
-
- // Save the position
- table->file->position(m_search_record);
- byte* const last_rowid = table->file->ref;
-
- // Continue until we find the right record or have made a full loop
- while (record_compare(table, table->record[0], m_search_record) != 0)
- {
- if (int const error = table->file->rnd_next(m_search_record))
- {
- switch (error) {
- case HA_ERR_END_OF_FILE:
- table->file->ha_rnd_init(1);
- continue;
- case HA_ERR_RECORD_DELETED:
- continue;
- default:
- DBUG_PRINT("return", ("error = %d", error));
- DBUG_RETURN(error);
- }
- }
- }
+ DBUG_PRINT("return", ("error = %d", error));
+ DBUG_RETURN(error);
}
-
- // Now we should have the right row to delete
+
+ // Now we should have the right row to update
int const error = table->file->ha_update_row(table->record[0],
table->record[1]);
--- 1.26/mysql-test/r/rpl_until.result 2005-04-08 18:40:59 +02:00
+++ 1.27/mysql-test/r/rpl_until.result 2005-04-18 13:14:00 +02:00
@@ -15,14 +15,14 @@
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4
-master-bin.000001 102 Query 1 223 use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001 223 Query 1 323 use `test`; insert into t1 values (1),(2),(3),(4)
-master-bin.000001 323 Query 1 399 use `test`; drop table t1
-master-bin.000001 399 Query 1 520 use `test`; create table t2(n int not null auto_increment primary key)
-master-bin.000001 520 Query 1 612 use `test`; insert into t2 values (1),(2)
-master-bin.000001 612 Query 1 704 use `test`; insert into t2 values (3),(4)
-master-bin.000001 704 Query 1 780 use `test`; drop table t2
-start slave until master_log_file='master-bin.000001', master_log_pos=323;
+master-bin.000001 102 Query 1 224 use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001 224 Query 1 325 use `test`; insert into t1 values (1),(2),(3),(4)
+master-bin.000001 325 Query 1 402 use `test`; drop table t1
+master-bin.000001 402 Query 1 524 use `test`; create table t2(n int not null auto_increment primary key)
+master-bin.000001 524 Query 1 617 use `test`; insert into t2 values (1),(2)
+master-bin.000001 617 Query 1 710 use `test`; insert into t2 values (3),(4)
+master-bin.000001 710 Query 1 787 use `test`; drop table t2
+start slave until master_log_file='master-bin.000001', master_log_pos=325;
select * from t1;
n
1
@@ -31,7 +31,7 @@
4
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 780 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 323 # Master master-bin.000001 323 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 787 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 325 # Master master-bin.000001 325 No #
start slave until master_log_file='master-no-such-bin.000001', master_log_pos=295;
select * from t1;
n
@@ -41,33 +41,32 @@
4
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 780 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 323 # Master master-no-such-bin.000001 295 No #
-start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=746;
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 787 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 325 # Master master-no-such-bin.000001 295 No #
+start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=751;
select * from t2;
n
1
2
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 780 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 612 # Relay slave-relay-bin.000004 746 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 787 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 617 # Relay slave-relay-bin.000004 751 No #
start slave;
stop slave;
start slave until master_log_file='master-bin.000001', master_log_pos=787;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 780 slave-relay-bin.000004 # master-bin.000001 Yes Yes 0 0 780 # Master master-bin.000001 787 No #
-start slave until master_log_file='master-bin', master_log_pos=560;
-start slave until master_log_file='master-bin.000001', master_log_pos=560, relay_log_pos=16;
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 787 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 787 # Master master-bin.000001 787 No #
+start slave until master_log_file='master-bin', master_log_pos=565;
+ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
+start slave until master_log_file='master-bin.000001', master_log_pos=565, relay_log_pos=16;
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
start slave until master_log_file='master-bin.000001';
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
start slave until relay_log_file='slave-relay-bin.000002';
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
-start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=560;
+start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=565;
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
start slave sql_thread;
-Warnings:
-Note 1254 Slave is already running
start slave until master_log_file='master-bin.000001', master_log_pos=787;
Warnings:
Note 1254 Slave is already running
--- 1.27/mysql-test/r/mix_innodb_myisam_binlog.result 2005-04-14 14:42:58 +02:00
+++ 1.28/mysql-test/r/mix_innodb_myisam_binlog.result 2005-04-18 13:14:00 +02:00
@@ -9,9 +9,9 @@
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 170 Query 1 # use `test`; insert into t1 values(1)
-master-bin.000001 257 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 351 Xid 1 # COMMIT /* xid=7 */
+master-bin.000001 171 Query 1 # use `test`; insert into t1 values(1)
+master-bin.000001 259 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 354 Xid 1 # COMMIT /* xid=7 */
delete from t1;
delete from t2;
reset master;
@@ -24,9 +24,9 @@
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 170 Query 1 # use `test`; insert into t1 values(2)
-master-bin.000001 257 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 351 Query 1 # use `test`; ROLLBACK
+master-bin.000001 171 Query 1 # use `test`; insert into t1 values(2)
+master-bin.000001 259 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 354 Query 1 # use `test`; ROLLBACK
delete from t1;
delete from t2;
reset master;
@@ -42,12 +42,12 @@
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 170 Query 1 # use `test`; insert into t1 values(3)
-master-bin.000001 257 Query 1 # use `test`; savepoint my_savepoint
-master-bin.000001 342 Query 1 # use `test`; insert into t1 values(4)
-master-bin.000001 429 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 523 Query 1 # use `test`; rollback to savepoint my_savepoint
-master-bin.000001 620 Xid 1 # COMMIT /* xid=24 */
+master-bin.000001 171 Query 1 # use `test`; insert into t1 values(3)
+master-bin.000001 259 Query 1 # use `test`; savepoint my_savepoint
+master-bin.000001 345 Query 1 # use `test`; insert into t1 values(4)
+master-bin.000001 433 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 528 Query 1 # use `test`; rollback to savepoint my_savepoint
+master-bin.000001 626 Xid 1 # COMMIT /* xid=24 */
delete from t1;
delete from t2;
reset master;
@@ -68,13 +68,13 @@
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 170 Query 1 # use `test`; insert into t1 values(5)
-master-bin.000001 257 Query 1 # use `test`; savepoint my_savepoint
-master-bin.000001 342 Query 1 # use `test`; insert into t1 values(6)
-master-bin.000001 429 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 523 Query 1 # use `test`; rollback to savepoint my_savepoint
-master-bin.000001 620 Query 1 # use `test`; insert into t1 values(7)
-master-bin.000001 707 Xid 1 # COMMIT /* xid=36 */
+master-bin.000001 171 Query 1 # use `test`; insert into t1 values(5)
+master-bin.000001 259 Query 1 # use `test`; savepoint my_savepoint
+master-bin.000001 345 Query 1 # use `test`; insert into t1 values(6)
+master-bin.000001 433 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 528 Query 1 # use `test`; rollback to savepoint my_savepoint
+master-bin.000001 626 Query 1 # use `test`; insert into t1 values(7)
+master-bin.000001 714 Xid 1 # COMMIT /* xid=36 */
delete from t1;
delete from t2;
reset master;
@@ -90,9 +90,9 @@
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 170 Query 1 # use `test`; insert into t1 values(8)
-master-bin.000001 257 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 351 Query 1 # use `test`; ROLLBACK
+master-bin.000001 171 Query 1 # use `test`; insert into t1 values(8)
+master-bin.000001 259 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 354 Query 1 # use `test`; ROLLBACK
delete from t1;
delete from t2;
reset master;
@@ -101,8 +101,8 @@
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; insert into t1 values(9)
-master-bin.000001 189 Xid 1 # COMMIT /* xid=59 */
-master-bin.000001 216 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 190 Xid 1 # COMMIT /* xid=59 */
+master-bin.000001 217 Query 1 # use `test`; insert into t2 select * from t1
delete from t1;
delete from t2;
reset master;
@@ -112,18 +112,18 @@
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; insert into t1 values(10)
-master-bin.000001 190 Xid 1 # COMMIT /* xid=65 */
-master-bin.000001 217 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 191 Xid 1 # COMMIT /* xid=65 */
+master-bin.000001 218 Query 1 # use `test`; insert into t2 select * from t1
insert into t1 values(11);
commit;
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; insert into t1 values(10)
-master-bin.000001 190 Xid 1 # COMMIT /* xid=65 */
-master-bin.000001 217 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 311 Query 1 # use `test`; BEGIN
-master-bin.000001 379 Query 1 # use `test`; insert into t1 values(11)
-master-bin.000001 467 Xid 1 # COMMIT /* xid=67 */
+master-bin.000001 191 Xid 1 # COMMIT /* xid=65 */
+master-bin.000001 218 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 313 Query 1 # use `test`; BEGIN
+master-bin.000001 382 Query 1 # use `test`; insert into t1 values(11)
+master-bin.000001 471 Xid 1 # COMMIT /* xid=67 */
alter table t2 engine=INNODB;
delete from t1;
delete from t2;
@@ -135,9 +135,9 @@
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 170 Query 1 # use `test`; insert into t1 values(12)
-master-bin.000001 258 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 352 Xid 1 # COMMIT /* xid=77 */
+master-bin.000001 171 Query 1 # use `test`; insert into t1 values(12)
+master-bin.000001 260 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 355 Xid 1 # COMMIT /* xid=77 */
delete from t1;
delete from t2;
reset master;
@@ -160,8 +160,8 @@
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 170 Query 1 # use `test`; insert into t1 values(14)
-master-bin.000001 258 Xid 1 # COMMIT /* xid=93 */
+master-bin.000001 171 Query 1 # use `test`; insert into t1 values(14)
+master-bin.000001 260 Xid 1 # COMMIT /* xid=93 */
delete from t1;
delete from t2;
reset master;
@@ -180,9 +180,9 @@
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 170 Query 1 # use `test`; insert into t1 values(16)
-master-bin.000001 258 Query 1 # use `test`; insert into t1 values(18)
-master-bin.000001 346 Xid 1 # COMMIT /* xid=104 */
+master-bin.000001 171 Query 1 # use `test`; insert into t1 values(16)
+master-bin.000001 260 Query 1 # use `test`; insert into t1 values(18)
+master-bin.000001 349 Xid 1 # COMMIT /* xid=104 */
delete from t1;
delete from t2;
alter table t2 type=MyISAM;
--- 1.22/mysql-test/r/rpl_change_master.result 2005-04-08 18:40:59 +02:00
+++ 1.23/mysql-test/r/rpl_change_master.result 2005-04-18 13:14:00 +02:00
@@ -13,11 +13,11 @@
stop slave;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 361 # # master-bin.000001 No No 0 0 187 # None 0 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 364 # # master-bin.000001 No No 0 0 188 # None 0 No #
change master to master_user='root';
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 187 # # master-bin.000001 No No 0 0 187 # None 0 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 188 # # master-bin.000001 No No 0 0 188 # None 0 No #
start slave;
select * from t1;
n
--- 1.8/mysql-test/r/rpl_deadlock.result 2005-04-08 18:40:59 +02:00
+++ 1.9/mysql-test/r/rpl_deadlock.result 2005-04-18 13:14:00 +02:00
@@ -45,9 +45,9 @@
22
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 18915 # # master-bin.000001 Yes Yes 0 0 18915 # None 0 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 19122 # # master-bin.000001 Yes Yes 0 0 19122 # None 0 No #
stop slave;
-change master to master_log_pos=536;
+change master to master_log_pos=540;
begin;
select * from t2 for update;
a
@@ -63,10 +63,10 @@
22
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 18915 # # master-bin.000001 Yes Yes 0 0 18915 # None 0 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 19122 # # master-bin.000001 Yes Yes 0 0 19122 # None 0 No #
set global max_relay_log_size=0;
stop slave;
-change master to master_log_pos=536;
+change master to master_log_pos=540;
begin;
select * from t2 for update;
a
@@ -83,5 +83,5 @@
22
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 18915 # # master-bin.000001 Yes Yes 0 0 18915 # None 0 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 19122 # # master-bin.000001 Yes Yes 0 0 19122 # None 0 No #
drop table t1,t2;
--- 1.25/mysql-test/r/rpl_error_ignored_table.result 2005-04-08 18:40:59 +02:00
+++ 1.26/mysql-test/r/rpl_error_ignored_table.result 2005-04-18 13:14:00 +02:00
@@ -9,7 +9,7 @@
ERROR 23000: Duplicate entry '1' for key 1
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 292 # # master-bin.000001 Yes Yes test.t3,test.t1,test.t2 0 0 292 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 294 # # master-bin.000001 Yes Yes test.t3,test.t1,test.t2 0 0 294 # None 0 No #
show tables like 't1';
Tables_in_test (t1)
drop table t1;
--- 1.25/mysql-test/r/rpl_max_relay_size.result 2005-04-08 18:40:59 +02:00
+++ 1.26/mysql-test/r/rpl_max_relay_size.result 2005-04-18 13:14:00 +02:00
@@ -16,7 +16,7 @@
start slave;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 72956 # # master-bin.000001 Yes Yes 0 0 72956 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73758 # # master-bin.000001 Yes Yes 0 0 73758 # None 0 No #
stop slave;
reset slave;
set global max_relay_log_size=(5*4096);
@@ -26,7 +26,7 @@
start slave;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 72956 # # master-bin.000001 Yes Yes 0 0 72956 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73758 # # master-bin.000001 Yes Yes 0 0 73758 # None 0 No #
stop slave;
reset slave;
set global max_relay_log_size=0;
@@ -36,7 +36,7 @@
start slave;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 72956 # # master-bin.000001 Yes Yes 0 0 72956 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73758 # # master-bin.000001 Yes Yes 0 0 73758 # None 0 No #
stop slave;
reset slave;
flush logs;
@@ -49,12 +49,12 @@
create table t1 (a int);
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73042 # # master-bin.000001 Yes Yes 0 0 73042 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73845 # # master-bin.000001 Yes Yes 0 0 73845 # None 0 No #
flush logs;
drop table t1;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73118 # # master-bin.000001 Yes Yes 0 0 73118 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73922 # # master-bin.000001 Yes Yes 0 0 73922 # None 0 No #
flush logs;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
--- 1.22/mysql-test/r/rpl_relayrotate.result 2005-04-08 18:40:59 +02:00
+++ 1.23/mysql-test/r/rpl_relayrotate.result 2005-04-18 13:14:00 +02:00
@@ -18,5 +18,5 @@
8000
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 735190 # # master-bin.000001 Yes Yes 0 0 735190 # None 0 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 743192 # # master-bin.000001 Yes Yes 0 0 743192 # None 0 No #
drop table t1;
--- 1.210/sql/ha_ndbcluster.cc 2005-04-18 11:54:56 +02:00
+++ 1.211/sql/ha_ndbcluster.cc 2005-04-18 13:14:00 +02:00
@@ -4496,7 +4496,8 @@
m_table(NULL),
m_tableVersion(-1),
m_table_info(NULL),
- m_table_flags(HA_NDBCLUSTER_TABLE_FLAGS),
+ m_table_flags(HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS |
+ HA_NDBCLUSTER_TABLE_FLAGS),
m_share(0),
m_use_write(FALSE),
m_ignore_dup_key(FALSE),
--- 1.5/mysql-test/r/rpl_row_basic.result 2005-04-18 11:30:54 +02:00
+++ 1.7/mysql-test/r/rpl_row_basic_myisam.result 2005-04-18 13:14:00 +02:00
@@ -4,23 +4,23 @@
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
-CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1));
+CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)) engine=myisam;
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
-<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: 5.1.0-alpha-debug-log, Binlog ver: 4
-<binlog> <pos> Query 1 <end_log_pos> use `test`; CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1))
+<binlog> 4 Format_desc 1 <end_log_pos> Server ver: 5.1.0-alpha-debug-log, Binlog ver: 4
+<binlog> 102 Query 1 <end_log_pos> use `test`; CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)) engine=myisam
SELECT * FROM t1;
C1 C2
SELECT * FROM t1;
C1 C2
INSERT INTO t1 VALUES ('A','B'), ('X','Y'), ('X','X');
INSERT INTO t1 VALUES ('A','C'), ('X', 'Z'), ('A', 'A');
-SHOW BINLOG EVENTS FROM 217;
+SHOW BINLOG EVENTS FROM 232;
Log_name Pos Event_type Server_id End_log_pos Info
-<binlog> 217 Table_map 1 <end_log_pos>
-<binlog> 253 Write_rows 1 <end_log_pos>
-<binlog> 295 Table_map 1 <end_log_pos>
-<binlog> 331 Write_rows 1 <end_log_pos>
+<binlog> 232 Table_map 1 <end_log_pos>
+<binlog> 268 Write_rows 1 <end_log_pos>
+<binlog> 310 Table_map 1 <end_log_pos>
+<binlog> 346 Write_rows 1 <end_log_pos>
SELECT * FROM t1;
C1 C2
A B
@@ -38,10 +38,10 @@
X Z
A A
DELETE FROM t1 WHERE C1 = C2;
-SHOW BINLOG EVENTS FROM 373;
+SHOW BINLOG EVENTS FROM 388;
Log_name Pos Event_type Server_id End_log_pos Info
-<binlog> 373 Table_map 1 <end_log_pos>
-<binlog> 409 Delete_rows 1 <end_log_pos>
+<binlog> 388 Table_map 1 <end_log_pos>
+<binlog> 424 Delete_rows 1 <end_log_pos>
SELECT * FROM t1;
C1 C2
A B
@@ -55,7 +55,7 @@
A C
X Z
UPDATE t1 SET C2 = 'I' WHERE C1 = 'A' AND C2 = 'C';
-SHOW BINLOG EVENTS FROM 446;
+SHOW BINLOG EVENTS FROM 461;
Log_name Pos Event_type Server_id End_log_pos Info
<binlog> 446 Table_map 1 <end_log_pos>
<binlog> 482 Update_rows 1 <end_log_pos>
@@ -71,7 +71,7 @@
X Y
A I
X Z
-CREATE TABLE t2 (c1 INT, c2 INT, PRIMARY KEY (c1));
+CREATE TABLE t2 (c1 INT, c2 INT, PRIMARY KEY (c1)) engine=myisam;
INSERT INTO t2
VALUES (1,2), (2,4), (3,9), (4,15), (5,25),
(6,35), (7,50), (8,64), (9,81);
@@ -153,7 +153,7 @@
6 36
7 49
9 81
-CREATE TABLE t3 (C1 CHAR(1), C2 CHAR(1));
+CREATE TABLE t3 (C1 CHAR(1), C2 CHAR(1)) engine=myisam;
SELECT * FROM t3;
C1 C2
SELECT * FROM t3;
--- 1.5/mysql-test/t/rpl_row_basic.test 2005-04-18 11:30:54 +02:00
+++ 1.7/mysql-test/t/rpl_row_basic_myisam.test 2005-04-18 13:14:01 +02:00
@@ -4,8 +4,8 @@
# Basic tests of row-level logging
#
-CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1));
---replace_column 1 <binlog> 2 <pos> 5 <end_log_pos>
+CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)) engine=myisam;
+--replace_column 1 <binlog> 5 <end_log_pos>
SHOW BINLOG EVENTS;
SELECT * FROM t1;
sync_slave_with_master;
@@ -16,7 +16,7 @@
INSERT INTO t1 VALUES ('A','B'), ('X','Y'), ('X','X');
INSERT INTO t1 VALUES ('A','C'), ('X', 'Z'), ('A', 'A');
--replace_column 1 <binlog> 5 <end_log_pos>
-SHOW BINLOG EVENTS FROM 217;
+SHOW BINLOG EVENTS FROM 232;
SELECT * FROM t1;
sync_slave_with_master;
SELECT * FROM t1;
@@ -27,7 +27,7 @@
connection master;
DELETE FROM t1 WHERE C1 = C2;
--replace_column 1 <binlog> 5 <end_log_pos>
-SHOW BINLOG EVENTS FROM 373;
+SHOW BINLOG EVENTS FROM 388;
SELECT * FROM t1;
sync_slave_with_master;
SELECT * FROM t1;
@@ -39,8 +39,8 @@
#
connection master;
UPDATE t1 SET C2 = 'I' WHERE C1 = 'A' AND C2 = 'C';
---replace_column 1 <binlog> 5 <end_log_pos>
-SHOW BINLOG EVENTS FROM 446;
+--replace_column 1 <binlog> 2 <pos> 5 <end_log_pos>
+SHOW BINLOG EVENTS FROM 461;
SELECT * FROM t1;
sync_slave_with_master;
SELECT * FROM t1;
@@ -49,7 +49,7 @@
# Testing table with primary key
#
connection master;
-CREATE TABLE t2 (c1 INT, c2 INT, PRIMARY KEY (c1));
+CREATE TABLE t2 (c1 INT, c2 INT, PRIMARY KEY (c1)) engine=myisam;
INSERT INTO t2
VALUES (1,2), (2,4), (3,9), (4,15), (5,25),
(6,35), (7,50), (8,64), (9,81);
@@ -77,7 +77,7 @@
# earlier.
#
connection master;
-CREATE TABLE t3 (C1 CHAR(1), C2 CHAR(1));
+CREATE TABLE t3 (C1 CHAR(1), C2 CHAR(1)) engine=myisam;
SELECT * FROM t3;
sync_slave_with_master;
SELECT * FROM t3;
--- 1.91/sql/ha_innodb.h 2005-04-11 12:11:47 +02:00
+++ 1.92/sql/ha_innodb.h 2005-04-18 12:57:14 +02:00
@@ -89,6 +89,7 @@
HA_CAN_SQL_HANDLER |
HA_NOT_EXACT_COUNT |
HA_PRIMARY_KEY_IN_READ_INDEX |
+ HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS |
HA_TABLE_SCAN_ON_INDEX),
last_dup_key((uint) -1),
start_of_scan(0),
--- 1.28/mysql-test/r/rpl_flush_log_loop.result 2005-04-08 18:40:59 +02:00
+++ 1.29/mysql-test/r/rpl_flush_log_loop.result 2005-04-18 13:14:00 +02:00
@@ -14,4 +14,4 @@
flush logs;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root SLAVE_PORT 60 slave-bin.000001 212 # # slave-bin.000001 Yes Yes 0 0 212 # None 0 No #
+# 127.0.0.1 root SLAVE_PORT 60 slave-bin.000001 213 # # slave-bin.000001 Yes Yes 0 0 213 # None 0 No #
--- 1.33/mysql-test/r/rpl_loaddata.result 2005-04-08 18:40:59 +02:00
+++ 1.34/mysql-test/r/rpl_loaddata.result 2005-04-18 13:14:00 +02:00
@@ -22,7 +22,7 @@
2003-03-22 2416 a bbbbb
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
-slave-bin.000001 1290
+slave-bin.000001 1296
drop table t1;
drop table t2;
drop table t3;
@@ -33,7 +33,7 @@
start slave;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1793 # # master-bin.000001 Yes Yes 0 0 1793 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1804 # # master-bin.000001 Yes Yes 0 0 1804 # None 0 No #
set sql_log_bin=0;
delete from t1;
set sql_log_bin=1;
@@ -43,7 +43,7 @@
change master to master_user='root';
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1828 # # master-bin.000001 No No 0 0 1828 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1839 # # master-bin.000001 No No 0 0 1839 # None 0 No #
set global sql_slave_skip_counter=1;
start slave;
set sql_log_bin=0;
@@ -77,5 +77,4 @@
terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
'\n##\n' starting by '>' ignore 1 lines;
ERROR 23000: Duplicate entry '2003-03-22' for key 1
-drop table t2;
drop table t2;
--- 1.34/mysql-test/r/rpl_replicate_do.result 2005-04-08 18:40:59 +02:00
+++ 1.35/mysql-test/r/rpl_replicate_do.result 2005-04-18 13:14:00 +02:00
@@ -28,4 +28,4 @@
drop table if exists t1,t2,t11;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1662 # # master-bin.000001 Yes Yes test.t1 0 0 1662 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1672 # # master-bin.000001 Yes Yes test.t1 0 0 1672 # None 0 No #
--- 1.72/mysql-test/r/rpl_rotate_logs.result 2005-04-08 18:40:59 +02:00
+++ 1.73/mysql-test/r/rpl_rotate_logs.result 2005-04-18 13:14:00 +02:00
@@ -16,7 +16,7 @@
insert into t1 values('Could not break slave'),('Tried hard');
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 60 master-bin.000001 552 # # master-bin.000001 Yes Yes 0 0 552 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 60 master-bin.000001 556 # # master-bin.000001 Yes Yes 0 0 556 # None 0 No #
select * from t1;
s
Could not break slave
@@ -57,7 +57,7 @@
insert into t2 values (65);
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 60 master-bin.000003 500 # # master-bin.000003 Yes Yes 0 0 500 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 60 master-bin.000003 504 # # master-bin.000003 Yes Yes 0 0 504 # None 0 No #
select * from t2;
m
34
@@ -79,13 +79,13 @@
master-bin.000005
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000005 2036 cluster_replication
+master-bin.000005 2150
select * from t4;
a
testing temporary tables part 2
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 60 master-bin.000005 2036 # # master-bin.000005 Yes Yes 0 0 2036 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 60 master-bin.000005 2150 # # master-bin.000005 Yes Yes 0 0 2150 # None 0 No #
lock tables t3 read;
select count(*) from t3 where n >= 4;
count(*)
--- 1.62/mysql-test/r/rpl_log.result 2005-04-08 18:40:59 +02:00
+++ 1.63/mysql-test/r/rpl_log.result 2005-04-18 13:14:00 +02:00
@@ -20,24 +20,24 @@
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4
-master-bin.000001 102 Query 1 223 use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001 223 Intvar 1 251 INSERT_ID=1
-master-bin.000001 251 Query 1 342 use `test`; insert into t1 values (NULL)
-master-bin.000001 342 Query 1 418 use `test`; drop table t1
-master-bin.000001 418 Query 1 521 use `test`; create table t1 (word char(20) not null)
-master-bin.000001 521 Begin_load_query 1 1125 ;file_id=1;block_len=581
-master-bin.000001 1125 Execute_load_query 1 1273 use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=1
-master-bin.000001 1273 Query 1 1349 use `test`; drop table t1
+master-bin.000001 102 Query 1 224 use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001 224 Intvar 1 252 INSERT_ID=1
+master-bin.000001 252 Query 1 344 use `test`; insert into t1 values (NULL)
+master-bin.000001 344 Query 1 421 use `test`; drop table t1
+master-bin.000001 421 Query 1 525 use `test`; create table t1 (word char(20) not null)
+master-bin.000001 525 Begin_load_query 1 1129 ;file_id=1;block_len=581
+master-bin.000001 1129 Execute_load_query 1 1278 use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=1
+master-bin.000001 1278 Query 1 1355 use `test`; drop table t1
show binlog events from 102 limit 1;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 102 Query 1 223 use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001 102 Query 1 224 use `test`; create table t1(n int not null auto_increment primary key)
show binlog events from 102 limit 2;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 102 Query 1 223 use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001 223 Intvar 1 251 INSERT_ID=1
+master-bin.000001 102 Query 1 224 use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001 224 Intvar 1 252 INSERT_ID=1
show binlog events from 102 limit 2,1;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 251 Query 1 342 use `test`; insert into t1 values (NULL)
+master-bin.000001 252 Query 1 344 use `test`; insert into t1 values (NULL)
flush logs;
create table t5 (a int);
drop table t5;
@@ -50,23 +50,23 @@
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4
-master-bin.000001 102 Query 1 223 use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001 223 Intvar 1 251 INSERT_ID=1
-master-bin.000001 251 Query 1 342 use `test`; insert into t1 values (NULL)
-master-bin.000001 342 Query 1 418 use `test`; drop table t1
-master-bin.000001 418 Query 1 521 use `test`; create table t1 (word char(20) not null)
-master-bin.000001 521 Begin_load_query 1 1125 ;file_id=1;block_len=581
-master-bin.000001 1125 Execute_load_query 1 1273 use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=1
-master-bin.000001 1273 Query 1 1349 use `test`; drop table t1
-master-bin.000001 1349 Rotate 1 1393 master-bin.000002;pos=4
+master-bin.000001 102 Query 1 224 use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001 224 Intvar 1 252 INSERT_ID=1
+master-bin.000001 252 Query 1 344 use `test`; insert into t1 values (NULL)
+master-bin.000001 344 Query 1 421 use `test`; drop table t1
+master-bin.000001 421 Query 1 525 use `test`; create table t1 (word char(20) not null)
+master-bin.000001 525 Begin_load_query 1 1129 ;file_id=1;block_len=581
+master-bin.000001 1129 Execute_load_query 1 1278 use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=1
+master-bin.000001 1278 Query 1 1355 use `test`; drop table t1
+master-bin.000001 1355 Rotate 1 1399 master-bin.000002;pos=4
show binlog events in 'master-bin.000002';
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000002 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4
-master-bin.000002 102 Query 1 188 use `test`; create table t5 (a int)
-master-bin.000002 188 Query 1 264 use `test`; drop table t5
-master-bin.000002 264 Query 1 350 use `test`; create table t1 (n int)
-master-bin.000002 350 Query 1 438 use `test`; insert into t1 values (1)
-master-bin.000002 438 Query 1 514 use `test`; drop table t1
+master-bin.000002 102 Query 1 189 use `test`; create table t5 (a int)
+master-bin.000002 189 Query 1 266 use `test`; drop table t5
+master-bin.000002 266 Query 1 353 use `test`; create table t1 (n int)
+master-bin.000002 353 Query 1 442 use `test`; insert into t1 values (1)
+master-bin.000002 442 Query 1 519 use `test`; drop table t1
show binary logs;
Log_name
master-bin.000001
@@ -79,25 +79,25 @@
show binlog events in 'slave-bin.000001' from 4;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 4 Format_desc 2 102 Server ver: VERSION, Binlog ver: 4
-slave-bin.000001 102 Query 1 223 use `test`; create table t1(n int not null auto_increment primary key)
-slave-bin.000001 223 Intvar 1 251 INSERT_ID=1
-slave-bin.000001 251 Query 1 342 use `test`; insert into t1 values (NULL)
-slave-bin.000001 342 Query 1 418 use `test`; drop table t1
-slave-bin.000001 418 Query 1 521 use `test`; create table t1 (word char(20) not null)
-slave-bin.000001 521 Begin_load_query 1 1125 ;file_id=1;block_len=581
-slave-bin.000001 1125 Execute_load_query 1 1282 use `test`; load data INFILE '../../var/tmp/SQL_LOAD-2-1-1.data' INTO table t1 ignore 1 lines ;file_id=1
-slave-bin.000001 1282 Query 1 1358 use `test`; drop table t1
-slave-bin.000001 1358 Query 1 1444 use `test`; create table t5 (a int)
-slave-bin.000001 1444 Query 1 1520 use `test`; drop table t5
-slave-bin.000001 1520 Rotate 2 1563 slave-bin.000002;pos=4
+slave-bin.000001 102 Query 1 224 use `test`; create table t1(n int not null auto_increment primary key)
+slave-bin.000001 224 Intvar 1 252 INSERT_ID=1
+slave-bin.000001 252 Query 1 344 use `test`; insert into t1 values (NULL)
+slave-bin.000001 344 Query 1 421 use `test`; drop table t1
+slave-bin.000001 421 Query 1 525 use `test`; create table t1 (word char(20) not null)
+slave-bin.000001 525 Begin_load_query 1 1129 ;file_id=1;block_len=581
+slave-bin.000001 1129 Execute_load_query 1 1287 use `test`; load data INFILE '../../var/tmp/SQL_LOAD-2-1-1.data' INTO table t1 ignore 1 lines ;file_id=1
+slave-bin.000001 1287 Query 1 1364 use `test`; drop table t1
+slave-bin.000001 1364 Query 1 1451 use `test`; create table t5 (a int)
+slave-bin.000001 1451 Query 1 1528 use `test`; drop table t5
+slave-bin.000001 1528 Rotate 2 1571 slave-bin.000002;pos=4
show binlog events in 'slave-bin.000002' from 4;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000002 4 Format_desc 2 102 Server ver: VERSION, Binlog ver: 4
-slave-bin.000002 102 Query 1 188 use `test`; create table t1 (n int)
-slave-bin.000002 188 Query 1 276 use `test`; insert into t1 values (1)
-slave-bin.000002 276 Query 1 352 use `test`; drop table t1
+slave-bin.000002 102 Query 1 189 use `test`; create table t1 (n int)
+slave-bin.000002 189 Query 1 278 use `test`; insert into t1 values (1)
+slave-bin.000002 278 Query 1 355 use `test`; drop table t1
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 514 # # master-bin.000002 Yes Yes 0 0 514 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 519 # # master-bin.000002 Yes Yes 0 0 519 # None 0 No #
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
| Thread |
|---|
| • bk commit into 5.1 tree (mats:1.1807) | Mats Kindahl | 18 Apr |
