diff options
| -rw-r--r-- | client/mysqldump.c | 6 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/r/binlog_consistent.result | 16 | ||||
| -rw-r--r-- | mysql-test/suite/sphinx/sphinx.result | 13 | ||||
| -rw-r--r-- | sql/log.cc | 4 | ||||
| -rw-r--r-- | storage/sphinx/ha_sphinx.cc | 12 |
5 files changed, 24 insertions, 27 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 46d152f7ed1..a2f6087f09b 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2012, Oracle and/or its affiliates. - Copyright (c) 2010, 2012, Monty Program Ab. + Copyright (c) 2010, 2013, Monty Program Ab. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1182,13 +1182,13 @@ check_consistent_binlog_pos(char *binlog_pos_file, char *binlog_pos_offset) found= 0; while ((row= mysql_fetch_row(res))) { - if (0 == strcmp(row[0], "binlog_snapshot_file")) + if (0 == strcmp(row[0], "Binlog_snapshot_file")) { if (binlog_pos_file) strmake(binlog_pos_file, row[1], FN_REFLEN-1); found++; } - else if (0 == strcmp(row[0], "binlog_snapshot_position")) + else if (0 == strcmp(row[0], "Binlog_snapshot_position")) { if (binlog_pos_offset) strmake(binlog_pos_offset, row[1], LONGLONG_LEN); diff --git a/mysql-test/suite/innodb/r/binlog_consistent.result b/mysql-test/suite/innodb/r/binlog_consistent.result index 2e523c40a5b..c07719da297 100644 --- a/mysql-test/suite/innodb/r/binlog_consistent.result +++ b/mysql-test/suite/innodb/r/binlog_consistent.result @@ -6,8 +6,8 @@ File Position Binlog_Do_DB Binlog_Ignore_DB master-bin.000001 380 SHOW STATUS LIKE 'binlog_snapshot_%'; Variable_name Value -binlog_snapshot_file master-bin.000001 -binlog_snapshot_position 380 +Binlog_snapshot_file master-bin.000001 +Binlog_snapshot_position 380 BEGIN; INSERT INTO t1 VALUES (0, ""); # Connection con1 @@ -37,8 +37,8 @@ a b 0 SHOW STATUS LIKE 'binlog_snapshot_%'; Variable_name Value -binlog_snapshot_file master-bin.000001 -binlog_snapshot_position 904 +Binlog_snapshot_file master-bin.000001 +Binlog_snapshot_position 904 SHOW MASTER STATUS; File Position Binlog_Do_DB Binlog_Ignore_DB master-bin.000001 1316 @@ -59,16 +59,16 @@ a b 0 SHOW STATUS LIKE 'binlog_snapshot_%'; Variable_name Value -binlog_snapshot_file master-bin.000001 -binlog_snapshot_position 904 +Binlog_snapshot_file master-bin.000001 +Binlog_snapshot_position 904 SHOW MASTER STATUS; File Position Binlog_Do_DB Binlog_Ignore_DB master-bin.000002 245 COMMIT; SHOW STATUS LIKE 'binlog_snapshot_%'; Variable_name Value -binlog_snapshot_file master-bin.000002 -binlog_snapshot_position 245 +Binlog_snapshot_file master-bin.000002 +Binlog_snapshot_position 245 SHOW MASTER STATUS; File Position Binlog_Do_DB Binlog_Ignore_DB master-bin.000002 245 diff --git a/mysql-test/suite/sphinx/sphinx.result b/mysql-test/suite/sphinx/sphinx.result index a671028bbe2..82c76335e0b 100644 --- a/mysql-test/suite/sphinx/sphinx.result +++ b/mysql-test/suite/sphinx/sphinx.result @@ -48,15 +48,12 @@ SET optimizer_switch=@save_optimizer_switch; drop table ts; show status like "sphinx_error%"; Variable_name Value -sphinx_error_commits 0 -sphinx_error_group_commits 0 -sphinx_error_snapshot_file -sphinx_error_snapshot_position 0 +Sphinx_error OFF show status like "sphinx_total%"; Variable_name Value -sphinx_total 2 -sphinx_total_found 2 +Sphinx_total 2 +Sphinx_total_found 2 show status like "sphinx_word%"; Variable_name Value -sphinx_word_count 0 -sphinx_words +Sphinx_word_count 0 +Sphinx_words diff --git a/sql/log.cc b/sql/log.cc index 70e74de5a31..b7218615f58 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2011, Oracle and/or its affiliates. - Copyright (c) 2010-2011 Monty Program Ab + Copyright (c) 2010, 2013 Monty Program Ab This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -7665,7 +7665,7 @@ static int show_binlog_vars(THD *thd, SHOW_VAR *var, char *buff) } static SHOW_VAR binlog_status_vars_top[]= { - {"binlog", (char *) &show_binlog_vars, SHOW_FUNC}, + {"Binlog", (char *) &show_binlog_vars, SHOW_FUNC}, {NullS, NullS, SHOW_LONG} }; diff --git a/storage/sphinx/ha_sphinx.cc b/storage/sphinx/ha_sphinx.cc index 27a463bf61f..93cb43f3a92 100644 --- a/storage/sphinx/ha_sphinx.cc +++ b/storage/sphinx/ha_sphinx.cc @@ -3591,12 +3591,12 @@ struct st_mysql_storage_engine sphinx_storage_engine = struct st_mysql_show_var sphinx_status_vars[] = { - {"sphinx_total", (char *)sphinx_showfunc_total, SHOW_FUNC}, - {"sphinx_total_found", (char *)sphinx_showfunc_total_found, SHOW_FUNC}, - {"sphinx_time", (char *)sphinx_showfunc_time, SHOW_FUNC}, - {"sphinx_word_count", (char *)sphinx_showfunc_word_count, SHOW_FUNC}, - {"sphinx_words", (char *)sphinx_showfunc_words, SHOW_FUNC}, - {"sphinx_error", (char *)sphinx_showfunc_error, SHOW_FUNC}, + {"Sphinx_total", (char *)sphinx_showfunc_total, SHOW_FUNC}, + {"Sphinx_total_found", (char *)sphinx_showfunc_total_found, SHOW_FUNC}, + {"Sphinx_time", (char *)sphinx_showfunc_time, SHOW_FUNC}, + {"Sphinx_word_count", (char *)sphinx_showfunc_word_count, SHOW_FUNC}, + {"Sphinx_words", (char *)sphinx_showfunc_words, SHOW_FUNC}, + {"Sphinx_error", (char *)sphinx_showfunc_error, SHOW_FUNC}, {0, 0, (enum_mysql_show_type)0} }; |