diff options
| author | dlenev@mysql.com <> | 2003-09-01 16:14:54 +0400 |
|---|---|---|
| committer | dlenev@mysql.com <> | 2003-09-01 16:14:54 +0400 |
| commit | 73ab4be246dd8c0dac3c68065f4977d01adb6383 (patch) | |
| tree | 0b20b02505735c5ed244512265fcc8f74c3f6de2 /mysql-test/r/rpl_replicate_do.result | |
| parent | fe98e58037ca0604414a668f51cff95bf4953cab (diff) | |
| parent | 2486222cd2192418b7bdcbf89a42d77e698f1899 (diff) | |
| download | mariadb-git-73ab4be246dd8c0dac3c68065f4977d01adb6383.tar.gz | |
Manual merge fixes
Diffstat (limited to 'mysql-test/r/rpl_replicate_do.result')
| -rw-r--r-- | mysql-test/r/rpl_replicate_do.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/rpl_replicate_do.result b/mysql-test/r/rpl_replicate_do.result index ad92ee5b491..a2cafd67a67 100644 --- a/mysql-test/r/rpl_replicate_do.result +++ b/mysql-test/r/rpl_replicate_do.result @@ -27,5 +27,5 @@ select * from t11; ERROR 42S02: Table 'test.t11' doesn't exist drop table if exists t1,t2,t11; show slave status; -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 -127.0.0.1 root MASTER_PORT 1 master-bin.000001 1281 slave-relay-bin.000002 1325 master-bin.000001 Yes Yes test.t1 0 0 1281 1325 +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 Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key +127.0.0.1 root MASTER_PORT 1 master-bin.000001 1281 slave-relay-bin.000002 1325 master-bin.000001 Yes Yes test.t1 0 0 1281 1325 No |