bk commit into 5.1 tree (msvensson:1.2547)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson.  When msvensson 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-28 18:55:46+01:00, msvensson@stripped +9 -0
  Fix after merge

  mysql-test/extra/rpl_tests/rpl_charset.test@stripped, 2008-02-28 18:55:41+01:00,
msvensson@stripped +0 -2
    Fix merge error

  mysql-test/lib/mtr_report.pm@stripped, 2008-02-28 18:55:41+01:00, msvensson@stripped
+1 -1
    Move the . out of [] to avoid log file parsing errors

  mysql-test/mysql-test-run.pl@stripped, 2008-02-28 18:55:41+01:00, msvensson@stripped
+1 -1
    Correct spelling of option

  mysql-test/suite/binlog/r/binlog_start_comment.result@stripped, 2008-02-28 18:55:41+01:00,
msvensson@stripped +1 -1
    Fix after merge

  mysql-test/suite/binlog/t/binlog_start_comment.test@stripped, 2008-02-28 18:55:41+01:00,
msvensson@stripped +4 -3
    Fix after merge

  mysql-test/t/drop.test@stripped, 2008-02-28 18:55:41+01:00, msvensson@stripped +2 -1
    Fix after merge

  mysql-test/t/myisampack.test@stripped, 2008-02-28 18:55:41+01:00, msvensson@stripped
+4 -3
    Fix after merge

  mysql-test/t/mysqlcheck.test@stripped, 2008-02-28 18:55:41+01:00, msvensson@stripped
+5 -3
    Fix after merge

  sql/ha_ndbcluster_binlog.cc@stripped, 2008-02-28 18:55:42+01:00, msvensson@stripped
+7 -6
    Fix merge error(used "Use remote")

diff -Nrup a/mysql-test/extra/rpl_tests/rpl_charset.test
b/mysql-test/extra/rpl_tests/rpl_charset.test
--- a/mysql-test/extra/rpl_tests/rpl_charset.test	2008-02-28 12:21:39 +01:00
+++ b/mysql-test/extra/rpl_tests/rpl_charset.test	2008-02-28 18:55:41 +01:00
@@ -137,8 +137,6 @@ sync_slave_with_master;
 select hex(c1), hex(c2) from t1;
 
 connection master;
-let $MYSQLD_DATADIR= `select @@datadir`;
---exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000001 
 drop table t1;
 sync_slave_with_master;
 
diff -Nrup a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm
--- a/mysql-test/lib/mtr_report.pm	2008-02-28 12:21:39 +01:00
+++ b/mysql-test/lib/mtr_report.pm	2008-02-28 18:55:41 +01:00
@@ -75,7 +75,7 @@ sub mtr_report_test_skipped ($) {
   {
     if ( $tinfo->{skip_detected_by_test} )
     {
-      mtr_report("[ skip.]  $tinfo->{'comment'}");
+      mtr_report("[ skip ].  $tinfo->{'comment'}");
     }
     else
     {
diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2008-02-28 12:00:53 +01:00
+++ b/mysql-test/mysql-test-run.pl	2008-02-28 18:55:41 +01:00
@@ -302,7 +302,7 @@ sub command_line_setup {
              'start-from=s'             => \&collect_option,
              'big-test'                 => \$opt_big_test,
 	     'combination=s'            => \@opt_combinations,
-             'skip-combination'         => \&collect_option,
+             'skip-combinations'        => \&collect_option,
 
 	     'skip-im'                  => \&ignore_option,
 
diff -Nrup a/mysql-test/suite/binlog/r/binlog_start_comment.result
b/mysql-test/suite/binlog/r/binlog_start_comment.result
--- a/mysql-test/suite/binlog/r/binlog_start_comment.result	2008-02-01 13:44:20 +01:00
+++ b/mysql-test/suite/binlog/r/binlog_start_comment.result	2008-02-28 18:55:41 +01:00
@@ -2,7 +2,7 @@ reset master;
 drop table if exists t1,t2;
 create table t1 (word varchar(20)) -- create table t1;
 create table t2 (word varchar(20)) -- create table t2;
-load data infile '../std_data_ln/words.dat' into table t1 -- load data to t1;
+load data infile '../../std_data/words.dat' into table t1 -- load data to t1;
 insert into t2 values ("Ada");
 flush logs;
 select * from t2;
diff -Nrup a/mysql-test/suite/binlog/t/binlog_start_comment.test
b/mysql-test/suite/binlog/t/binlog_start_comment.test
--- a/mysql-test/suite/binlog/t/binlog_start_comment.test	2008-02-01 20:26:31 +01:00
+++ b/mysql-test/suite/binlog/t/binlog_start_comment.test	2008-02-28 18:55:41 +01:00
@@ -10,15 +10,16 @@ drop table if exists t1,t2;
 --enable_warnings
 create table t1 (word varchar(20)) -- create table t1;
 create table t2 (word varchar(20)) -- create table t2;
-load data infile '../std_data_ln/words.dat' into table t1 -- load data to t1;
+load data infile '../../std_data/words.dat' into table t1 -- load data to t1;
 insert into t2 values ("Ada");
 flush logs;
 select * from t2;
---exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/
$MYSQLTEST_VARDIR/log/master-bin.000001 >
$MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog
+let $MYSQLD_DATADIR= `select @@datadir`;
+--exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/
$MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog
 --exec $MYSQL --local-infile=1 < $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog
 flush logs;
 select * from t2;
 
 # clean up
 drop table t1,t2;
-#--system rm $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog
+remove_file $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog;
diff -Nrup a/mysql-test/t/drop.test b/mysql-test/t/drop.test
--- a/mysql-test/t/drop.test	2007-11-23 15:21:22 +01:00
+++ b/mysql-test/t/drop.test	2008-02-28 18:55:41 +01:00
@@ -131,7 +131,8 @@ create table mysql_test.t1(f1 int);
 create table mysql_test.`#sql-347f_7` (f1 int);
 create table mysql_test.`#sql-347f_8` (f1 int);
 drop table mysql_test.`#sql-347f_8`;
-copy_file $MYSQLTEST_VARDIR/master-data/mysql_test/t1.frm
$MYSQLTEST_VARDIR/master-data/mysql_test/#sql-347f_6.frm;
+let $MYSQLD_DATADIR= `select @@datadir`;
+copy_file $MYSQLD_DATADIR/mysql_test/t1.frm $MYSQLD_DATADIR/mysql_test/#sql-347f_6.frm;
 drop database mysql_test;
 
 --echo End of 5.1 tests
diff -Nrup a/mysql-test/t/myisampack.test b/mysql-test/t/myisampack.test
--- a/mysql-test/t/myisampack.test	2007-11-07 09:55:27 +01:00
+++ b/mysql-test/t/myisampack.test	2008-02-28 18:55:41 +01:00
@@ -26,8 +26,9 @@ INSERT INTO t1 VALUES
 (2.22402118719591e-05,2.37546284320705e-05,2.58463051055541e-05,1.83391609130854e-05,1.6300720519646e-05,1.74559091886791e-05,1.63733785575587e-05,2.26616253279828e-05,1.79541237435621e-05,45),
 (3.01092775359837e-05,3.23865212934412e-05,4.09444584045994e-05,0,2.15470966302776e-05,2.39082636344032e-05,2.28296706429177e-05,2.9007671511595e-05,2.44201138973326e-05,46);
 FLUSH TABLES;
---exec $MYISAMPACK -s $MYSQLTEST_VARDIR/master-data/test/t1
---exec $MYISAMCHK -srq $MYSQLTEST_VARDIR/master-data/test/t1
---exec $MYISAMCHK -s --unpack $MYSQLTEST_VARDIR/master-data/test/t1
+let $MYSQLD_DATADIR= `select @@datadir`;
+--exec $MYISAMPACK -s $MYSQLD_DATADIR/test/t1
+--exec $MYISAMCHK -srq $MYSQLD_DATADIR/test/t1
+--exec $MYISAMCHK -s --unpack $MYSQLD_DATADIR/test/t1
 CHECK TABLE t1 EXTENDED;
 DROP TABLE t1;
diff -Nrup a/mysql-test/t/mysqlcheck.test b/mysql-test/t/mysqlcheck.test
--- a/mysql-test/t/mysqlcheck.test	2008-02-01 11:50:17 +01:00
+++ b/mysql-test/t/mysqlcheck.test	2008-02-28 18:55:41 +01:00
@@ -55,9 +55,10 @@ create table t_bug25347 (a int);
 create view v_bug25347 as select * from t_bug25347;
 insert into t_bug25347 values (1),(2),(3);
 flush tables;
+let $MYSQLD_DATADIR= `select @@datadir`;
 --echo removing and creating
---remove_file $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI
---write_file $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI
+--remove_file $MYSQLD_DATADIR/d_bug25347/t_bug25347.MYI
+--write_file $MYSQLD_DATADIR/d_bug25347/t_bug25347.MYI
 EOF
 --exec $MYSQL_CHECK --repair --databases d_bug25347
 --error 130
@@ -79,7 +80,8 @@ use test;
 create table t1(a int);
 create view v1 as select * from t1;
 show tables;
---copy_file $MYSQLTEST_VARDIR/master-data/test/v1.frm
$MYSQLTEST_VARDIR/master-data/test/v-1.frm
+let $MYSQLD_DATADIR= `select @@datadir`;
+--copy_file $MYSQLD_DATADIR/test/v1.frm $MYSQLD_DATADIR/test/v-1.frm
 show tables;
 --exec $MYSQL_CHECK --check-upgrade --fix-table-names --databases test
 show tables;
diff -Nrup a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
--- a/sql/ha_ndbcluster_binlog.cc	2008-02-28 12:21:03 +01:00
+++ b/sql/ha_ndbcluster_binlog.cc	2008-02-28 18:55:42 +01:00
@@ -918,12 +918,9 @@ int ndbcluster_setup_binlog_table_shares
   {
     pthread_mutex_lock(&LOCK_open);
     ndb_binlog_tables_inited= TRUE;
-    if (ndb_binlog_running)
-    {
-      if (ndb_extra_logging)
-        sql_print_information("NDB Binlog: ndb tables writable");
-      close_cached_tables(NULL, NULL, TRUE, FALSE, FALSE);
-    }
+    if (ndb_extra_logging)
+      sql_print_information("NDB Binlog: ndb tables writable");
+    close_cached_tables(NULL, NULL, TRUE, FALSE, FALSE);
     pthread_mutex_unlock(&LOCK_open);
     /* Signal injector thread that all is setup */
     pthread_cond_signal(&injector_cond);
@@ -2068,6 +2065,7 @@ ndb_binlog_thread_handle_schema_event(TH
                                ndb_schema_share->use_count));
       free_share(&ndb_schema_share);
       ndb_schema_share= 0;
+      ndb_binlog_tables_inited= 0;
       pthread_mutex_unlock(&ndb_schema_share_mutex);
       /* end protect ndb_schema_share */
 
@@ -3268,6 +3266,7 @@ ndb_binlog_thread_handle_non_data_event(
                                share->key, share->use_count));
       free_share(&ndb_apply_status_share);
       ndb_apply_status_share= 0;
+      ndb_binlog_tables_inited= 0;
     }
     DBUG_PRINT("error", ("CLUSTER FAILURE EVENT: "
                         "%s  received share: 0x%lx  op: 0x%lx  share op: 0x%lx  "
@@ -3287,6 +3286,7 @@ ndb_binlog_thread_handle_non_data_event(
                                share->key, share->use_count));
       free_share(&ndb_apply_status_share);
       ndb_apply_status_share= 0;
+      ndb_binlog_tables_inited= 0;
     }
     /* ToDo: remove printout */
     if (ndb_extra_logging)
@@ -4310,6 +4310,7 @@ err:
                              ndb_schema_share->use_count));
     free_share(&ndb_schema_share);
     ndb_schema_share= 0;
+    ndb_binlog_tables_inited= 0;
     pthread_mutex_unlock(&ndb_schema_share_mutex);
     /* end protect ndb_schema_share */
   }