List:Commits« Previous MessageNext Message »
From:Sven Sandberg Date:February 16 2011 5:24pm
Subject:bzr push into mysql-trunk branch (sven.sandberg:3657 to 3658) WL#5670
View as plain text  
 3658 Sven Sandberg	2011-02-16 [merge]
      Merged WL#5670 from 5.5 to trunk.

    modified:
      mysql-test/r/signal_code.result
      mysql-test/r/sp-code.result
      sql/mysqld.cc
      sql/rpl_master.cc
      sql/rpl_slave.h
      sql/sp_head.cc
      sql/sql_cmd.h
      sql/sql_lex.h
      sql/sql_parse.cc
      sql/sql_yacc.yy
 3657 Jon Olav Hauglid	2011-02-16 [merge]
      Merge from mysql-5.5 to mysql-trunk
      No conflicts

    modified:
      include/my_bit.h
      include/my_bitmap.h
      mysys/my_bitmap.c
      unittest/mysys/bitmap-t.c
=== modified file 'mysql-test/r/signal_code.result'
--- a/mysql-test/r/signal_code.result	2009-12-01 19:07:18 +0000
+++ b/mysql-test/r/signal_code.result	2011-02-16 16:27:35 +0000
@@ -20,16 +20,16 @@ return 0;
 end $$
 show procedure code signal_proc;
 Pos	Instruction
-0	stmt 131 "SIGNAL foo"
-1	stmt 131 "SIGNAL foo SET MESSAGE_TEXT = "This i..."
-2	stmt 132 "RESIGNAL foo"
-3	stmt 132 "RESIGNAL foo SET MESSAGE_TEXT = "This..."
+0	stmt 130 "SIGNAL foo"
+1	stmt 130 "SIGNAL foo SET MESSAGE_TEXT = "This i..."
+2	stmt 131 "RESIGNAL foo"
+3	stmt 131 "RESIGNAL foo SET MESSAGE_TEXT = "This..."
 drop procedure signal_proc;
 show function code signal_func;
 Pos	Instruction
-0	stmt 131 "SIGNAL foo"
-1	stmt 131 "SIGNAL foo SET MESSAGE_TEXT = "This i..."
-2	stmt 132 "RESIGNAL foo"
-3	stmt 132 "RESIGNAL foo SET MESSAGE_TEXT = "This..."
+0	stmt 130 "SIGNAL foo"
+1	stmt 130 "SIGNAL foo SET MESSAGE_TEXT = "This i..."
+2	stmt 131 "RESIGNAL foo"
+3	stmt 131 "RESIGNAL foo SET MESSAGE_TEXT = "This..."
 4	freturn 3 0
 drop function signal_func;

=== modified file 'mysql-test/r/sp-code.result'
--- a/mysql-test/r/sp-code.result	2010-07-30 15:28:36 +0000
+++ b/mysql-test/r/sp-code.result	2011-02-16 16:27:35 +0000
@@ -155,11 +155,11 @@ Pos	Instruction
 0	stmt 9 "drop temporary table if exists sudoku..."
 1	stmt 1 "create temporary table sudoku_work ( ..."
 2	stmt 1 "create temporary table sudoku_schedul..."
-3	stmt 89 "call sudoku_init()"
+3	stmt 88 "call sudoku_init()"
 4	jump_if_not 7(8) p_naive@0
 5	stmt 4 "update sudoku_work set cnt = 0 where ..."
 6	jump 8
-7	stmt 89 "call sudoku_count()"
+7	stmt 88 "call sudoku_count()"
 8	stmt 6 "insert into sudoku_schedule (row,col)..."
 9	set v_scounter@2 0
 10	set v_i@3 1

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2011-02-04 05:11:09 +0000
+++ b/sql/mysqld.cc	2011-02-16 17:13:30 +0000
@@ -3035,7 +3035,6 @@ SHOW_VAR com_status_vars[]= {
   {"show_grants",          (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_GRANTS]), SHOW_LONG_STATUS},
   {"show_keys",            (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_KEYS]), SHOW_LONG_STATUS},
   {"show_master_status",   (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_MASTER_STAT]), SHOW_LONG_STATUS},
-  {"show_new_master",      (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_NEW_MASTER]), SHOW_LONG_STATUS},
   {"show_open_tables",     (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_OPEN_TABLES]), SHOW_LONG_STATUS},
   {"show_plugins",         (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_PLUGINS]), SHOW_LONG_STATUS},
   {"show_privileges",      (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_PRIVILEGES]), SHOW_LONG_STATUS},

=== modified file 'sql/rpl_master.cc'
--- a/sql/rpl_master.cc	2011-01-31 13:44:38 +0000
+++ b/sql/rpl_master.cc	2011-02-16 17:13:30 +0000
@@ -1395,23 +1395,6 @@ int reset_master(THD* thd)
   return 0;
 }
 
-int cmp_master_pos(const char* log_file_name1, ulonglong log_pos1,
-		   const char* log_file_name2, ulonglong log_pos2)
-{
-  int res;
-  size_t log_file_name1_len=  strlen(log_file_name1);
-  size_t log_file_name2_len=  strlen(log_file_name2);
-
-  //  We assume that both log names match up to '.'
-  if (log_file_name1_len == log_file_name2_len)
-  {
-    if ((res= strcmp(log_file_name1, log_file_name2)))
-      return res;
-    return (log_pos1 < log_pos2) ? -1 : (log_pos1 == log_pos2) ? 0 : 1;
-  }
-  return ((log_file_name1_len < log_file_name2_len) ? -1 : 1);
-}
-
 
 /**
   Execute a SHOW MASTER STATUS statement.

=== modified file 'sql/rpl_slave.h'
--- a/sql/rpl_slave.h	2010-12-10 16:55:50 +0000
+++ b/sql/rpl_slave.h	2011-02-16 17:13:30 +0000
@@ -158,8 +158,6 @@ extern const char *relay_log_basename;
 int start_slave(THD* thd, Master_info* mi, bool net_report);
 int stop_slave(THD* thd, Master_info* mi, bool net_report);
 bool change_master(THD* thd, Master_info* mi);
-int cmp_master_pos(const char* log_file_name1, ulonglong log_pos1,
-		   const char* log_file_name2, ulonglong log_pos2);
 int reset_slave(THD *thd, Master_info* mi);
 int init_slave();
 int init_recovery(Master_info* mi, const char** errmsg);

=== modified file 'sql/sp_head.cc'
--- a/sql/sp_head.cc	2010-12-17 11:28:59 +0000
+++ b/sql/sp_head.cc	2011-02-16 17:13:30 +0000
@@ -237,7 +237,6 @@ sp_get_flags_for_command(LEX *lex)
   case SQLCOM_SHOW_EVENTS:
   case SQLCOM_SHOW_KEYS:
   case SQLCOM_SHOW_MASTER_STAT:
-  case SQLCOM_SHOW_NEW_MASTER:
   case SQLCOM_SHOW_OPEN_TABLES:
   case SQLCOM_SHOW_PRIVILEGES:
   case SQLCOM_SHOW_PROCESSLIST:

=== modified file 'sql/sql_cmd.h'
--- a/sql/sql_cmd.h	2010-04-16 09:07:23 +0000
+++ b/sql/sql_cmd.h	2011-02-16 17:13:30 +0000
@@ -60,7 +60,7 @@ enum enum_sql_command {
   SQLCOM_SHOW_OPEN_TABLES,
   SQLCOM_HA_OPEN, SQLCOM_HA_CLOSE, SQLCOM_HA_READ,
   SQLCOM_SHOW_SLAVE_HOSTS, SQLCOM_DELETE_MULTI, SQLCOM_UPDATE_MULTI,
-  SQLCOM_SHOW_BINLOG_EVENTS, SQLCOM_SHOW_NEW_MASTER, SQLCOM_DO,
+  SQLCOM_SHOW_BINLOG_EVENTS, SQLCOM_DO,
   SQLCOM_SHOW_WARNS, SQLCOM_EMPTY_QUERY, SQLCOM_SHOW_ERRORS,
   SQLCOM_SHOW_STORAGE_ENGINES, SQLCOM_SHOW_PRIVILEGES,
   SQLCOM_HELP, SQLCOM_CREATE_USER, SQLCOM_DROP_USER, SQLCOM_RENAME_USER,

=== modified file 'sql/sql_lex.h'
--- a/sql/sql_lex.h	2011-01-26 07:37:18 +0000
+++ b/sql/sql_lex.h	2011-02-16 17:13:30 +0000
@@ -196,8 +196,7 @@ typedef struct st_lex_server_options
 
 
 /**
-  Structure to hold parameters for CHANGE MASTER or START/STOP SLAVE
-  or SHOW NEW MASTER.
+  Structure to hold parameters for CHANGE MASTER, START SLAVE, and STOP SLAVE.
 
   Remark: this should not be confused with Master_info (and perhaps
   would better be renamed to st_lex_replication_info).  Some fields,

=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2011-02-07 11:49:18 +0000
+++ b/sql/sql_parse.cc	2011-02-16 17:13:30 +0000
@@ -354,7 +354,6 @@ void init_update_queries(void)
   sql_command_flags[SQLCOM_SHOW_VARIABLES]=   CF_STATUS_COMMAND | CF_REEXECUTION_FRAGILE;
   sql_command_flags[SQLCOM_SHOW_CHARSETS]=    CF_STATUS_COMMAND | CF_REEXECUTION_FRAGILE;
   sql_command_flags[SQLCOM_SHOW_COLLATIONS]=  CF_STATUS_COMMAND | CF_REEXECUTION_FRAGILE;
-  sql_command_flags[SQLCOM_SHOW_NEW_MASTER]=  CF_STATUS_COMMAND;
   sql_command_flags[SQLCOM_SHOW_BINLOGS]=     CF_STATUS_COMMAND;
   sql_command_flags[SQLCOM_SHOW_SLAVE_HOSTS]= CF_STATUS_COMMAND;
   sql_command_flags[SQLCOM_SHOW_BINLOG_EVENTS]= CF_STATUS_COMMAND;
@@ -2187,14 +2186,6 @@ case SQLCOM_PREPARE:
 #endif
     break;
   }
-  case SQLCOM_SHOW_NEW_MASTER:
-  {
-    if (check_global_access(thd, REPL_SLAVE_ACL))
-      goto error;
-    /* This query don't work now.*/
-    my_error(ER_NOT_SUPPORTED_YET, MYF(0), "SHOW NEW MASTER");
-    goto error;
-  }
 
 #ifdef HAVE_REPLICATION
   case SQLCOM_SHOW_SLAVE_HOSTS:

=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2011-02-15 11:47:33 +0000
+++ b/sql/sql_yacc.yy	2011-02-16 17:13:30 +0000
@@ -11066,19 +11066,6 @@ show_param:
             if (prepare_schema_table(YYTHD, lex, $4, SCH_COLUMNS))
               MYSQL_YYABORT;
           }
-        | NEW_SYM MASTER_SYM FOR_SYM SLAVE
-          WITH MASTER_LOG_FILE_SYM EQ
-          TEXT_STRING_sys /* $8 */
-          AND_SYM MASTER_LOG_POS_SYM EQ
-          ulonglong_num /* $12 */
-          AND_SYM MASTER_SERVER_ID_SYM EQ
-          ulong_num /* $16 */
-          {
-            Lex->sql_command = SQLCOM_SHOW_NEW_MASTER;
-            Lex->mi.log_file_name = $8.str;
-            Lex->mi.pos = $12;
-            Lex->mi.server_id = $16;
-          }
         | master_or_binary LOGS_SYM
           {
             Lex->sql_command = SQLCOM_SHOW_BINLOGS;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (sven.sandberg:3657 to 3658) WL#5670Sven Sandberg16 Feb