changed syntax from SHOW MASTER LOGS to SHOW BINARY LOGS

7 files changed, 27 insertions, 13 deletions

diff --git a/mysql-test/r/rpl000018.result b/mysql-test/r/rpl000018.result
index 66dda4e29a5..cb93993a6b3 100644
--- a/mysql-test/r/rpl000018.result
+++ b/mysql-test/r/rpl000018.result
@@ -1,6 +1,6 @@
 reset slave;
 start slave;
-show master logs;
+show binary logs;
 Log_name
 master-bin.001
 master-bin.002
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result
index 79093a4ae7a..764d8eaeaa4 100644
--- a/mysql-test/r/rpl_log.result
+++ b/mysql-test/r/rpl_log.result
@@ -59,12 +59,12 @@ Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
 master-bin.002	4	Query	1	4	use `test`; create table t1 (n int)
 master-bin.002	62	Query	1	62	use `test`; insert into t1 values (1)
 master-bin.002	122	Query	1	122	use `test`; drop table t1
-show master logs;
+show binary logs;
 Log_name
 master-bin.001
 master-bin.002
 start slave;
-show master logs;
+show binary logs;
 Log_name
 slave-bin.001
 slave-bin.002
diff --git a/mysql-test/r/rpl_rotate_logs.result b/mysql-test/r/rpl_rotate_logs.result
index 26e4e79d62b..42733915d56 100644
--- a/mysql-test/r/rpl_rotate_logs.result
+++ b/mysql-test/r/rpl_rotate_logs.result
@@ -25,7 +25,7 @@ drop table if exists t2;
 create table t2(m int not null auto_increment primary key);
 insert into t2 values (34),(67),(123);
 flush logs;
-show master logs;
+show binary logs;
 Log_name
 master-bin.001
 master-bin.002
@@ -41,7 +41,7 @@ insert into t2 values(NULL);
 set global sql_slave_skip_counter=1;
 start slave;
 purge master logs to 'master-bin.003';
-show master logs;
+show binary logs;
 Log_name
 master-bin.003
 insert into t2 values (65);
@@ -60,7 +60,7 @@ insert into temp_table values ("testing temporary tables part 2");
 drop table if exists t3;
 create table t3 (n int);
 create table t4 select * from temp_table;
-show master logs;
+show binary logs;
 Log_name
 master-bin.003
 master-bin.004
diff --git a/mysql-test/t/rpl000018.test b/mysql-test/t/rpl000018.test
index f82f365a35e..e992f7938eb 100644
--- a/mysql-test/t/rpl000018.test
+++ b/mysql-test/t/rpl000018.test
@@ -12,7 +12,7 @@ connection slave;
 reset slave;
 start slave;
 connection master;
-show master logs;
+show binary logs;
 drop table if exists t1;
 create table t1(n int);
 insert into t1 values (3351);
diff --git a/mysql-test/t/rpl_log.test b/mysql-test/t/rpl_log.test
index 604b076f433..729f8b06e18 100644
--- a/mysql-test/t/rpl_log.test
+++ b/mysql-test/t/rpl_log.test
@@ -40,12 +40,12 @@ drop table t1;
 --replace_result $VERSION VERSION
 show binlog events;
 show binlog events in 'master-bin.002';
-show master logs;
+show binary logs;
 save_master_pos;
 connection slave;
 start slave;
 sync_with_master;
-show master logs;
+show binary logs;
 --replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT $VERSION VERSION
 show binlog events in 'slave-bin.001' from 4;
 --replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT $VERSION VERSION
diff --git a/mysql-test/t/rpl_rotate_logs.test b/mysql-test/t/rpl_rotate_logs.test
index 95bc36643e3..ad584c334b8 100644
--- a/mysql-test/t/rpl_rotate_logs.test
+++ b/mysql-test/t/rpl_rotate_logs.test
@@ -50,7 +50,7 @@ drop table if exists t2;
 create table t2(m int not null auto_increment primary key);
 insert into t2 values (34),(67),(123);
 flush logs;
-show master logs;
+show binary logs;
 create table t3 select * from temp_table;
 
 sync_slave_with_master;
@@ -87,7 +87,7 @@ connection master;
 sync_slave_with_master;
 connection master;
 purge master logs to 'master-bin.003';
-show master logs;
+show binary logs;
 insert into t2 values (65);
 sync_slave_with_master;
 --replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
@@ -113,7 +113,7 @@ while ($1)
 }
 enable_query_log;
 create table t4 select * from temp_table;
-show master logs;
+show binary logs;
 show master status;
 save_master_pos;
 connection slave;
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index e839956d0f2..6786bdf9772 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1426,6 +1426,20 @@ slave:
            lex->sql_command = SQLCOM_SLAVE_STOP;
 	   lex->type = 0;
          };
+         |
+	SLAVE START_SYM slave_thread_opts
+         {
+	   LEX *lex=Lex;
+           lex->sql_command = SQLCOM_SLAVE_START;
+	   lex->type = 0;
+         }
+         |
+	SLAVE STOP_SYM slave_thread_opts
+         {
+	   LEX *lex=Lex;
+           lex->sql_command = SQLCOM_SLAVE_STOP;
+	   lex->type = 0;
+         };
 
 slave_thread_opts:
 	slave_thread_opt
@@ -2961,7 +2975,7 @@ show_param:
 	    Lex->mi.pos = $12;
 	    Lex->mi.server_id = $16;
           }
-        | MASTER_SYM LOGS_SYM
+        | BINARY LOGS_SYM
           {
 	    Lex->sql_command = SQLCOM_SHOW_BINLOGS;
           }