Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
b7b774ee
Commit
b7b774ee
authored
Feb 20, 2007
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use "diff_files" instead ot "exec diff"
parent
e95e092b
Changes
15
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
16 additions
and
16 deletions
+16
-16
mysql-test/extra/rpl_tests/rpl_row_UUID.test
mysql-test/extra/rpl_tests/rpl_row_UUID.test
+1
-1
mysql-test/extra/rpl_tests/rpl_row_blob.test
mysql-test/extra/rpl_tests/rpl_row_blob.test
+1
-1
mysql-test/extra/rpl_tests/rpl_row_func003.test
mysql-test/extra/rpl_tests/rpl_row_func003.test
+1
-1
mysql-test/extra/rpl_tests/rpl_row_sp006.test
mysql-test/extra/rpl_tests/rpl_row_sp006.test
+1
-1
mysql-test/t/rpl_ndb_bank.test
mysql-test/t/rpl_ndb_bank.test
+1
-1
mysql-test/t/rpl_ndb_dd_advance.test
mysql-test/t/rpl_ndb_dd_advance.test
+1
-1
mysql-test/t/rpl_rbr_to_sbr.test
mysql-test/t/rpl_rbr_to_sbr.test
+1
-1
mysql-test/t/rpl_row_NOW.test
mysql-test/t/rpl_row_NOW.test
+1
-1
mysql-test/t/rpl_row_func002.test
mysql-test/t/rpl_row_func002.test
+1
-1
mysql-test/t/rpl_row_sp001.test
mysql-test/t/rpl_row_sp001.test
+1
-1
mysql-test/t/rpl_row_sp011.test
mysql-test/t/rpl_row_sp011.test
+1
-1
mysql-test/t/rpl_row_trig001.test
mysql-test/t/rpl_row_trig001.test
+1
-1
mysql-test/t/rpl_row_trig003.test
mysql-test/t/rpl_row_trig003.test
+1
-1
mysql-test/t/rpl_sp004.test
mysql-test/t/rpl_sp004.test
+1
-1
mysql-test/t/rpl_switch_stm_row_mixed.test
mysql-test/t/rpl_switch_stm_row_mixed.test
+2
-2
No files found.
mysql-test/extra/rpl_tests/rpl_row_UUID.test
View file @
b7b774ee
...
...
@@ -72,7 +72,7 @@ DROP TABLE test.t2;
# will be created. You will need to go to the mysql-test dir and diff
# the files your self to see what is not matching :-)
--
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
rpl_row_UUID_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
rpl_row_UUID_slave
.
sql
;
diff_files
$MYSQLTEST_VARDIR
/
tmp
/
rpl_row_UUID_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
rpl_row_UUID_slave
.
sql
;
# Cleanup dump files.
# Long-term "system rm" is not portable; we could live without
...
...
mysql-test/extra/rpl_tests/rpl_row_blob.test
View file @
b7b774ee
...
...
@@ -179,7 +179,7 @@ connection master;
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
$MYSQLTEST_VARDIR
/
tmp
/
rpl_row_blob_master
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
$MYSQLTEST_VARDIR
/
tmp
/
rpl_row_blob_slave
.
sql
--
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
rpl_row_blob_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
rpl_row_blob_slave
.
sql
diff_files
$MYSQLTEST_VARDIR
/
tmp
/
rpl_row_blob_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
rpl_row_blob_slave
.
sql
;
DROP
TABLE
IF
EXISTS
test
.
t1
;
DROP
TABLE
IF
EXISTS
test
.
t2
;
...
...
mysql-test/extra/rpl_tests/rpl_row_func003.test
View file @
b7b774ee
...
...
@@ -90,7 +90,7 @@ DROP TABLE test.t1;
# the files yourself to see what is not matching :-) File are located
# in $MYSQLTEST_VARDIR/tmp
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
func003_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
func003_slave
.
sql
;
diff_files
$MYSQLTEST_VARDIR
/
tmp
/
func003_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
func003_slave
.
sql
;
# End of 5.0 test case
mysql-test/extra/rpl_tests/rpl_row_sp006.test
View file @
b7b774ee
...
...
@@ -84,7 +84,7 @@ DROP DATABASE mysqltest1;
# the files your self to see what is not matching :-) Failed test
# Dump files will be located in $MYSQLTEST_VARDIR/tmp.
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
sp006_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
sp006_slave
.
sql
;
diff_files
$MYSQLTEST_VARDIR
/
tmp
/
sp006_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
sp006_slave
.
sql
;
sync_slave_with_master
;
...
...
mysql-test/t/rpl_ndb_bank.test
View file @
b7b774ee
...
...
@@ -175,7 +175,7 @@ insert into t1 values (1);
--
connection
master
drop
table
t1
;
--
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
master_BANK
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
slave_BANK
.
sql
diff_files
$MYSQLTEST_VARDIR
/
tmp
/
master_BANK
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
slave_BANK
.
sql
;
--
dec
$
2
}
mysql-test/t/rpl_ndb_dd_advance.test
View file @
b7b774ee
...
...
@@ -571,7 +571,7 @@ connection master;
--
echo
******
Do
dumps
compare
************
--
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
RPL_DD_ADV_M
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
RPL_DD_ADV_S
.
sql
diff_files
$MYSQLTEST_VARDIR
/
tmp
/
RPL_DD_ADV_M
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
RPL_DD_ADV_S
.
sql
;
## Note: Ths files should only get removed, if the above diff succeeds.
...
...
mysql-test/t/rpl_rbr_to_sbr.test
View file @
b7b774ee
...
...
@@ -39,7 +39,7 @@ DROP TABLE IF EXISTS t1;
# will be created. You will need to go to the mysql-test dir and diff
# the files your self to see what is not matching
--
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
rpl_rbr_to_sbr_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
rpl_rbr_to_sbr_slave
.
sql
;
diff_files
$MYSQLTEST_VARDIR
/
tmp
/
rpl_rbr_to_sbr_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
rpl_rbr_to_sbr_slave
.
sql
;
# If all is good, we can remove the files
...
...
mysql-test/t/rpl_row_NOW.test
View file @
b7b774ee
...
...
@@ -63,7 +63,7 @@ DROP FUNCTION mysqltest1.f1;
# the files your self to see what is not matching :-) The failed dump
# files will be located in $MYSQLTEST_VARDIR/tmp
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
NOW_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
NOW_slave
.
sql
;
diff_files
$MYSQLTEST_VARDIR
/
tmp
/
NOW_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
NOW_slave
.
sql
;
# If all is good, when can cleanup our dump files.
system
rm
$MYSQLTEST_VARDIR
/
tmp
/
NOW_master
.
sql
;
...
...
mysql-test/t/rpl_row_func002.test
View file @
b7b774ee
...
...
@@ -97,7 +97,7 @@ sync_slave_with_master;
# the files your self to see what is not matching :-). The files are located
# in mysql-test/var/tmp
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
func002_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
func002_slave
.
sql
;
diff_files
$MYSQLTEST_VARDIR
/
tmp
/
func002_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
func002_slave
.
sql
;
# End of 5.0 test case
mysql-test/t/rpl_row_sp001.test
View file @
b7b774ee
...
...
@@ -137,7 +137,7 @@ sync_slave_with_master;
# the files your self to see what is not matching :-) Failed dump files
# will be located in $MYSQLTEST_VARDIR/tmp
--
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
sp001_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
sp001_slave
.
sql
;
diff_files
$MYSQLTEST_VARDIR
/
tmp
/
sp001_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
sp001_slave
.
sql
;
# If all is good, when can cleanup our dump files.
system
rm
$MYSQLTEST_VARDIR
/
tmp
/
sp001_master
.
sql
;
...
...
mysql-test/t/rpl_row_sp011.test
View file @
b7b774ee
...
...
@@ -102,7 +102,7 @@ sync_slave_with_master;
# the files your self to see what is not matching :-) Failed test
# Will leave dump files in $MYSQLTEST_VARDIR/tmp
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
sp011_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
sp011_slave
.
sql
;
diff_files
$MYSQLTEST_VARDIR
/
tmp
/
sp011_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
sp011_slave
.
sql
;
# If all is good, when can cleanup our dump files.
system
rm
$MYSQLTEST_VARDIR
/
tmp
/
sp011_master
.
sql
;
...
...
mysql-test/t/rpl_row_trig001.test
View file @
b7b774ee
...
...
@@ -95,6 +95,6 @@ sync_slave_with_master;
# the files your self to see what is not matching :-) Failed tests
# will leave dump files in $MYSQLTEST_VARDIR/tmp
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
trig001_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
trig001_slave
.
sql
;
diff_files
$MYSQLTEST_VARDIR
/
tmp
/
trig001_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
trig001_slave
.
sql
;
# End of 5.0 test case
mysql-test/t/rpl_row_trig003.test
View file @
b7b774ee
...
...
@@ -147,6 +147,6 @@ DROP TABLE IF EXISTS test.t2;
DROP
TABLE
IF
EXISTS
test
.
t3
;
--
enable_warnings
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
trg003_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
trg003_slave
.
sql
;
diff_files
$MYSQLTEST_VARDIR
/
tmp
/
trg003_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
trg003_slave
.
sql
;
# End of 5.0 test case
mysql-test/t/rpl_sp004.test
View file @
b7b774ee
...
...
@@ -91,7 +91,7 @@ sync_slave_with_master;
# If the test fails, you will need to diff the dumps to see why.
--
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
sp004_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
sp004_slave
.
sql
diff_files
$MYSQLTEST_VARDIR
/
tmp
/
sp004_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
sp004_slave
.
sql
;
# End of 5.0 test case
mysql-test/t/rpl_switch_stm_row_mixed.test
View file @
b7b774ee
...
...
@@ -509,7 +509,7 @@ sync_slave_with_master;
# will be created. You will need to go to the mysql-test dir and diff
# the files your self to see what is not matching
--
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
rpl_switch_stm_row_mixed_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
rpl_switch_stm_row_mixed_slave
.
sql
;
diff_files
$MYSQLTEST_VARDIR
/
tmp
/
rpl_switch_stm_row_mixed_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
rpl_switch_stm_row_mixed_slave
.
sql
;
connection
master
;
--
replace_column
2
# 5 #
...
...
@@ -537,7 +537,7 @@ drop database mysqltest1;
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
mysqltest1
>
$MYSQLTEST_VARDIR
/
tmp
/
rpl_switch_stm_row_mixed_master
.
sql
# the old mysqldump output on slave is the same as what it was on
# master before restoring on master.
--
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
rpl_switch_stm_row_mixed_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
rpl_switch_stm_row_mixed_slave
.
sql
;
diff_files
$MYSQLTEST_VARDIR
/
tmp
/
rpl_switch_stm_row_mixed_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
rpl_switch_stm_row_mixed_slave
.
sql
;
}
drop
database
mysqltest1
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment