Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql

mysql-test/r/rpl_alter.result

+n	m
+1	2
+n
+45

mysql-test/t/rpl_alter.test

+source include/master-slave.inc;
+connection master;
+use test;
+drop database if exists d1;
+create database d1;
+create table d1.t1 ( n int);
+alter table d1.t1 add m int;
+insert into d1.t1 values (1,2);
+create table d1.t2 (n int);
+insert into d1.t2 values (45);
+rename table d1.t2 to d1.t3, d1.t1 to d1.t2;
+save_master_pos;
+connection slave;
+sync_with_master;
+select * from d1.t2;
+select * from d1.t3;
+connection master;
+drop database d1;
+save_master_pos;
+connection slave;
+sync_with_master;

scripts/mysql_install_db.sh

@@ -317,8 +317,8 @@ then
   fi
   echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
   echo "This is done with:"
-  echo "$bindir/mysqladmin -u root -p password 'new-password'"
-  echo "$bindir/mysqladmin -u root -h $hostname -p password 'new-password'"
+  echo "$bindir/mysqladmin -u root  password 'new-password'"
+  echo "$bindir/mysqladmin -u root -h $hostname  password 'new-password'"
   echo "See the manual for more instructions."
   #
   # Print message about upgrading unless we have created a new db table.

sql/sql_base.cc

@@ -546,6 +546,7 @@ void close_temporary_tables(THD *thd)
     *--end = 0;					// Remove last ','
     thd->query_length = (uint)(end-query);
     Query_log_event qinfo(thd, query);
+    qinfo.error_code=0;
     mysql_bin_log.write(&qinfo);
     thd->query_length = save_query_len;
   }