bk commit into 5.1 tree (sven:1.2562) BUG#36625

[Sven Sandberg]

Below is the list of changes that have just been committed into a local
5.1 repository of sven.  When sven 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@stripped, 2008-05-15 21:19:58+02:00, sven@riska.(none) +3 -0
  BUG#36625: Please remove the rpl_probe and rpl_parse features from the server
  The rpl_probe and rpl_parse features were abandoned in 2003 but traces of
  them still remain in the server and in the test language. This fix removes
  a test case that tested the feature, and un-exposes the features to the
  test language.

  BitKeeper/deleted/.del-rpl_redirect.result@stripped, 2008-05-15 16:18:38+02:00,
sven@riska.(none) +0 -0
    Delete: mysql-test/suite/rpl/r/rpl_redirect.result

  BitKeeper/deleted/.del-rpl_redirect.test@stripped, 2008-05-15 16:18:38+02:00,
sven@riska.(none) +0 -0
    Delete: mysql-test/suite/rpl/t/rpl_redirect.test

  client/mysqltest.c@stripped, 2008-05-15 21:19:54+02:00, sven@riska.(none) +1 -31
    Removing the rpl_probe, enable_rpl_parse, and disable_rpl_parse commands
    from the test language.

diff -Nrup a/client/mysqltest.c b/client/mysqltest.c
--- a/client/mysqltest.c	2008-03-30 13:12:23 +02:00
+++ b/client/mysqltest.c	2008-05-15 21:19:54 +02:00
@@ -247,8 +247,7 @@ enum enum_commands {
   Q_SEND,		    Q_REAP,
   Q_DIRTY_CLOSE,	    Q_REPLACE, Q_REPLACE_COLUMN,
   Q_PING,		    Q_EVAL,
-  Q_RPL_PROBE,	    Q_ENABLE_RPL_PARSE,
-  Q_DISABLE_RPL_PARSE, Q_EVAL_RESULT,
+  Q_EVAL_RESULT,
   Q_ENABLE_QUERY_LOG, Q_DISABLE_QUERY_LOG,
   Q_ENABLE_RESULT_LOG, Q_DISABLE_RESULT_LOG,
   Q_WAIT_FOR_SLAVE_TO_STOP,
@@ -304,9 +303,6 @@ const char *command_names[]=
   "replace_column",
   "ping",
   "eval",
-  "rpl_probe",
-  "enable_rpl_parse",
-  "disable_rpl_parse",
   "eval_result",
   /* Enable/disable that the _query_ is logged to result file */
   "enable_query_log",
@@ -3655,29 +3651,6 @@ void do_let(struct st_command *command)
 }
 
 
-int do_rpl_probe(struct st_command *command __attribute__((unused)))
-{
-  DBUG_ENTER("do_rpl_probe");
-  if (mysql_rpl_probe(&cur_con->mysql))
-    die("Failed in mysql_rpl_probe(): '%s'", mysql_error(&cur_con->mysql));
-  DBUG_RETURN(0);
-}
-
-
-int do_enable_rpl_parse(struct st_command *command __attribute__((unused)))
-{
-  mysql_enable_rpl_parse(&cur_con->mysql);
-  return 0;
-}
-
-
-int do_disable_rpl_parse(struct st_command *command __attribute__((unused)))
-{
-  mysql_disable_rpl_parse(&cur_con->mysql);
-  return 0;
-}
-
-
 /*
   Sleep the number of specified seconds
 
@@ -6999,9 +6972,6 @@ int main(int argc, char **argv)
       case Q_DISCONNECT:
       case Q_DIRTY_CLOSE:
 	do_close_connection(command); break;
-      case Q_RPL_PROBE: do_rpl_probe(command); break;
-      case Q_ENABLE_RPL_PARSE:	 do_enable_rpl_parse(command); break;
-      case Q_DISABLE_RPL_PARSE:  do_disable_rpl_parse(command); break;
       case Q_ENABLE_QUERY_LOG:   disable_query_log=0; break;
       case Q_DISABLE_QUERY_LOG:  disable_query_log=1; break;
       case Q_ENABLE_ABORT_ON_ERROR:  abort_on_error=1; break;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_redirect.result
b/mysql-test/suite/rpl/r/rpl_redirect.result
--- a/mysql-test/suite/rpl/r/rpl_redirect.result	2007-06-27 14:28:29 +02:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,40 +0,0 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
-SHOW SLAVE STATUS;
-SHOW SLAVE HOSTS;
-Server_id	Host	Port	Rpl_recovery_rank	Master_id
-2	127.0.0.1	SLAVE_PORT	2	1
-create table t1 ( n int);
-insert into t1 values (1),(2),(3),(4);
-insert into t1 values(5);
-SELECT * FROM t1 ORDER BY n;
-n
-1
-2
-3
-4
-5
-SELECT * FROM t1 ORDER BY n;
-n
-1
-2
-3
-4
-SELECT * FROM t1 ORDER BY n;
-n
-1
-2
-3
-4
-SELECT * FROM t1 ORDER BY n;
-n
-1
-2
-3
-4
-5
-drop table t1;
diff -Nrup a/mysql-test/suite/rpl/t/rpl_redirect.test
b/mysql-test/suite/rpl/t/rpl_redirect.test
--- a/mysql-test/suite/rpl/t/rpl_redirect.test	2007-06-27 14:28:29 +02:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,45 +0,0 @@
-#
-# Test of automatic redirection of queries to master/slave.
-# 
-
-source include/master-slave.inc;
-# We disable this for now as PS doesn't handle redirection
---disable_ps_protocol
-
-#first, make sure the slave has had enough time to register
-save_master_pos;
-connection slave;
-sync_with_master;
-
-#discover slaves
-connection master;
-source include/show_slave_status.inc;
---replace_result $SLAVE_MYPORT SLAVE_PORT
-SHOW SLAVE HOSTS;
-rpl_probe;
-
-#turn on master/slave query direction auto-magic
-enable_rpl_parse;
-create table t1 ( n int);
-insert into t1 values (1),(2),(3),(4);
-disable_rpl_parse;
-save_master_pos;
-connection slave;
-sync_with_master;
-insert into t1 values(5);
-connection master;
-enable_rpl_parse;
-# The first of the queries will be sent to the slave, the second to the master.
-SELECT * FROM t1 ORDER BY n;
-SELECT * FROM t1 ORDER BY n;
-disable_rpl_parse;
-SELECT * FROM t1 ORDER BY n;
-connection slave;
-SELECT * FROM t1 ORDER BY n;
-
-# Cleanup
-connection master;
-drop table t1;
-sync_slave_with_master;
-
-# End of 4.1 tests