Skip to content

M
MariaDB
Commit 5435b66b authored by unknown's avatar unknown
Browse files
Options

Fix after merge 


mysql-test/extra/rpl_tests/rpl_charset.test:
  Fix merge error
mysql-test/lib/mtr_report.pm:
  Move the . out of [] to avoid log file parsing errors
mysql-test/mysql-test-run.pl:
  Correct spelling of option
sql/ha_ndbcluster_binlog.cc:
  Fix merge error(used "Use remote")
parent 3320c165
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 21 deletions
mysql-test/extra/rpl_tests/rpl_charset.test
View file @ 5435b66b
...@@ -137,8 +137,6 @@ sync_slave_with_master; ...@@ -137,8 +137,6 @@ sync_slave_with_master;
select hex(c1), hex(c2) from t1; select hex(c1), hex(c2) from t1;
connection master; connection master;
let $MYSQLD_DATADIR= `select @@datadir`;
--exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000001
drop table t1; drop table t1;
sync_slave_with_master; sync_slave_with_master;
......
mysql-test/lib/mtr_report.pm
View file @ 5435b66b
...@@ -75,7 +75,7 @@ sub mtr_report_test_skipped ($) { ...@@ -75,7 +75,7 @@ sub mtr_report_test_skipped ($) {
{ {
if ( $tinfo->{skip_detected_by_test} ) if ( $tinfo->{skip_detected_by_test} )
{ {
mtr_report("[ skip.] $tinfo->{'comment'}"); mtr_report("[ skip ]. $tinfo->{'comment'}");
} }
else else
{ {
......
mysql-test/mysql-test-run.pl
View file @ 5435b66b
...@@ -302,7 +302,7 @@ sub command_line_setup { ...@@ -302,7 +302,7 @@ sub command_line_setup {
'start-from=s' => \&collect_option, 'start-from=s' => \&collect_option,
'big-test' => \$opt_big_test, 'big-test' => \$opt_big_test,
'combination=s' => \@opt_combinations, 'combination=s' => \@opt_combinations,
'skip-combination' => \&collect_option, 'skip-combinations' => \&collect_option,
'skip-im' => \&ignore_option, 'skip-im' => \&ignore_option,
......
mysql-test/suite/binlog/r/binlog_start_comment.result
View file @ 5435b66b
...@@ -2,7 +2,7 @@ reset master; ...@@ -2,7 +2,7 @@ reset master;
drop table if exists t1,t2; drop table if exists t1,t2;
create table t1 (word varchar(20)) -- create table t1; create table t1 (word varchar(20)) -- create table t1;
create table t2 (word varchar(20)) -- create table t2; 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"); insert into t2 values ("Ada");
flush logs; flush logs;
select * from t2; select * from t2;
......
mysql-test/suite/binlog/t/binlog_start_comment.test
View file @ 5435b66b
...@@ -10,15 +10,16 @@ drop table if exists t1,t2; ...@@ -10,15 +10,16 @@ drop table if exists t1,t2;
--enable_warnings --enable_warnings
create table t1 (word varchar(20)) -- create table t1; create table t1 (word varchar(20)) -- create table t1;
create table t2 (word varchar(20)) -- create table t2; 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"); insert into t2 values ("Ada");
flush logs; flush logs;
select * from t2; 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 --exec $MYSQL --local-infile=1 < $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog
flush logs; flush logs;
select * from t2; select * from t2;
# clean up # clean up
drop table t1,t2; drop table t1,t2;
#--system rm $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog remove_file $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog;
mysql-test/t/drop.test
View file @ 5435b66b
...@@ -131,7 +131,8 @@ create table mysql_test.t1(f1 int); ...@@ -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_7` (f1 int);
create table mysql_test.`#sql-347f_8` (f1 int); create table mysql_test.`#sql-347f_8` (f1 int);
drop table mysql_test.`#sql-347f_8`; 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; drop database mysql_test;
--echo End of 5.1 tests --echo End of 5.1 tests
mysql-test/t/myisampack.test
View file @ 5435b66b
...@@ -26,8 +26,9 @@ INSERT INTO t1 VALUES ...@@ -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), (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); (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; FLUSH TABLES;
--exec $MYISAMPACK -s $MYSQLTEST_VARDIR/master-data/test/t1 let $MYSQLD_DATADIR= `select @@datadir`;
--exec $MYISAMCHK -srq $MYSQLTEST_VARDIR/master-data/test/t1 --exec $MYISAMPACK -s $MYSQLD_DATADIR/test/t1
--exec $MYISAMCHK -s --unpack $MYSQLTEST_VARDIR/master-data/test/t1 --exec $MYISAMCHK -srq $MYSQLD_DATADIR/test/t1
--exec $MYISAMCHK -s --unpack $MYSQLD_DATADIR/test/t1
CHECK TABLE t1 EXTENDED; CHECK TABLE t1 EXTENDED;
DROP TABLE t1; DROP TABLE t1;
mysql-test/t/mysqlcheck.test
View file @ 5435b66b
...@@ -55,9 +55,10 @@ create table t_bug25347 (a int); ...@@ -55,9 +55,10 @@ create table t_bug25347 (a int);
create view v_bug25347 as select * from t_bug25347; create view v_bug25347 as select * from t_bug25347;
insert into t_bug25347 values (1),(2),(3); insert into t_bug25347 values (1),(2),(3);
flush tables; flush tables;
let $MYSQLD_DATADIR= `select @@datadir`;
--echo removing and creating --echo removing and creating
--remove_file $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI --remove_file $MYSQLD_DATADIR/d_bug25347/t_bug25347.MYI
--write_file $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI --write_file $MYSQLD_DATADIR/d_bug25347/t_bug25347.MYI
EOF EOF
--exec $MYSQL_CHECK --repair --databases d_bug25347 --exec $MYSQL_CHECK --repair --databases d_bug25347
--error 130 --error 130
...@@ -79,7 +80,8 @@ use test; ...@@ -79,7 +80,8 @@ use test;
create table t1(a int); create table t1(a int);
create view v1 as select * from t1; create view v1 as select * from t1;
show tables; 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; show tables;
--exec $MYSQL_CHECK --check-upgrade --fix-table-names --databases test --exec $MYSQL_CHECK --check-upgrade --fix-table-names --databases test
show tables; show tables;
......
sql/ha_ndbcluster_binlog.cc
View file @ 5435b66b
...@@ -918,12 +918,9 @@ int ndbcluster_setup_binlog_table_shares(THD *thd) ...@@ -918,12 +918,9 @@ int ndbcluster_setup_binlog_table_shares(THD *thd)
{ {
pthread_mutex_lock(&LOCK_open); pthread_mutex_lock(&LOCK_open);
ndb_binlog_tables_inited= TRUE; ndb_binlog_tables_inited= TRUE;
if (ndb_binlog_running)
{
if (ndb_extra_logging) if (ndb_extra_logging)
sql_print_information("NDB Binlog: ndb tables writable"); sql_print_information("NDB Binlog: ndb tables writable");
close_cached_tables(NULL, NULL, TRUE, FALSE, FALSE); close_cached_tables(NULL, NULL, TRUE, FALSE, FALSE);
}
pthread_mutex_unlock(&LOCK_open); pthread_mutex_unlock(&LOCK_open);
/* Signal injector thread that all is setup */ /* Signal injector thread that all is setup */
pthread_cond_signal(&injector_cond); pthread_cond_signal(&injector_cond);
...@@ -2068,6 +2065,7 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb, ...@@ -2068,6 +2065,7 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb,
ndb_schema_share->use_count)); ndb_schema_share->use_count));
free_share(&ndb_schema_share); free_share(&ndb_schema_share);
ndb_schema_share= 0; ndb_schema_share= 0;
ndb_binlog_tables_inited= 0;
pthread_mutex_unlock(&ndb_schema_share_mutex); pthread_mutex_unlock(&ndb_schema_share_mutex);
/* end protect ndb_schema_share */ /* end protect ndb_schema_share */
...@@ -3268,6 +3266,7 @@ ndb_binlog_thread_handle_non_data_event(THD *thd, Ndb *ndb, ...@@ -3268,6 +3266,7 @@ ndb_binlog_thread_handle_non_data_event(THD *thd, Ndb *ndb,
share->key, share->use_count)); share->key, share->use_count));
free_share(&ndb_apply_status_share); free_share(&ndb_apply_status_share);
ndb_apply_status_share= 0; ndb_apply_status_share= 0;
ndb_binlog_tables_inited= 0;
} }
DBUG_PRINT("error", ("CLUSTER FAILURE EVENT: " DBUG_PRINT("error", ("CLUSTER FAILURE EVENT: "
"%s received share: 0x%lx op: 0x%lx share op: 0x%lx " "%s received share: 0x%lx op: 0x%lx share op: 0x%lx "
...@@ -3287,6 +3286,7 @@ ndb_binlog_thread_handle_non_data_event(THD *thd, Ndb *ndb, ...@@ -3287,6 +3286,7 @@ ndb_binlog_thread_handle_non_data_event(THD *thd, Ndb *ndb,
share->key, share->use_count)); share->key, share->use_count));
free_share(&ndb_apply_status_share); free_share(&ndb_apply_status_share);
ndb_apply_status_share= 0; ndb_apply_status_share= 0;
ndb_binlog_tables_inited= 0;
} }
/* ToDo: remove printout */ /* ToDo: remove printout */
if (ndb_extra_logging) if (ndb_extra_logging)
...@@ -4310,6 +4310,7 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) ...@@ -4310,6 +4310,7 @@ pthread_handler_t ndb_binlog_thread_func(void *arg)
ndb_schema_share->use_count)); ndb_schema_share->use_count));
free_share(&ndb_schema_share); free_share(&ndb_schema_share);
ndb_schema_share= 0; ndb_schema_share= 0;
ndb_binlog_tables_inited= 0;
pthread_mutex_unlock(&ndb_schema_share_mutex); pthread_mutex_unlock(&ndb_schema_share_mutex);
/* end protect ndb_schema_share */ /* end protect ndb_schema_share */
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7