bk commit into 5.1 tree (mkindahl:1.2539)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mkindahl.  When mkindahl does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-07 12:30:52+01:00, mkindahl@stripped +8 -0
  Renaming some saved binary log files to avoid 99 characters
  limit for v7 tar.

  mysql-test/suite/binlog/std_data/bug32407.001@stripped, 2008-02-07 11:17:18+01:00,
mkindahl@stripped +0 -0
    Rename: mysql-test/suite/binlog/std_data/binlog-bug32407.000001 ->
mysql-test/suite/binlog/std_data/bug32407.001

  mysql-test/suite/binlog/std_data/ver_5_1-telco.001@stripped, 2008-02-07 11:16:24+01:00,
mkindahl@stripped +0 -0
    Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1-telco.000001 ->
mysql-test/suite/binlog/std_data/ver_5_1-telco.001

  mysql-test/suite/binlog/std_data/ver_5_1-wl2325_r.001@stripped, 2008-02-07 11:16:49+01:00,
mkindahl@stripped +0 -0
    Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_row.000001
-> mysql-test/suite/binlog/std_data/ver_5_1-wl2325_r.001

  mysql-test/suite/binlog/std_data/ver_5_1-wl2325_s.001@stripped, 2008-02-07 11:16:55+01:00,
mkindahl@stripped +0 -0
    Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_stm.000001
-> mysql-test/suite/binlog/std_data/ver_5_1-wl2325_s.001

  mysql-test/suite/binlog/std_data/ver_5_1_17.001@stripped, 2008-02-07 11:16:04+01:00,
mkindahl@stripped +0 -0
    Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1_17.000001 ->
mysql-test/suite/binlog/std_data/ver_5_1_17.001

  mysql-test/suite/binlog/std_data/ver_5_1_23.001@stripped, 2008-02-07 11:16:11+01:00,
mkindahl@stripped +0 -0
    Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1_23.000001 ->
mysql-test/suite/binlog/std_data/ver_5_1_23.001

  mysql-test/suite/binlog/t/binlog_base64_flag.test@stripped, 2008-02-07 12:30:30+01:00,
mkindahl@stripped +3 -3
    Renaming some saved binary log files to avoid 99 characters
    limit for v7 tar.

  mysql-test/suite/binlog/t/binlog_old_versions.test@stripped, 2008-02-07 12:30:36+01:00,
mkindahl@stripped +5 -5
    Renaming some saved binary log files to avoid 99 characters
    limit for v7 tar.

Binary files a/mysql-test/suite/binlog/std_data/binlog-bug32407.000001 and
b/mysql-test/suite/binlog/std_data/binlog-bug32407.000001 differ
Binary files a/mysql-test/suite/binlog/std_data/binlog_old_version_5_1-telco.000001 and
b/mysql-test/suite/binlog/std_data/binlog_old_version_5_1-telco.000001 differ
Binary files a/mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_row.000001
and b/mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_row.000001 differ
Binary files a/mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_stm.000001
and b/mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_stm.000001 differ
Binary files a/mysql-test/suite/binlog/std_data/binlog_old_version_5_1_17.000001 and
b/mysql-test/suite/binlog/std_data/binlog_old_version_5_1_17.000001 differ
Binary files a/mysql-test/suite/binlog/std_data/binlog_old_version_5_1_23.000001 and
b/mysql-test/suite/binlog/std_data/binlog_old_version_5_1_23.000001 differ
Binary files a/mysql-test/suite/binlog/std_data/bug32407.001 and
b/mysql-test/suite/binlog/std_data/bug32407.001 differ
Binary files a/mysql-test/suite/binlog/std_data/ver_5_1-telco.001 and
b/mysql-test/suite/binlog/std_data/ver_5_1-telco.001 differ
Binary files a/mysql-test/suite/binlog/std_data/ver_5_1-wl2325_r.001 and
b/mysql-test/suite/binlog/std_data/ver_5_1-wl2325_r.001 differ
Binary files a/mysql-test/suite/binlog/std_data/ver_5_1-wl2325_s.001 and
b/mysql-test/suite/binlog/std_data/ver_5_1-wl2325_s.001 differ
Binary files a/mysql-test/suite/binlog/std_data/ver_5_1_17.001 and
b/mysql-test/suite/binlog/std_data/ver_5_1_17.001 differ
Binary files a/mysql-test/suite/binlog/std_data/ver_5_1_23.001 and
b/mysql-test/suite/binlog/std_data/ver_5_1_23.001 differ
diff -Nrup a/mysql-test/suite/binlog/t/binlog_base64_flag.test
b/mysql-test/suite/binlog/t/binlog_base64_flag.test
--- a/mysql-test/suite/binlog/t/binlog_base64_flag.test	2007-12-14 19:01:59 +01:00
+++ b/mysql-test/suite/binlog/t/binlog_base64_flag.test	2008-02-07 12:30:30 +01:00
@@ -15,7 +15,7 @@
 # The binlog contains row events equivalent to:
 # CREATE TABLE t1 (a int) engine = myisam
 # INSERT INTO t1 VALUES (1), (1)
-exec $MYSQL_BINLOG suite/binlog/std_data/binlog-bug32407.000001 | $MYSQL;
+exec $MYSQL_BINLOG suite/binlog/std_data/bug32407.001 | $MYSQL;
 # The above line should succeed and t1 should contain two ones
 select * from t1;
 
@@ -68,7 +68,7 @@ select * from t1;
 # mysqlbinlog should fail
 --replace_regex /#[0-9][0-9][0-9][0-9][0-9][0-9] .*/#/
 error 1;
-exec $MYSQL_BINLOG --base64-output=never suite/binlog/std_data/binlog-bug32407.000001;
+exec $MYSQL_BINLOG --base64-output=never suite/binlog/std_data/bug32407.001;
 # the above line should output the query log event and then stop
 
 
@@ -78,7 +78,7 @@ exec $MYSQL_BINLOG --base64-output=never
 --echo ==== Test non-matching FD event and Row event ====
 
 # This is the Format_description_log_event from
-# binlog-bug32407.000001, encoded in base64. It contains only the old
+# bug32407.001, encoded in base64. It contains only the old
 # row events (number of event types is 22)
 BINLOG '
 4CdYRw8BAAAAYgAAAGYAAAAAAAQANS4xLjE1LW5kYi02LjEuMjQtZGVidWctbG9nAAAAAAAAAAAA
diff -Nrup a/mysql-test/suite/binlog/t/binlog_old_versions.test
b/mysql-test/suite/binlog/t/binlog_old_versions.test
--- a/mysql-test/suite/binlog/t/binlog_old_versions.test	2008-02-05 08:22:16 +01:00
+++ b/mysql-test/suite/binlog/t/binlog_old_versions.test	2008-02-07 12:30:36 +01:00
@@ -31,7 +31,7 @@ DROP TABLE IF EXISTS t1, t2, t3;
 --echo ==== Read modern binlog (version 5.1.23) ====
 
 # Read binlog.
---exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/
suite/binlog/std_data/binlog_old_version_5_1_23.000001 | $MYSQL --local-infile=1
+--exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/
suite/binlog/std_data/ver_5_1_23.001 | $MYSQL --local-infile=1
 # Show result.
 SELECT * FROM t1 ORDER BY a;
 SELECT * FROM t2 ORDER BY a;
@@ -43,7 +43,7 @@ DROP TABLE t1, t2, t3;
 --echo ==== Read binlog from version 5.1.17 ====
 
 # Read binlog.
---exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/
suite/binlog/std_data/binlog_old_version_5_1_17.000001 | $MYSQL --local-infile=1
+--exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/
suite/binlog/std_data/ver_5_1_17.001 | $MYSQL --local-infile=1
 # Show result.
 SELECT * FROM t1 ORDER BY a;
 SELECT * FROM t2 ORDER BY a;
@@ -60,9 +60,9 @@ DROP TABLE t1, t2, t3;
 # replication.
 
 # Read rbr binlog.
---exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/
suite/binlog/std_data/binlog_old_version_5_1-wl2325_row.000001 | $MYSQL --local-infile=1
+--exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/
suite/binlog/std_data/ver_5_1-wl2325_r.001 | $MYSQL --local-infile=1
 # Read stm binlog.
---exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/
suite/binlog/std_data/binlog_old_version_5_1-wl2325_stm.000001 | $MYSQL --local-infile=1
+--exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/
suite/binlog/std_data/ver_5_1-wl2325_s.001 | $MYSQL --local-infile=1
 # Show result.
 SELECT * FROM t1 ORDER BY a;
 SELECT * FROM t2 ORDER BY a;
@@ -74,7 +74,7 @@ DROP TABLE t1, t2, t3;
 --echo ==== Read binlog from ndb tree (mysql-5.1-telco-6.1) ====
 
 # Read binlog.
---exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/
suite/binlog/std_data/binlog_old_version_5_1-telco.000001 | $MYSQL --local-infile=1
+--exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/
suite/binlog/std_data/ver_5_1-telco.001 | $MYSQL --local-infile=1
 # Show resulting tablea.
 SELECT * FROM t1 ORDER BY a;
 SELECT * FROM t2 ORDER BY a;