bk commit into 5.1 tree (rsomla:1.2307)

[rsomla]

Below is the list of changes that have just been committed into a local
5.1 repository of rsomla. When rsomla 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, 2006-10-16 16:20:12+02:00, rsomla@stripped +11 -0
  temporary patch, please ignore

  mysql-test/mysql-test-run.pl@stripped, 2006-10-16 16:18:08+02:00, rsomla@stripped
+2 -2
    temporary patch, please ignore

  mysql-test/mysql-test-run.sh@stripped, 2006-10-16 16:18:08+02:00, rsomla@stripped
+3 -3
    temporary patch, please ignore

  mysql-test/t/variables.test@stripped, 2006-10-16 16:18:09+02:00, rsomla@stripped +3
-3
    temporary patch, please ignore

  netware/mysql_test_run.c@stripped, 2006-10-16 16:18:09+02:00, rsomla@stripped +2 -2
    temporary patch, please ignore

  sql/mysql_priv.h@stripped, 2006-10-16 16:18:09+02:00, rsomla@stripped +2 -1
    temporary patch, please ignore

  sql/mysqld.cc@stripped, 2006-10-16 16:18:09+02:00, rsomla@stripped +4 -4
    temporary patch, please ignore

  sql/repl_failsafe.cc@stripped, 2006-10-16 16:18:09+02:00, rsomla@stripped +7 -7
    temporary patch, please ignore

  sql/set_var.cc@stripped, 2006-10-16 16:18:09+02:00, rsomla@stripped +3 -3
    temporary patch, please ignore

  sql/slave.cc@stripped, 2006-10-16 16:18:09+02:00, rsomla@stripped +1 -1
    temporary patch, please ignore

  sql/sql_repl.cc@stripped, 2006-10-16 16:18:09+02:00, rsomla@stripped +90 -0
    temporary patch, please ignore

  sql/sql_repl.h@stripped, 2006-10-16 16:18:10+02:00, rsomla@stripped +2 -1
    temporary patch, please ignore

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	rsomla
# Host:	dl145k.mysql.com
# Root:	/users/rsomla/bk/mysql-5.1-rpl-bug21869

--- 1.330/mysql-test/mysql-test-run.sh	2006-10-16 16:20:25 +02:00
+++ 1.331/mysql-test/mysql-test-run.sh	2006-10-16 16:20:25 +02:00
@@ -47,7 +47,7 @@ esac
 LC_COLLATE=C
 export LC_COLLATE
 PATH=/bin:/usr/bin:/usr/local/bin:/usr/bsd:/usr/X11R6/bin:/usr/openwin/bin:/usr/bin/X11:$PATH
-MASTER_40_ARGS="--rpl-recovery-rank=1 --init-rpl-role=master"
+MASTER_40_ARGS="--init-rpl-role=master"
 
 # Standard functions
 
@@ -1357,7 +1357,7 @@ start_master()
            $NOT_FIRST_MASTER_EXTRA_OPTS $CURR_MASTER_MYSQLD_TRACE"
   else
     master_args="--no-defaults \
-          --server-id=$id --rpl-recovery-rank=1 \
+          --server-id=$id \
           --basedir=$MY_BASEDIR --init-rpl-role=master \
           --port=$this_master_myport \
           --port-open-timeout=380 \
@@ -1511,7 +1511,7 @@ start_slave()
           --master-host=127.0.0.1 \
           --master-password="" \
           --master-port=$MASTER_MYPORT \
-          --server-id=$slave_server_id --rpl-recovery-rank=$slave_rpl_rank"
+          --server-id=$slave_server_id"
  else
    master_info=$SLAVE_MASTER_INFO
  fi

--- 1.433/sql/mysql_priv.h	2006-10-16 16:20:25 +02:00
+++ 1.434/sql/mysql_priv.h	2006-10-16 16:20:25 +02:00
@@ -1532,7 +1532,8 @@ extern ulong max_binlog_size, max_relay_
 #ifdef HAVE_ROW_BASED_REPLICATION
 extern ulong opt_binlog_rows_event_max_size;
 #endif
-extern ulong rpl_recovery_rank, thread_cache_size;
+// extern ulong rpl_recovery_rank, 
+extern ulong thread_cache_size;
 extern ulong back_log;
 extern ulong specialflag, current_pid;
 extern ulong expire_logs_days, sync_binlog_period, sync_binlog_counter;

--- 1.581/sql/mysqld.cc	2006-10-16 16:20:25 +02:00
+++ 1.582/sql/mysqld.cc	2006-10-16 16:20:25 +02:00
@@ -489,7 +489,7 @@ ulong prepared_stmt_count=0;
 ulong thread_id=1L,current_pid;
 ulong slow_launch_threads = 0, sync_binlog_period;
 ulong expire_logs_days = 0;
-ulong rpl_recovery_rank=0;
+// ulong rpl_recovery_rank=0;
 const char *log_output_str= "TABLE";
 
 double log_10[32];			/* 10 potences */
@@ -5511,9 +5511,9 @@ Can't be set to 1 if --log-slave-updates
    MYSQL_PORT, 0, 0, 0, 0, 0},
   {"report-user", OPT_REPORT_USER, "Undocumented.", (gptr*) &report_user,
    (gptr*) &report_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"rpl-recovery-rank", OPT_RPL_RECOVERY_RANK, "Undocumented.",
-   (gptr*) &rpl_recovery_rank, (gptr*) &rpl_recovery_rank, 0, GET_ULONG,
-   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+ // {"rpl-recovery-rank", OPT_RPL_RECOVERY_RANK, "Undocumented.",
+ //  (gptr*) &rpl_recovery_rank, (gptr*) &rpl_recovery_rank, 0, GET_ULONG,
+ //  REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"safe-mode", OPT_SAFE, "Skip some optimize stages (for testing).",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
 #ifndef TO_BE_DELETED

--- 1.282/sql/slave.cc	2006-10-16 16:20:25 +02:00
+++ 1.283/sql/slave.cc	2006-10-16 16:20:25 +02:00
@@ -2112,7 +2112,7 @@ int register_slave_on_master(MYSQL* mysq
   pos= net_store_data(pos, report_user, report_user_len);
   pos= net_store_data(pos, report_password, report_password_len);
   int2store(pos, (uint16) report_port); pos+= 2;
-  int4store(pos, rpl_recovery_rank);    pos+= 4;
+//  int4store(pos, rpl_recovery_rank);    pos+= 4;
   /* The master will fill in master_id */
   int4store(pos, 0);                    pos+= 4;
 

--- 1.21/netware/mysql_test_run.c	2006-10-16 16:20:25 +02:00
+++ 1.22/netware/mysql_test_run.c	2006-10-16 16:20:25 +02:00
@@ -362,7 +362,7 @@ void start_master()
   }
 
   // $MASTER_40_ARGS
-  add_arg(&al, "--rpl-recovery-rank=1");
+  //add_arg(&al, "--rpl-recovery-rank=1");
   add_arg(&al, "--init-rpl-role=master");
 
   // $SMALL_SERVER
@@ -559,7 +559,7 @@ void start_slave()
     add_arg(&al, "--master-port=%u", master_port);
     add_arg(&al, "--master-connect-retry=1");
     add_arg(&al, "--server-id=2");
-    add_arg(&al, "--rpl-recovery-rank=2");
+    //add_arg(&al, "--rpl-recovery-rank=2");
   }
   
   // small server

--- 1.155/mysql-test/mysql-test-run.pl	2006-10-16 16:20:25 +02:00
+++ 1.156/mysql-test/mysql-test-run.pl	2006-10-16 16:20:25 +02:00
@@ -2729,7 +2729,7 @@ sub mysqld_arguments ($$$$$) {
       mtr_add_arg($args, "%s--master-port=%d", $prefix,
                   $master->[0]->{'port'}); # First master
       mtr_add_arg($args, "%s--server-id=%d", $prefix, $slave_server_id);
-      mtr_add_arg($args, "%s--rpl-recovery-rank=%d", $prefix, $slave_rpl_rank);
+#      mtr_add_arg($args, "%s--rpl-recovery-rank=%d", $prefix, $slave_rpl_rank);
     }
 
     if ( $opt_skip_ndbcluster_slave ||
@@ -2803,7 +2803,7 @@ sub mysqld_arguments ($$$$$) {
 
   if ( $opt_bench )
   {
-    mtr_add_arg($args, "%s--rpl-recovery-rank=1", $prefix);
+#    mtr_add_arg($args, "%s--rpl-recovery-rank=1", $prefix);
     mtr_add_arg($args, "%s--init-rpl-role=master", $prefix);
   }
   elsif ( $type eq 'master' )

--- 1.61/mysql-test/t/variables.test	2006-10-16 16:20:25 +02:00
+++ 1.62/mysql-test/t/variables.test	2006-10-16 16:20:25 +02:00
@@ -30,7 +30,7 @@ set @my_net_write_timeout         =@@glo
 set @my_net_read_timeout          =@@global.net_read_timeout;
 set @my_query_cache_limit         =@@global.query_cache_limit;
 set @my_query_cache_type          =@@global.query_cache_type;
-set @my_rpl_recovery_rank         =@@global.rpl_recovery_rank;
+# set @my_rpl_recovery_rank         =@@global.rpl_recovery_rank;
 set @my_server_id                 =@@global.server_id;
 set @my_slow_launch_time          =@@global.slow_launch_time;
 set @my_storage_engine            =@@global.storage_engine;
@@ -265,7 +265,7 @@ set global query_cache_size=100;
 set global query_cache_type=demand;
 set read_buffer_size=100;
 set read_rnd_buffer_size=100;
-set global rpl_recovery_rank=100;
+# set global rpl_recovery_rank=100;
 set global server_id=100;
 set global slow_launch_time=100;
 set sort_buffer_size=100;
@@ -615,7 +615,7 @@ set global net_write_timeout         =@m
 set global net_read_timeout          =@my_net_read_timeout;
 set global query_cache_limit         =@my_query_cache_limit;
 set global query_cache_type          =@my_query_cache_type;
-set global rpl_recovery_rank         =@my_rpl_recovery_rank;
+# set global rpl_recovery_rank         =@my_rpl_recovery_rank;
 set global server_id                 =@my_server_id;
 set global slow_launch_time          =@my_slow_launch_time;
 set global storage_engine            =@my_storage_engine;

--- 1.189/sql/set_var.cc	2006-10-16 16:20:25 +02:00
+++ 1.190/sql/set_var.cc	2006-10-16 16:20:25 +02:00
@@ -380,8 +380,8 @@ sys_var_thd_ulong	sys_div_precincrement(
 sys_var_bool_ptr	sys_relay_log_purge("relay_log_purge",
                                             &relay_log_purge);
 #endif
-sys_var_long_ptr	sys_rpl_recovery_rank("rpl_recovery_rank",
-					      &rpl_recovery_rank);
+//sys_var_long_ptr	sys_rpl_recovery_rank("rpl_recovery_rank",
+//					      &rpl_recovery_rank);
 sys_var_long_ptr	sys_query_cache_size("query_cache_size",
 					     &query_cache_size,
 					     fix_query_cache_size);
@@ -981,7 +981,7 @@ SHOW_VAR init_vars[]= {
   {sys_relay_log_purge.name,  (char*) &sys_relay_log_purge,         SHOW_SYS},
   {"relay_log_space_limit",  (char*) &relay_log_space_limit,        SHOW_LONGLONG},
 #endif
-  {sys_rpl_recovery_rank.name,(char*) &sys_rpl_recovery_rank,       SHOW_SYS},
+// {sys_rpl_recovery_rank.name,(char*) &sys_rpl_recovery_rank,       SHOW_SYS},
   {"secure_auth",             (char*) &sys_secure_auth,             SHOW_SYS},
 #ifdef HAVE_SMEM
   {"shared_memory",           (char*) &opt_enable_shared_memory,    SHOW_MY_BOOL},

--- 1.66/sql/repl_failsafe.cc	2006-10-16 16:20:25 +02:00
+++ 1.67/sql/repl_failsafe.cc	2006-10-16 16:20:25 +02:00
@@ -171,12 +171,12 @@ int register_slave(THD* thd, uchar* pack
   get_object(p,si->host);
   get_object(p,si->user);
   get_object(p,si->password);
-  if (p+10 > p_end)
+  if (p+6 > p_end)
     goto err;
   si->port= uint2korr(p);
   p += 2;
-  si->rpl_recovery_rank= uint4korr(p);
-  p += 4;
+//  si->rpl_recovery_rank= uint4korr(p);
+//  p += 4;
   if (!(si->master_id= uint4korr(p)))
     si->master_id= server_id;
   si->thd= thd;
@@ -549,7 +549,7 @@ HOSTS";
     }
     strmake(si->host, row[1], sizeof(si->host)-1);
     si->port = atoi(row[port_ind]);
-    si->rpl_recovery_rank = atoi(row[port_ind+1]);
+ //   si->rpl_recovery_rank = atoi(row[port_ind+1]);
     si->master_id = atoi(row[port_ind+2]);
     if (have_auth_info)
     {
@@ -643,8 +643,8 @@ bool show_slave_hosts(THD* thd)
     field_list.push_back(new Item_empty_string("Password",20));
   }
   field_list.push_back(new Item_return_int("Port", 7, MYSQL_TYPE_LONG));
-  field_list.push_back(new Item_return_int("Rpl_recovery_rank", 7,
-					   MYSQL_TYPE_LONG));
+//  field_list.push_back(new Item_return_int("Rpl_recovery_rank", 7,
+//					   MYSQL_TYPE_LONG));
   field_list.push_back(new Item_return_int("Master_id", 10,
 					   MYSQL_TYPE_LONG));
 
@@ -666,7 +666,7 @@ bool show_slave_hosts(THD* thd)
       protocol->store(si->password, &my_charset_bin);
     }
     protocol->store((uint32) si->port);
-    protocol->store((uint32) si->rpl_recovery_rank);
+//    protocol->store((uint32) si->rpl_recovery_rank);
     protocol->store((uint32) si->master_id);
     if (protocol->write())
     {

--- 1.154/sql/sql_repl.cc	2006-10-16 16:20:25 +02:00
+++ 1.155/sql/sql_repl.cc	2006-10-16 16:20:25 +02:00
@@ -1586,6 +1586,96 @@ int log_loaded_block(IO_CACHE* file)
   return 0;
 }
 
+
+bool
+SLAVE_INFO::send(Protocol &protocol, bool include_auth=true) 
+{ 
+  protocol.prepare_for_resend();
+  protocol.store((uint32) server_id);
+  protocol.store(host, &my_charset_bin);
+  
+  if (include_auth)
+  {
+    protocol.store(user, &my_charset_bin);
+    protocol.store(password, &my_charset_bin);
+  };
+  
+  protocol.store((uint32) port);
+  protocol.store((uint32) master_id;
+  
+  return protocol.write()
+}
+
+void
+SLAVE_INFO::read(MYSQL_ROW &row, bool have_auth=true)
+{
+  unsigned col=0;
+  
+  server_id = atoi(row[col++]);
+  strmake(host, row[col++], sizeof(host)-1);
+  if (have_auth)
+  {
+    strmake(user, row[col++], sizeof(user)-1);
+    strmake(password, row[col++], sizeof(password)-1);
+  }  
+  port = atoi(row[col++]);
+  master_id = atoi(row[col++]);
+}
+
+int
+SLAVE_INFO::pack(uchar *buf, uint len)
+{
+  uint report_host_len, report_user_len=0, report_password_len=0;
+  DBUG_ENTER("register_slave_on_master");
+
+  if (!report_host)
+    DBUG_RETURN(0);
+  report_host_len= strlen(report_host);
+  if (report_user)
+    report_user_len= strlen(report_user);
+  if (report_password)
+    report_password_len= strlen(report_password);
+  /* 30 is a good safety margin */
+  if (report_host_len + report_user_len + report_password_len + 30 >
+      sizeof(buf))
+    DBUG_RETURN(0);                                     // safety
+
+  int4store(pos, server_id); pos+= 4;
+  pos= net_store_data(pos, report_host, report_host_len);
+  pos= net_store_data(pos, report_user, report_user_len);
+  pos= net_store_data(pos, report_password, report_password_len);
+  int2store(pos, (uint16) report_port); pos+= 2;
+//  int4store(pos, rpl_recovery_rank);    pos+= 4;
+  /* The master will fill in master_id */
+  int4store(pos, 0);                    pos+= 4;
+
+
+}
+
+int
+SLAVE_INFO::unpack(uchar *packet, uint lenght)
+{
+  uchar *p= packet, *p_end= packet + length;
+  uint  slen;
+
+#define checkp(N)       if( p+N > p_end) goto err
+#define get_string(buf) { slen= (uint)*p++; checkp(slen); \
+                          if( slen > sizeof(buf) ) goto err; \
+                          strmake(buf,(char*) p, slen); p+= slen }
+  
+  checkp(4); server_id= uint4korr(p); p+= 4;
+  get_string(host);
+  get_string(user);
+  get_string(password);
+  checkp(2); port= uint2korr(p); p += 2;
+  checkp(4); master_id= uint4korr(p); p+= 4;
+  
+  return 0;
+  
+ err:
+  return 1; 
+}
+
 #endif /* HAVE_REPLICATION */
 
 

--- 1.40/sql/sql_repl.h	2006-10-16 16:20:25 +02:00
+++ 1.41/sql/sql_repl.h	2006-10-16 16:20:25 +02:00
@@ -22,7 +22,8 @@
 typedef struct st_slave_info
 {
   uint32 server_id;
-  uint32 rpl_recovery_rank, master_id;
+  //uint32 rpl_recovery_rank, 
+  uint32 master_id;
   char host[HOSTNAME_LENGTH+1];
   char user[USERNAME_LENGTH+1];
   char password[MAX_PASSWORD_LENGTH+1];