Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into  mysql.com:/home/my/mysql-5.0


mysql-test/t/ctype_ucs.test:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

1 files changed, 6 insertions, 6 deletions

diff --git a/mysql-test/t/csv.test b/mysql-test/t/csv.test
index 65173cbf355..830bdaa3cf0 100644
--- a/mysql-test/t/csv.test
+++ b/mysql-test/t/csv.test
@@ -1360,27 +1360,27 @@ DROP TABLE bug14672;
 create table t1 (a int) engine=csv;
 insert t1 values (1);
 --enable_info
-delete from t1;                 -- delete_row
-delete from t1;                 -- delete_all_rows
+delete from t1;                 # delete_row
+delete from t1;                 # delete_all_rows
 --disable_info
 insert t1 values (1),(2);
 --enable_info
-delete from t1;                 -- delete_all_rows
+delete from t1;                 # delete_all_rows
 --disable_info
 insert t1 values (1),(2),(3);
 flush tables;
 --enable_info
-delete from t1;                 -- delete_row
+delete from t1;                 # delete_row
 --disable_info
 insert t1 values (1),(2),(3),(4);
 flush tables;
 select count(*) from t1;
 --enable_info
-delete from t1;                 -- delete_all_rows
+delete from t1;                 # delete_all_rows
 --disable_info
 insert t1 values (1),(2),(3),(4),(5);
 --enable_info
-truncate table t1;              -- truncate
+truncate table t1;              # truncate
 --disable_info
 drop table t1;