manually merged

client/mysqlbinlog.cc:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
mysql-test/include/varchar.inc:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/mysqlbinlog2.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
mysys/hash.c:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
mysql-test/r/ctype_ucs.result:
  ul
mysql-test/r/drop_temp_table.result:
  ul
mysql-test/r/innodb.result:
  ul
mysql-test/r/insert_select.result:
  ul
mysql-test/r/mix_innodb_myisam_binlog.result:
  ul
mysql-test/r/rpl_change_master.result:
  ul
mysql-test/r/rpl_charset.result:
  ul
mysql-test/r/rpl_error_ignored_table.result:
  ul
mysql-test/r/rpl_flush_log_loop.result:
  ul
mysql-test/r/rpl_flush_tables.result:
  ul
mysql-test/r/rpl_loaddata.result:
  ul
mysql-test/r/rpl_loaddata_rule_m.result:
  ul
mysql-test/r/rpl_log.result:
  ul
mysql-test/r/rpl_max_relay_size.result:
  ul
mysql-test/r/rpl_relayrotate.result:
  ul
mysql-test/r/rpl_replicate_do.result:
  ul
mysql-test/r/rpl_rotate_logs.result:
  ul
mysql-test/r/rpl_temporary.result:
  ul
mysql-test/r/rpl_timezone.result:
  ul
mysql-test/r/rpl_until.result:
  ul
mysql-test/r/rpl_user_variables.result:
  ul
mysql-test/r/user_var.result:
  ul

1 files changed, 6 insertions, 6 deletions

diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
index b9e837b0d64..f61ff12f365 100644
--- a/sql/sql_trigger.cc
+++ b/sql/sql_trigger.cc
@@ -147,7 +147,7 @@ bool Table_triggers_list::create_trigger(THD *thd, TABLE_LIST *tables)
   /* Let us check if trigger with the same name exists */
   while ((name= it++))
   {
-    if (my_strcasecmp(system_charset_info, lex->name_and_length.str,
+    if (my_strcasecmp(system_charset_info, lex->ident.str,
                       name->str) == 0)
     {
       my_message(ER_TRG_ALREADY_EXISTS, ER(ER_TRG_ALREADY_EXISTS), MYF(0));
@@ -238,7 +238,7 @@ bool Table_triggers_list::drop_trigger(THD *thd, TABLE_LIST *tables)
   {
     it_def++;
 
-    if (my_strcasecmp(system_charset_info, lex->name_and_length.str,
+    if (my_strcasecmp(system_charset_info, lex->ident.str,
                       name->str) == 0)
     {
       /*
@@ -428,15 +428,15 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db,
 
         if (!(trg_name_buff= alloc_root(&table->mem_root,
                                         sizeof(LEX_STRING) +
-                                        lex.name_and_length.length + 1)))
+                                        lex.ident.length + 1)))
           goto err_with_lex_cleanup;
 
         trg_name_str= (LEX_STRING *)trg_name_buff;
         trg_name_buff+= sizeof(LEX_STRING);
-        memcpy(trg_name_buff, lex.name_and_length.str,
-               lex.name_and_length.length + 1);
+        memcpy(trg_name_buff, lex.ident.str,
+               lex.ident.length + 1);
         trg_name_str->str= trg_name_buff;
-        trg_name_str->length= lex.name_and_length.length;
+        trg_name_str->length= lex.ident.length;
 
         if (triggers->names_list.push_back(trg_name_str, &table->mem_root))
           goto err_with_lex_cleanup;