diff options
| author | unknown <paul@ice.snake.net> | 2003-11-20 13:49:05 -0600 |
|---|---|---|
| committer | unknown <paul@ice.snake.net> | 2003-11-20 13:49:05 -0600 |
| commit | c9a9fa8e479764ef1c5a9351f7336a4513197277 (patch) | |
| tree | 7058f5338e7f59bc627c6bace7c11421b1393358 /sql | |
| parent | 8a8fef225d5299c941ddac73de050092d6d2b903 (diff) | |
| download | mariadb-git-c9a9fa8e479764ef1c5a9351f7336a4513197277.tar.gz | |
Use same style for SHOW MASTER STATUS fields as
for SHOW SLAVE STATUS.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/repl_failsafe.cc | 2 | ||||
| -rw-r--r-- | sql/sql_repl.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index aba887be070..4ff08fd1d14 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -254,7 +254,7 @@ static int find_target_pos(LEX_MASTER_INFO *mi, IO_CACHE *log, char *errmsg) it is reworked. Event's log_pos used to be preserved through log-slave-updates to make code in repl_failsafe.cc work (this function, SHOW NEW MASTER); but on the other side it caused unexpected - values in Exec_master_log_pos in A->B->C replication setup, + values in Exec_Master_Log_Pos in A->B->C replication setup, synchronization problems in master_pos_wait(), ... So we (Dmitri & Guilhem) removed it. diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index ecad84ba0cb..16996107c65 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1251,8 +1251,8 @@ int show_binlog_info(THD* thd) field_list.push_back(new Item_empty_string("File", FN_REFLEN)); field_list.push_back(new Item_return_int("Position",20, MYSQL_TYPE_LONGLONG)); - field_list.push_back(new Item_empty_string("Binlog_do_db",255)); - field_list.push_back(new Item_empty_string("Binlog_ignore_db",255)); + field_list.push_back(new Item_empty_string("Binlog_Do_DB",255)); + field_list.push_back(new Item_empty_string("Binlog_Ignore_DB",255)); if (protocol->send_fields(&field_list, 1)) DBUG_RETURN(-1); |