Commit fdb1170e authored by unknown's avatar unknown
Browse files

Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl 

into  quant.(none):/ext/mysql/bk/mysql-5.0-rpl-warnings


sql/mysql_priv.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents d93c7f39 b3fafa40

sql/mysql_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ void net_set_read_timeout(NET *net, uint timeout); 
#define WARN_DEPRECATED(Thd,Ver,Old,New)                                             \

  do {                                                                               \

    DBUG_ASSERT(strncmp(Ver, MYSQL_SERVER_VERSION, sizeof(Ver)-1) > 0);              \

    if (Thd != NULL)                                                                 \

    if (((gptr)Thd) != NULL)                                                         \

      push_warning_printf(((THD *)Thd), MYSQL_ERROR::WARN_LEVEL_WARN,                \

                        ER_WARN_DEPRECATED_SYNTAX, ER(ER_WARN_DEPRECATED_SYNTAX),    \

                        (Old), (Ver), (New));                                        \

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -6957,7 +6957,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
    if (!slave_warning_issued)                 //only show the warning once

    {

      slave_warning_issued = true;   

      WARN_DEPRECATED(0, "5.2", "for replication startup options", 

      WARN_DEPRECATED(NULL, "5.2", "for replication startup options", 

        "'CHANGE MASTER'");

    }

    break;

sql/sql_insert.cc

+2 −0
Original line number Diff line number Diff line
@@ -381,7 +381,9 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, 
  List_item *values;

  Name_resolution_context *context;

  Name_resolution_context_state ctx_state;

#ifndef EMBEDDED_LIBRARY

  char *query= thd->query;

#endif

  bool log_on= (thd->options & OPTION_BIN_LOG) ||

    (!(thd->security_ctx->master_access & SUPER_ACL));

  thr_lock_type lock_type = table_list->lock_type;

sql/sql_yacc.yy

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ const LEX_STRING null_lex_str={0,0}; 


#define yyoverflow(A,B,C,D,E,F) {ulong val= *(F); if (my_yyoverflow((B), (D), &val)) { yyerror((char*) (A)); return 2; } else { *(F)= (YYSIZE_T)val; }}



#undef 	WARN_DEPRECATED			/* this macro is also defined in mysql_priv.h */

#define WARN_DEPRECATED(A,B)                                        \

  push_warning_printf(((THD *)yythd), MYSQL_ERROR::WARN_LEVEL_WARN, \

		      ER_WARN_DEPRECATED_SYNTAX,                    \