Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge

mysql-test/r/binlog_row_blackhole.result

@@ -92,7 +92,7 @@ insert into t1 values(1);
 insert ignore into t1 values(1);
 replace into t1 values(100);
 create table t2 (a varchar(200)) engine=blackhole;
-load data infile '../../std_data/words.dat' into table t2;
+load data infile '../std_data_ln/words.dat' into table t2;
 alter table t1 add b int;
 alter table t1 drop b;
 create table t3 like t1;

mysql-test/r/rpl_row_flsh_tbls.result

@@ -30,3 +30,4 @@ flush tables with read lock;
 start slave;
 stop slave;
 ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
+drop table t3, t4, t5;

mysql-test/r/rpl_row_log.result

@@ -12,7 +12,7 @@ create table t1(n int not null auto_increment primary key);
 insert into t1 values (NULL);
 drop table t1;
 create table t1 (word char(20) not null);
-load data infile '../../std_data/words.dat' into table t1 ignore 1 lines;
+load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines;
 select count(*) from t1;
 count(*)
 69

sql/handler.h

@@ -2030,7 +2030,7 @@ int ha_binlog_end(THD *thd);
 #define ha_reset_logs(a) 0
 #define ha_binlog_index_purge_file(a,b) 0
 #define ha_reset_slave(a)
-#define ha_binlog_log_query(a,b,c,d,e,f);
+#define ha_binlog_log_query(a,b,c,d,e,f,g);
 #define ha_binlog_wait(a)
 #define ha_binlog_end(a) 0
 #endif

sql/sql_trigger.cc

@@ -1183,7 +1183,7 @@ bool Table_triggers_list::process_triggers(THD *thd, trg_event_type event,
 
       my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0), priv_desc,
                thd->security_ctx->priv_user, thd->security_ctx->host_or_ip,
-               table->s->table_name);
+               table->s->table_name.str);
 
       sp_restore_security_context(thd, save_ctx);
       return TRUE;