Merge sinisa@work.mysql.com:/home/bk/mysql-4.0

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

sql/log.cc

@@ -1325,6 +1325,7 @@ bool MYSQL_LOG::write(THD *thd,const char *query, uint query_length,
 	end=strxmov(buff, "# administrator command: ",
 		    command_name[thd->command], NullS);
 	query_length=(ulong) (end-buff);
+	query=buff;
       }
       if (my_b_write(&log_file, (byte*) query,query_length) ||
 	  my_b_write(&log_file, (byte*) ";\n",2) ||