Commit 96aef62c authored by unknown's avatar unknown
Browse files

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 

into  example.com:/work/mysql-5.1-runtime


sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
parents 5768d570 728a924c

sql/handler.cc

+5 −5
Original line number Diff line number Diff line
@@ -72,11 +72,11 @@ ulong savepoint_alloc_size= 0; 


static const LEX_STRING sys_table_aliases[]=

{

  {(char*)STRING_WITH_LEN("INNOBASE")},  {(char*)STRING_WITH_LEN("INNODB")},

  {(char*)STRING_WITH_LEN("NDB")},       {(char*)STRING_WITH_LEN("NDBCLUSTER")},

  {(char*)STRING_WITH_LEN("BDB")},       {(char*)STRING_WITH_LEN("BERKELEYDB")},

  {(char*)STRING_WITH_LEN("HEAP")},      {(char*)STRING_WITH_LEN("MEMORY")},

  {(char*)STRING_WITH_LEN("MERGE")},     {(char*)STRING_WITH_LEN("MRG_MYISAM")},

  { C_STRING_WITH_LEN("INNOBASE") },  { C_STRING_WITH_LEN("INNODB") },

  { C_STRING_WITH_LEN("NDB") },       { C_STRING_WITH_LEN("NDBCLUSTER") },

  { C_STRING_WITH_LEN("BDB") },       { C_STRING_WITH_LEN("BERKELEYDB") },

  { C_STRING_WITH_LEN("HEAP") },      { C_STRING_WITH_LEN("MEMORY") },

  { C_STRING_WITH_LEN("MERGE") },     { C_STRING_WITH_LEN("MRG_MYISAM")},

  {NullS, 0}

};

sql/item.cc

+1 −1
Original line number Diff line number Diff line
@@ -1004,7 +1004,7 @@ bool Item_splocal::set_value(THD *thd, sp_rcontext *ctx, Item **it) 
*****************************************************************************/



Item_case_expr::Item_case_expr(int case_expr_id)

  :Item_sp_variable((char *) STRING_WITH_LEN("case_expr")),

  :Item_sp_variable( C_STRING_WITH_LEN("case_expr")),

   m_case_expr_id(case_expr_id)

{

}

sql/mysql_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -1479,7 +1479,7 @@ extern char *mysql_data_home,server_version[SERVER_VERSION_LENGTH], 
            def_ft_boolean_syntax[sizeof(ft_boolean_syntax)];

#define mysql_tmpdir (my_tmpdir(&mysql_tmpdir_list))

extern MY_TMPDIR mysql_tmpdir_list;

extern LEX_STRING command_name[];

extern const LEX_STRING command_name[];

extern const char *first_keyword, *my_localhost, *delayed_user, *binary_keyword;

extern const char **errmesg;			/* Error messages */

extern const char *myisam_recover_options_str;

sql/sql_acl.cc

+63 −63
Original line number Diff line number Diff line
@@ -36,114 +36,114 @@ time_t mysql_db_table_last_check= 0L; 


TABLE_FIELD_W_TYPE mysql_db_table_fields[MYSQL_DB_FIELD_COUNT] = {

  {

    {(char *) STRING_WITH_LEN("Host")},            

    {(char *) STRING_WITH_LEN("char(60)")},

    { C_STRING_WITH_LEN("Host") },            

    { C_STRING_WITH_LEN("char(60)") },

    {NULL, 0}

  }, 

  {

    {(char *) STRING_WITH_LEN("Db")},            

    {(char *) STRING_WITH_LEN("char(64)")},

    { C_STRING_WITH_LEN("Db") },            

    { C_STRING_WITH_LEN("char(64)") },

    {NULL, 0}

  }, 

  {

    {(char *) STRING_WITH_LEN("User")},

    {(char *) STRING_WITH_LEN("char(16)")},

    { C_STRING_WITH_LEN("User") },

    { C_STRING_WITH_LEN("char(16)") },

    {NULL, 0}

  },

  {

    {(char *) STRING_WITH_LEN("Select_priv")},

    {(char *) STRING_WITH_LEN("enum('N','Y')")},

    {(char *) STRING_WITH_LEN("utf8")}

    { C_STRING_WITH_LEN("Select_priv") },

    { C_STRING_WITH_LEN("enum('N','Y')") },

    { C_STRING_WITH_LEN("utf8") }

  },

  {

    {(char *) STRING_WITH_LEN("Insert_priv")},

    {(char *) STRING_WITH_LEN("enum('N','Y')")},

    {(char *) STRING_WITH_LEN("utf8")}

    { C_STRING_WITH_LEN("Insert_priv") },

    { C_STRING_WITH_LEN("enum('N','Y')") },

    { C_STRING_WITH_LEN("utf8") }

  },

  {

    {(char *) STRING_WITH_LEN("Update_priv")},

    {(char *) STRING_WITH_LEN("enum('N','Y')")},

    {(char *) STRING_WITH_LEN("utf8")}

    { C_STRING_WITH_LEN("Update_priv") },

    { C_STRING_WITH_LEN("enum('N','Y')") },

    { C_STRING_WITH_LEN("utf8") }

  },

  {

    {(char *) STRING_WITH_LEN("Delete_priv")},

    {(char *) STRING_WITH_LEN("enum('N','Y')")},

    {(char *) STRING_WITH_LEN("utf8")}

    { C_STRING_WITH_LEN("Delete_priv") },

    { C_STRING_WITH_LEN("enum('N','Y')") },

    { C_STRING_WITH_LEN("utf8") }

  },

  {

    {(char *) STRING_WITH_LEN("Create_priv")},

    {(char *) STRING_WITH_LEN("enum('N','Y')")},

    {(char *) STRING_WITH_LEN("utf8")}

    { C_STRING_WITH_LEN("Create_priv") },

    { C_STRING_WITH_LEN("enum('N','Y')") },

    { C_STRING_WITH_LEN("utf8") }

  },

  {

    {(char *) STRING_WITH_LEN("Drop_priv")},

    {(char *) STRING_WITH_LEN("enum('N','Y')")},

    {(char *) STRING_WITH_LEN("utf8")}

    { C_STRING_WITH_LEN("Drop_priv") },

    { C_STRING_WITH_LEN("enum('N','Y')") },

    { C_STRING_WITH_LEN("utf8") }

  },

  {

    {(char *) STRING_WITH_LEN("Grant_priv")},

    {(char *) STRING_WITH_LEN("enum('N','Y')")},

    {(char *) STRING_WITH_LEN("utf8")}

    { C_STRING_WITH_LEN("Grant_priv") },

    { C_STRING_WITH_LEN("enum('N','Y')") },

    { C_STRING_WITH_LEN("utf8") }

  },

  {

    {(char *) STRING_WITH_LEN("References_priv")},

    {(char *) STRING_WITH_LEN("enum('N','Y')")},

    {(char *) STRING_WITH_LEN("utf8")}

    { C_STRING_WITH_LEN("References_priv") },

    { C_STRING_WITH_LEN("enum('N','Y')") },

    { C_STRING_WITH_LEN("utf8") }

  },

  {

    {(char *) STRING_WITH_LEN("Index_priv")},

    {(char *) STRING_WITH_LEN("enum('N','Y')")},

    {(char *) STRING_WITH_LEN("utf8")}

    { C_STRING_WITH_LEN("Index_priv") },

    { C_STRING_WITH_LEN("enum('N','Y')") },

    { C_STRING_WITH_LEN("utf8") }

  },

  {

    {(char *) STRING_WITH_LEN("Alter_priv")},

    {(char *) STRING_WITH_LEN("enum('N','Y')")},

    {(char *) STRING_WITH_LEN("utf8")}

    { C_STRING_WITH_LEN("Alter_priv") },

    { C_STRING_WITH_LEN("enum('N','Y')") },

    { C_STRING_WITH_LEN("utf8") }

  },

  {

    {(char *) STRING_WITH_LEN("Create_tmp_table_priv")},

    {(char *) STRING_WITH_LEN("enum('N','Y')")},

    {(char *) STRING_WITH_LEN("utf8")}

    { C_STRING_WITH_LEN("Create_tmp_table_priv") },

    { C_STRING_WITH_LEN("enum('N','Y')") },

    { C_STRING_WITH_LEN("utf8") }

  },

  {

    {(char *) STRING_WITH_LEN("Lock_tables_priv")},

    {(char *) STRING_WITH_LEN("enum('N','Y')")},

    {(char *) STRING_WITH_LEN("utf8")}

    { C_STRING_WITH_LEN("Lock_tables_priv") },

    { C_STRING_WITH_LEN("enum('N','Y')") },

    { C_STRING_WITH_LEN("utf8") }

  },

  {

    {(char *) STRING_WITH_LEN("Create_view_priv")},

    {(char *) STRING_WITH_LEN("enum('N','Y')")},

    {(char *) STRING_WITH_LEN("utf8")}

    { C_STRING_WITH_LEN("Create_view_priv") },

    { C_STRING_WITH_LEN("enum('N','Y')") },

    { C_STRING_WITH_LEN("utf8") }

  },

  {

    {(char *) STRING_WITH_LEN("Show_view_priv")},

    {(char *) STRING_WITH_LEN("enum('N','Y')")},

    {(char *) STRING_WITH_LEN("utf8")}

    { C_STRING_WITH_LEN("Show_view_priv") },

    { C_STRING_WITH_LEN("enum('N','Y')") },

    { C_STRING_WITH_LEN("utf8") }

  },

  {

    {(char *) STRING_WITH_LEN("Create_routine_priv")},

    {(char *) STRING_WITH_LEN("enum('N','Y')")},

    {(char *) STRING_WITH_LEN("utf8")}

    { C_STRING_WITH_LEN("Create_routine_priv") },

    { C_STRING_WITH_LEN("enum('N','Y')") },

    { C_STRING_WITH_LEN("utf8") }

  },

  {

    {(char *) STRING_WITH_LEN("Alter_routine_priv")},

    {(char *) STRING_WITH_LEN("enum('N','Y')")},

    {(char *) STRING_WITH_LEN("utf8")}

    { C_STRING_WITH_LEN("Alter_routine_priv") },

    { C_STRING_WITH_LEN("enum('N','Y')") },

    { C_STRING_WITH_LEN("utf8") }

  },

  {

    {(char *) STRING_WITH_LEN("Execute_priv")},

    {(char *) STRING_WITH_LEN("enum('N','Y')")},

    {(char *) STRING_WITH_LEN("utf8")}

    { C_STRING_WITH_LEN("Execute_priv") },

    { C_STRING_WITH_LEN("enum('N','Y')") },

    { C_STRING_WITH_LEN("utf8") }

  },

  {

    {(char *) STRING_WITH_LEN("Event_priv")},

    {(char *) STRING_WITH_LEN("enum('N','Y')")},

    {(char *) STRING_WITH_LEN("utf8")}

    { C_STRING_WITH_LEN("Event_priv") },

    { C_STRING_WITH_LEN("enum('N','Y')") },

    { C_STRING_WITH_LEN("utf8") }

  },

  {

    {(char *) STRING_WITH_LEN("Trigger_priv")},

    {(char *) STRING_WITH_LEN("enum('N','Y')")},

    {(char *) STRING_WITH_LEN("utf8")}

    { C_STRING_WITH_LEN("Trigger_priv") },

    { C_STRING_WITH_LEN("enum('N','Y')") },

    { C_STRING_WITH_LEN("utf8") }

  }

};

sql/sql_error.cc

+5 −5
Original line number Diff line number Diff line
@@ -212,12 +212,12 @@ void push_warning_printf(THD *thd, MYSQL_ERROR::enum_warning_level level, 
    TRUE  Error sending data to client

*/



LEX_STRING warning_level_names[]=

const LEX_STRING warning_level_names[]=

{

  {(char*) STRING_WITH_LEN("Note")},

  {(char*) STRING_WITH_LEN("Warning")},

  {(char*) STRING_WITH_LEN("Error")},

  {(char*) STRING_WITH_LEN("?")}

  { C_STRING_WITH_LEN("Note") },

  { C_STRING_WITH_LEN("Warning") },

  { C_STRING_WITH_LEN("Error") },

  { C_STRING_WITH_LEN("?") }

};



bool mysqld_show_warnings(THD *thd, ulong levels_to_show)