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
436b4985
Commit
436b4985
authored
18 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.1-new
into mysql.com:/usr/local/mysql/tmpbuild-5.1
parents
50ba4998
ed7c2536
No related merge requests found
Changes
51
Hide whitespace changes
Inline
Side-by-side
Showing
51 changed files
with
151 additions
and
111 deletions
+151
-111
client/mysqlbinlog.cc
client/mysqlbinlog.cc
+1
-1
mysql-test/extra/rpl_tests/rpl_row_001.test
mysql-test/extra/rpl_tests/rpl_row_001.test
+1
-1
mysql-test/extra/rpl_tests/rpl_row_UUID.test
mysql-test/extra/rpl_tests/rpl_row_UUID.test
+3
-3
mysql-test/extra/rpl_tests/rpl_row_blob.test
mysql-test/extra/rpl_tests/rpl_row_blob.test
+3
-3
mysql-test/extra/rpl_tests/rpl_row_charset.test
mysql-test/extra/rpl_tests/rpl_row_charset.test
+2
-2
mysql-test/extra/rpl_tests/rpl_row_func003.test
mysql-test/extra/rpl_tests/rpl_row_func003.test
+4
-4
mysql-test/extra/rpl_tests/rpl_row_sp006.test
mysql-test/extra/rpl_tests/rpl_row_sp006.test
+4
-4
mysql-test/include/ndb_backup.inc
mysql-test/include/ndb_backup.inc
+2
-2
mysql-test/include/partition_1.inc
mysql-test/include/partition_1.inc
+1
-1
mysql-test/include/partition_layout.inc
mysql-test/include/partition_layout.inc
+1
-1
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+14
-5
mysql-test/r/mysqlbinlog_base64.result
mysql-test/r/mysqlbinlog_base64.result
+1
-1
mysql-test/r/ndb_dd_backuprestore.result
mysql-test/r/ndb_dd_backuprestore.result
+3
-3
mysql-test/r/ndb_load.result
mysql-test/r/ndb_load.result
+2
-2
mysql-test/r/rpl_LD_INFILE.result
mysql-test/r/rpl_LD_INFILE.result
+2
-2
mysql-test/r/rpl_load_table_from_master.result
mysql-test/r/rpl_load_table_from_master.result
+2
-2
mysql-test/r/rpl_loaddata2.result
mysql-test/r/rpl_loaddata2.result
+1
-1
mysql-test/r/rpl_loaddata_m.result
mysql-test/r/rpl_loaddata_m.result
+2
-2
mysql-test/r/rpl_loadfile.result
mysql-test/r/rpl_loadfile.result
+2
-2
mysql-test/r/rpl_ndb_bank.result
mysql-test/r/rpl_ndb_bank.result
+1
-1
mysql-test/r/rpl_ndb_row_001.result
mysql-test/r/rpl_ndb_row_001.result
+1
-1
mysql-test/r/rpl_ndb_sync.result
mysql-test/r/rpl_ndb_sync.result
+1
-1
mysql-test/r/rpl_row_001.result
mysql-test/r/rpl_row_001.result
+1
-1
mysql-test/r/rpl_row_loaddata_m.result
mysql-test/r/rpl_row_loaddata_m.result
+1
-1
mysql-test/r/rpl_row_stop_middle_update.result
mysql-test/r/rpl_row_stop_middle_update.result
+1
-1
mysql-test/t/binlog_row_mix_innodb_myisam-master.opt
mysql-test/t/binlog_row_mix_innodb_myisam-master.opt
+0
-0
mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt
mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt
+1
-0
mysql-test/t/loaddata.test
mysql-test/t/loaddata.test
+1
-1
mysql-test/t/mysqlbinlog_base64.test
mysql-test/t/mysqlbinlog_base64.test
+4
-4
mysql-test/t/ndb_dd_dump.test
mysql-test/t/ndb_dd_dump.test
+2
-2
mysql-test/t/ndb_load.test
mysql-test/t/ndb_load.test
+2
-2
mysql-test/t/rpl_LD_INFILE.test
mysql-test/t/rpl_LD_INFILE.test
+2
-2
mysql-test/t/rpl_drop_db.test
mysql-test/t/rpl_drop_db.test
+1
-1
mysql-test/t/rpl_load_table_from_master.test
mysql-test/t/rpl_load_table_from_master.test
+2
-2
mysql-test/t/rpl_loaddata2.test
mysql-test/t/rpl_loaddata2.test
+1
-1
mysql-test/t/rpl_loaddata_m.test
mysql-test/t/rpl_loaddata_m.test
+2
-2
mysql-test/t/rpl_loadfile.test
mysql-test/t/rpl_loadfile.test
+2
-2
mysql-test/t/rpl_ndb_bank.test
mysql-test/t/rpl_ndb_bank.test
+5
-5
mysql-test/t/rpl_ndb_sync.test
mysql-test/t/rpl_ndb_sync.test
+2
-2
mysql-test/t/rpl_row_NOW.test
mysql-test/t/rpl_row_NOW.test
+6
-6
mysql-test/t/rpl_row_func002.test
mysql-test/t/rpl_row_func002.test
+3
-3
mysql-test/t/rpl_row_sp001.test
mysql-test/t/rpl_row_sp001.test
+6
-6
mysql-test/t/rpl_row_sp011.test
mysql-test/t/rpl_row_sp011.test
+6
-6
mysql-test/t/rpl_row_stop_middle_update.test
mysql-test/t/rpl_row_stop_middle_update.test
+1
-1
mysql-test/t/rpl_row_trig001.test
mysql-test/t/rpl_row_trig001.test
+4
-4
mysql-test/t/rpl_row_trig003.test
mysql-test/t/rpl_row_trig003.test
+3
-3
mysql-test/t/rpl_sp004.test
mysql-test/t/rpl_sp004.test
+3
-3
mysql-test/t/show_check.test
mysql-test/t/show_check.test
+1
-1
win/cmakefiles/client
win/cmakefiles/client
+30
-2
win/cmakefiles/extra
win/cmakefiles/extra
+2
-0
win/cmakefiles/sql
win/cmakefiles/sql
+2
-2
No files found.
client/mysqlbinlog.cc
View file @
436b4985
...
...
@@ -1497,7 +1497,7 @@ int main(int argc, char** argv)
the server
*/
#if
def __WIN__
#if
defined(__WIN__) && !defined(USING_CMAKE)
#include "my_decimal.h"
#include "decimal.c"
#include "my_decimal.cpp"
...
...
This diff is collapsed.
Click to expand it.
mysql-test/extra/rpl_tests/rpl_row_001.test
View file @
436b4985
...
...
@@ -2,7 +2,7 @@
--
source
include
/
have_binlog_format_row
.
inc
CREATE
TABLE
t1
(
word
CHAR
(
20
)
NOT
NULL
);
LOAD
DATA
INFILE
'../
../std_data
/words.dat'
INTO
TABLE
t1
;
LOAD
DATA
INFILE
'../
std_data_ln
/words.dat'
INTO
TABLE
t1
;
--
replace_result
$MYSQL_TEST_DIR
MYSQL_TEST_DIR
eval
LOAD
DATA
LOCAL
INFILE
'$MYSQL_TEST_DIR/std_data/words.dat'
INTO
TABLE
t1
;
SELECT
*
FROM
t1
ORDER
BY
word
LIMIT
10
;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/extra/rpl_tests/rpl_row_UUID.test
View file @
436b4985
...
...
@@ -56,8 +56,8 @@ SHOW CREATE TABLE test.t1;
# then LOAD DATA INFILE in slave, and use a query to compare.
# This would have the advantage that it would not assume
# the system has a 'diff'
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
./
var
/
tmp
/
rpl_row_UUID_master
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
./
var
/
tmp
/
rpl_row_UUID_slave
.
sql
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
$MYSQLTEST_VARDIR
/
tmp
/
rpl_row_UUID_master
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
$MYSQLTEST_VARDIR
/
tmp
/
rpl_row_UUID_slave
.
sql
connection
master
;
# Let's cleanup
...
...
@@ -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
./
var
/
tmp
/
rpl_row_UUID_master
.
sql
./
var
/
tmp
/
rpl_row_UUID_slave
.
sql
;
--
exec
diff
$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
...
...
This diff is collapsed.
Click to expand it.
mysql-test/extra/rpl_tests/rpl_row_blob.test
View file @
436b4985
...
...
@@ -176,10 +176,10 @@ connection master;
--
echo
# Post test clean up section
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
./
var
/
tmp
/
rpl_row_blob_master
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
./
var
/
tmp
/
rpl_row_blob_slave
.
sql
--
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
./
var
/
tmp
/
rpl_row_blob_master
.
sql
./
var
/
tmp
/
rpl_row_blob_slave
.
sql
--
exec
diff
$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
;
This diff is collapsed.
Click to expand it.
mysql-test/extra/rpl_tests/rpl_row_charset.test
View file @
436b4985
...
...
@@ -162,8 +162,8 @@ select hex(c1), hex(c2) from t1;
connection
master
;
# Let's have a look at generated SETs.
--
replace_result
$MYSQL
_TEST_DIR
MYSQL_TEST_DIR
#--exec $MYSQL_BINLOG --short-form $MYSQL
_TEST_DIR/var
/log/master-bin.000001
--
replace_result
$MYSQL
TEST_VARDIR
MYSQL_TEST_DIR
/
var
#--exec $MYSQL_BINLOG --short-form $MYSQL
TEST_VARDIR
/log/master-bin.000001
drop
table
t1
;
sync_slave_with_master
;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/extra/rpl_tests/rpl_row_func003.test
View file @
436b4985
...
...
@@ -77,8 +77,8 @@ SET AUTOCOMMIT=1;
# time to dump the databases and so we can see if they match
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
./
var
/
tmp
/
func003_master
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
./
var
/
tmp
/
func003_slave
.
sql
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
$MYSQLTEST_VARDIR
/
tmp
/
func003_master
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
$MYSQLTEST_VARDIR
/
tmp
/
func003_slave
.
sql
# First lets cleanupi
DROP
FUNCTION
test
.
f1
;
...
...
@@ -88,9 +88,9 @@ DROP TABLE test.t1;
# the test will show that the diff statement failed and no reject file
# will be created. You will need to go to the mysql-test dir and diff
# the files yourself to see what is not matching :-) File are located
# in
mysql-test/var
/tmp
# in
$MYSQLTEST_VARDIR
/tmp
exec
diff
./
var
/
tmp
/
func003_master
.
sql
./
var
/
tmp
/
func003_slave
.
sql
;
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
func003_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
func003_slave
.
sql
;
# End of 5.0 test case
This diff is collapsed.
Click to expand it.
mysql-test/extra/rpl_tests/rpl_row_sp006.test
View file @
436b4985
...
...
@@ -68,8 +68,8 @@ sync_slave_with_master;
connection
master
;
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
mysqltest1
>
./
var
/
tmp
/
sp006_master
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
mysqltest1
>
./
var
/
tmp
/
sp006_slave
.
sql
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
mysqltest1
>
$MYSQLTEST_VARDIR
/
tmp
/
sp006_master
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
mysqltest1
>
$MYSQLTEST_VARDIR
/
tmp
/
sp006_slave
.
sql
DROP
PROCEDURE
IF
EXISTS
mysqltest1
.
p1
;
...
...
@@ -81,9 +81,9 @@ DROP TABLE IF EXISTS mysqltest1.t2;
# the test will show that the diff statement failed and not reject file
# 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 :-) Failed test
# Dump files will be located in
mysql-test/var
/tmp.
# Dump files will be located in
$MYSQLTEST_VARDIR
/tmp.
exec
diff
./
var
/
tmp
/
sp006_master
.
sql
./
var
/
tmp
/
sp006_slave
.
sql
;
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
sp006_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
sp006_slave
.
sql
;
sync_slave_with_master
;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/include/ndb_backup.inc
View file @
436b4985
...
...
@@ -6,13 +6,13 @@
# there is no neat way to find the backupid, this is a hack to find it...
--
exec
$NDB_TOOLS_DIR
/
ndb_select_all
--
ndb
-
connectstring
=
"localhost:
$NDBCLUSTER_PORT
"
-
d
sys
--
delimiter
=
','
SYSTAB_0
|
grep
520093696
>
var
/
tmp
.
dat
--
exec
$NDB_TOOLS_DIR
/
ndb_select_all
--
ndb
-
connectstring
=
"localhost:
$NDBCLUSTER_PORT
"
-
d
sys
--
delimiter
=
','
SYSTAB_0
|
grep
520093696
>
$MYSQLTEST_VARDIR
/
tmp
.
dat
CREATE
TEMPORARY
TABLE
IF
NOT
EXISTS
test
.
backup_info
(
id
INT
,
backup_id
INT
)
ENGINE
=
HEAP
;
DELETE
FROM
test
.
backup_info
;
LOAD
DATA
INFILE
'../
../var/
tmp.dat'
INTO
TABLE
test
.
backup_info
FIELDS
TERMINATED
BY
','
;
LOAD
DATA
INFILE
'../tmp.dat'
INTO
TABLE
test
.
backup_info
FIELDS
TERMINATED
BY
','
;
--
replace_column
1
<
the_backup_id
>
...
...
This diff is collapsed.
Click to expand it.
mysql-test/include/partition_1.inc
View file @
436b4985
...
...
@@ -36,7 +36,7 @@ let $fixed_bug16370= 0;
##### Option, for displaying files #####
#
# Attention: Displaying the directory content via "ls
var
/master-data/test/t*"
# Attention: Displaying the directory content via "ls
$MYSQLTEST_VARDIR
/master-data/test/t*"
# is probably not portable.
# let $ls= 0; disables the execution of "ls ....."
let
$ls
=
0
;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/include/partition_layout.inc
View file @
436b4985
...
...
@@ -9,5 +9,5 @@ eval SHOW CREATE TABLE t1;
# listing of files belonging to the table t1
if
(
$ls
)
{
--
exec
ls
var
/
master
-
data
/
test
/
t1
*
--
exec
ls
$MYSQLTEST_VARDIR
/
master
-
data
/
test
/
t1
*
}
This diff is collapsed.
Click to expand it.
mysql-test/mysql-test-run.pl
View file @
436b4985
...
...
@@ -981,16 +981,25 @@ sub executable_setup () {
if
(
$glob_win32
)
{
$path_client_bindir
=
mtr_path_exists
("
$glob_basedir
/client_release
",
"
$glob_basedir
/bin
");
"
$glob_basedir
/bin
",
# New CMake locations.
"
$glob_basedir
/client/release
",
"
$glob_basedir
/client/debug
");
$exe_mysqld
=
mtr_exe_exists
("
$path_client_bindir
/mysqld-max
",
"
$path_client_bindir
/mysqld-nt
",
"
$path_client_bindir
/mysqld
",
"
$path_client_bindir
/mysqld-debug
",);
$path_language
=
mtr_path_exists
("
$glob_basedir
/share/english/
");
$path_charsetsdir
=
mtr_path_exists
("
$glob_basedir
/share/charsets
");
"
$path_client_bindir
/mysqld-debug
",
"
$glob_basedir
/sql/release/mysqld
",
"
$glob_basedir
/sql/debug/mysqld
");
$path_language
=
mtr_path_exists
("
$glob_basedir
/share/english/
",
"
$glob_basedir
/sql/share/english/
");
$path_charsetsdir
=
mtr_path_exists
("
$glob_basedir
/share/charsets
",
"
$glob_basedir
/sql/share/charsets
");
$exe_my_print_defaults
=
mtr_exe_exists
("
$path_client_bindir
/my_print_defaults
");
mtr_exe_exists
("
$path_client_bindir
/my_print_defaults
",
"
$glob_basedir
/extra/release/my_print_defaults
",
"
$glob_basedir
/extra/debug/my_print_defaults
");
}
else
{
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/mysqlbinlog_base64.result
View file @
436b4985
...
...
@@ -5,7 +5,7 @@ insert into t1 values (3);
update t1 set a=a+2 where a=2;
update t1 set a=a+2 where a=3;
create table t2 (word varchar(20));
load data infile '../
../std_data
/words.dat' into table t2;
load data infile '../
std_data_ln
/words.dat' into table t2;
drop table t1;
drop table t2;
select * from t1;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/ndb_dd_backuprestore.result
View file @
436b4985
...
...
@@ -29,7 +29,7 @@ pk1 c2 c3 hex(c4)
5 Sweden 496 1
CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;
DELETE FROM test.backup_info;
LOAD DATA INFILE '../
../var/
tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
SELECT @the_backup_id:=backup_id FROM test.backup_info;
@the_backup_id:=backup_id
<the_backup_id>
...
...
@@ -97,7 +97,7 @@ LENGTH(data)
16384
CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;
DELETE FROM test.backup_info;
LOAD DATA INFILE '../
../var/
tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
SELECT @the_backup_id:=backup_id FROM test.backup_info;
@the_backup_id:=backup_id
<the_backup_id>
...
...
@@ -310,7 +310,7 @@ pk1 c2 c3 hex(c4)
246 TEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXAS, ITALY, Kyle, JO, JBM,TU 8 1
CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;
DELETE FROM test.backup_info;
LOAD DATA INFILE '../
../var/
tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
SELECT @the_backup_id:=backup_id FROM test.backup_info;
@the_backup_id:=backup_id
<the_backup_id>
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/ndb_load.result
View file @
436b4985
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=NDB;
LOAD DATA INFILE '../
../std_data
/words.dat' INTO TABLE t1 ;
LOAD DATA INFILE '../
std_data_ln
/words.dat' INTO TABLE t1 ;
ERROR 23000: Can't write; duplicate key in table 't1'
DROP TABLE t1;
CREATE TABLE t1 (word CHAR(20) NOT NULL) ENGINE=NDB;
LOAD DATA INFILE '../
../std_data
/words.dat' INTO TABLE t1 ;
LOAD DATA INFILE '../
std_data_ln
/words.dat' INTO TABLE t1 ;
SELECT * FROM t1 ORDER BY word;
word
Aarhus
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/rpl_LD_INFILE.result
View file @
436b4985
...
...
@@ -6,10 +6,10 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
DROP TABLE IF EXISTS test.t1;
CREATE TABLE test.t1 (a VARCHAR(255), PRIMARY KEY(a));
LOAD DATA INFILE '../
../std_data
/words2.dat' INTO TABLE test.t1;
LOAD DATA INFILE '../
std_data_ln
/words2.dat' INTO TABLE test.t1;
DELETE FROM test.t1 WHERE a = 'abashed';
DELETE FROM test.t1;
LOAD DATA INFILE '../
../std_data
/words2.dat' INTO TABLE test.t1;
LOAD DATA INFILE '../
std_data_ln
/words2.dat' INTO TABLE test.t1;
SELECT * FROM test.t1 ORDER BY a DESC;
a
aberration
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/rpl_load_table_from_master.result
View file @
436b4985
...
...
@@ -29,9 +29,9 @@ drop table t1;
drop table t1;
set SQL_LOG_BIN=0;
create table t1 (word char(20) not null, index(word))ENGINE=MyISAM;
load data infile '../
../std_data
/words.dat' into table t1;
load data infile '../
std_data_ln
/words.dat' into table t1;
create table t2 (word char(20) not null)ENGINE=MyISAM;
load data infile '../
../std_data
/words.dat' into table t2;
load data infile '../
std_data_ln
/words.dat' into table t2;
create table t3 (word char(20) not null primary key)ENGINE=MyISAM;
load table t1 from master;
load table t2 from master;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/rpl_loaddata2.result
View file @
436b4985
...
...
@@ -5,7 +5,7 @@ reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
CREATE TABLE t1 (word CHAR(20) NOT NULL);
LOAD DATA INFILE '../
../std_data
/words.dat' INTO TABLE t1;
LOAD DATA INFILE '../
std_data_ln
/words.dat' INTO TABLE t1;
SELECT * FROM t1 ORDER BY word;
word
Aarhus
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/rpl_loaddata_m.result
View file @
436b4985
...
...
@@ -7,14 +7,14 @@ start slave;
drop database if exists mysqltest;
USE test;
CREATE TABLE t1(a INT, b INT, UNIQUE(b));
LOAD DATA INFILE '../
../std_data
/rpl_loaddata.dat' INTO TABLE test.t1;
LOAD DATA INFILE '../
std_data_ln
/rpl_loaddata.dat' INTO TABLE test.t1;
SELECT COUNT(*) FROM test.t1;
COUNT(*)
2
CREATE DATABASE mysqltest;
USE mysqltest;
CREATE TABLE t1(a INT, b INT, UNIQUE(b));
LOAD DATA INFILE '../
../std_data
/rpl_loaddata.dat' INTO TABLE mysqltest.t1;
LOAD DATA INFILE '../
std_data_ln
/rpl_loaddata.dat' INTO TABLE mysqltest.t1;
SELECT COUNT(*) FROM mysqltest.t1;
COUNT(*)
2
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/rpl_loadfile.result
View file @
436b4985
...
...
@@ -8,11 +8,11 @@ DROP PROCEDURE IF EXISTS test.p1;
DROP TABLE IF EXISTS test.t1;
CREATE TABLE test.t1 (a INT, blob_column LONGBLOB, PRIMARY KEY(a));
INSERT INTO test.t1 VALUES(1,'test');
UPDATE test.t1 SET blob_column=LOAD_FILE('../
../std_data
/words2.dat') WHERE a=1;
UPDATE test.t1 SET blob_column=LOAD_FILE('../
std_data_ln
/words2.dat') WHERE a=1;
create procedure test.p1()
begin
INSERT INTO test.t1 VALUES(2,'test');
UPDATE test.t1 SET blob_column=LOAD_FILE('../
../std_data
/words2.dat') WHERE a=2;
UPDATE test.t1 SET blob_column=LOAD_FILE('../
std_data_ln
/words2.dat') WHERE a=2;
end|
CALL test.p1();
SELECT * FROM test.t1 ORDER BY blob_column;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/rpl_ndb_bank.result
View file @
436b4985
...
...
@@ -49,7 +49,7 @@ CREATE DATABASE BANK;
RESET MASTER;
CREATE TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT) ENGINE = HEAP;
DELETE FROM cluster_replication.backup_info;
LOAD DATA INFILE '../
../var/
tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
LOAD DATA INFILE '../tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info;
@the_backup_id:=backup_id
<the_backup_id>
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/rpl_ndb_row_001.result
View file @
436b4985
...
...
@@ -5,7 +5,7 @@ reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
CREATE TABLE t1 (word CHAR(20) NOT NULL);
LOAD DATA INFILE '../
../std_data
/words.dat' INTO TABLE t1;
LOAD DATA INFILE '../
std_data_ln
/words.dat' INTO TABLE t1;
LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/std_data/words.dat' INTO TABLE t1;
SELECT * FROM t1 ORDER BY word LIMIT 10;
word
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/rpl_ndb_sync.result
View file @
436b4985
...
...
@@ -27,7 +27,7 @@ hex(c2) hex(c3) c1
0 0 DEFGHIJKL
CREATE TEMPORARY TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT)ENGINE=HEAP;
DELETE FROM cluster_replication.backup_info;
LOAD DATA INFILE '../
../var/
tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
LOAD DATA INFILE '../tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info;
@the_backup_id:=backup_id
<the_backup_id>
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/rpl_row_001.result
View file @
436b4985
...
...
@@ -5,7 +5,7 @@ reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
CREATE TABLE t1 (word CHAR(20) NOT NULL);
LOAD DATA INFILE '../
../std_data
/words.dat' INTO TABLE t1;
LOAD DATA INFILE '../
std_data_ln
/words.dat' INTO TABLE t1;
LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/std_data/words.dat' INTO TABLE t1;
SELECT * FROM t1 ORDER BY word LIMIT 10;
word
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/rpl_row_loaddata_m.result
View file @
436b4985
...
...
@@ -9,7 +9,7 @@ stop slave;
create database mysqltest;
use mysqltest;
create table t1(a int, b int, unique(b));
load data infile '../
../std_data
/rpl_loaddata.dat' into table t1;
load data infile '../
std_data_ln
/rpl_loaddata.dat' into table t1;
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # #
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/rpl_row_stop_middle_update.result
View file @
436b4985
...
...
@@ -5,7 +5,7 @@ reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
create table t1 (words varchar(20)) engine=myisam;
load data infile '../
../std_data
/words.dat' into table t1 (words);
load data infile '../
std_data_ln
/words.dat' into table t1 (words);
select count(*) from t1;
count(*)
70
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/
mix_innodb_myisam_binlog
-master.opt
→
mysql-test/t/
binlog_row_mix_innodb_myisam
-master.opt
View file @
436b4985
File moved
This diff is collapsed.
Click to expand it.
mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt
0 → 100644
View file @
436b4985
--loose-innodb_lock_wait_timeout=2
This diff is collapsed.
Click to expand it.
mysql-test/t/loaddata.test
View file @
436b4985
...
...
@@ -135,6 +135,6 @@ select @@character_set_filesystem;
LOAD
DATA
INFILE
't@002d1'
INTO
TABLE
t1
;
SELECT
*
FROM
t1
;
DROP
TABLE
t1
;
--
exec
rm
$MYSQL
_TEST_DIR
/
var
/
master
-
data
/
test
/
t
@
002
d1
--
exec
rm
$MYSQL
TEST_VARDIR
/
master
-
data
/
test
/
t
@
002
d1
SET
character_set_filesystem
=
default
;
select
@@
character_set_filesystem
;
This diff is collapsed.
Click to expand it.
mysql-test/t/mysqlbinlog_base64.test
View file @
436b4985
...
...
@@ -10,19 +10,19 @@ update t1 set a=a+2 where a=2;
update
t1
set
a
=
a
+
2
where
a
=
3
;
create
table
t2
(
word
varchar
(
20
));
load
data
infile
'../
../std_data
/words.dat'
into
table
t2
;
load
data
infile
'../
std_data_ln
/words.dat'
into
table
t2
;
#
# Save binlog
#
--
exec
$MYSQL_BINLOG
--
hexdump
$MYSQL
_TEST_DIR
/
var
/
log
/
master
-
bin
.
000001
>
$MYSQL_TEST_DIR
/
var
/
tmp
/
mysqlbinlog_base64
.
sql
--
exec
$MYSQL_BINLOG
--
hexdump
$MYSQL
TEST_VARDIR
/
log
/
master
-
bin
.
000001
>
$MYSQLTEST_VARDIR
/
tmp
/
mysqlbinlog_base64
.
sql
#
# Clear database and restore from binlog
#
drop
table
t1
;
drop
table
t2
;
--
exec
$MYSQL
test
<
$MYSQL
_TEST_DIR
/
var
/
tmp
/
mysqlbinlog_base64
.
sql
--
exec
$MYSQL
test
<
$MYSQL
TEST_VARDIR
/
tmp
/
mysqlbinlog_base64
.
sql
#
# Verify that all binlog events have been executed
...
...
@@ -33,6 +33,6 @@ select * from t2;
#
# Test cleanup
#
--
exec
rm
$MYSQL
_TEST_DIR
/
var
/
tmp
/
mysqlbinlog_base64
.
sql
--
exec
rm
$MYSQL
TEST_VARDIR
/
tmp
/
mysqlbinlog_base64
.
sql
drop
table
t1
;
drop
table
t2
;
This diff is collapsed.
Click to expand it.
mysql-test/t/ndb_dd_dump.test
View file @
436b4985
...
...
@@ -177,7 +177,7 @@ INSERT INTO t2 VALUES
INSERT
INTO
t3
VALUES
(
1
,
1
,
1
);
--
exec
$MYSQL_DUMP
--
skip
-
comments
--
compact
-
Y
test
>
var
/
tmp
/
ndb_dd_dump
.
sql
--
exec
$MYSQL_DUMP
--
skip
-
comments
--
compact
-
Y
test
>
$MYSQLTEST_VARDIR
/
tmp
/
ndb_dd_dump
.
sql
DROP
TABLE
t1
;
DROP
TABLE
t2
;
...
...
@@ -206,7 +206,7 @@ DROP TABLESPACE ts3 ENGINE = NDB;
DROP
LOGFILE
GROUP
lg1
ENGINE
=
NDB
;
DROP
LOGFILE
GROUP
lg2
ENGINE
=
NDB
;
--
exec
$MYSQL
test
<
var
/
tmp
/
ndb_dd_dump
.
sql
--
exec
$MYSQL
test
<
$MYSQLTEST_VARDIR
/
tmp
/
ndb_dd_dump
.
sql
SELECT
DISTINCT
LOGFILE_GROUP_NAME
,
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/ndb_load.test
View file @
436b4985
...
...
@@ -12,12 +12,12 @@ DROP TABLE IF EXISTS t1;
# should give duplicate key
CREATE
TABLE
t1
(
word
CHAR
(
20
)
NOT
NULL
PRIMARY
KEY
)
ENGINE
=
NDB
;
--
error
1022
LOAD
DATA
INFILE
'../
../std_data
/words.dat'
INTO
TABLE
t1
;
LOAD
DATA
INFILE
'../
std_data_ln
/words.dat'
INTO
TABLE
t1
;
DROP
TABLE
t1
;
# now without a primary key we should be ok
CREATE
TABLE
t1
(
word
CHAR
(
20
)
NOT
NULL
)
ENGINE
=
NDB
;
LOAD
DATA
INFILE
'../
../std_data
/words.dat'
INTO
TABLE
t1
;
LOAD
DATA
INFILE
'../
std_data_ln
/words.dat'
INTO
TABLE
t1
;
SELECT
*
FROM
t1
ORDER
BY
word
;
DROP
TABLE
t1
;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/rpl_LD_INFILE.test
View file @
436b4985
...
...
@@ -16,10 +16,10 @@ DROP TABLE IF EXISTS test.t1;
# Section 1 test
CREATE
TABLE
test
.
t1
(
a
VARCHAR
(
255
),
PRIMARY
KEY
(
a
));
LOAD
DATA
INFILE
'../
../std_data
/words2.dat'
INTO
TABLE
test
.
t1
;
LOAD
DATA
INFILE
'../
std_data_ln
/words2.dat'
INTO
TABLE
test
.
t1
;
DELETE
FROM
test
.
t1
WHERE
a
=
'abashed'
;
DELETE
FROM
test
.
t1
;
LOAD
DATA
INFILE
'../
../std_data
/words2.dat'
INTO
TABLE
test
.
t1
;
LOAD
DATA
INFILE
'../
std_data_ln
/words2.dat'
INTO
TABLE
test
.
t1
;
SELECT
*
FROM
test
.
t1
ORDER
BY
a
DESC
;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/rpl_drop_db.test
View file @
436b4985
...
...
@@ -46,7 +46,7 @@ show tables;
use
test
;
select
*
from
t1
;
system
rm
var
/
master
-
data
/
mysqltest1
/
f1
.
txt
;
system
rm
$MYSQLTEST_VARDIR
/
master
-
data
/
mysqltest1
/
f1
.
txt
;
connection
master
;
DROP
DATABASE
mysqltest1
;
sync_slave_with_master
;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/rpl_load_table_from_master.test
View file @
436b4985
...
...
@@ -71,9 +71,9 @@ sync_with_master;
connection
master
;
set
SQL_LOG_BIN
=
0
;
create
table
t1
(
word
char
(
20
)
not
null
,
index
(
word
))
ENGINE
=
MyISAM
;
load
data
infile
'../
../std_data
/words.dat'
into
table
t1
;
load
data
infile
'../
std_data_ln
/words.dat'
into
table
t1
;
create
table
t2
(
word
char
(
20
)
not
null
)
ENGINE
=
MyISAM
;
load
data
infile
'../
../std_data
/words.dat'
into
table
t2
;
load
data
infile
'../
std_data_ln
/words.dat'
into
table
t2
;
create
table
t3
(
word
char
(
20
)
not
null
primary
key
)
ENGINE
=
MyISAM
;
connection
slave
;
load
table
t1
from
master
;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/rpl_loaddata2.test
View file @
436b4985
--
source
include
/
master
-
slave
.
inc
CREATE
TABLE
t1
(
word
CHAR
(
20
)
NOT
NULL
);
LOAD
DATA
INFILE
'../
../std_data
/words.dat'
INTO
TABLE
t1
;
LOAD
DATA
INFILE
'../
std_data_ln
/words.dat'
INTO
TABLE
t1
;
SELECT
*
FROM
t1
ORDER
BY
word
;
sync_slave_with_master
;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/rpl_loaddata_m.test
View file @
436b4985
...
...
@@ -17,14 +17,14 @@ connection master;
# 'test' database should be ignored by the slave
USE
test
;
CREATE
TABLE
t1
(
a
INT
,
b
INT
,
UNIQUE
(
b
));
LOAD
DATA
INFILE
'../
../std_data
/rpl_loaddata.dat'
INTO
TABLE
test
.
t1
;
LOAD
DATA
INFILE
'../
std_data_ln
/rpl_loaddata.dat'
INTO
TABLE
test
.
t1
;
SELECT
COUNT
(
*
)
FROM
test
.
t1
;
# 'mysqltest' database should NOT be ignored by the slave
CREATE
DATABASE
mysqltest
;
USE
mysqltest
;
CREATE
TABLE
t1
(
a
INT
,
b
INT
,
UNIQUE
(
b
));
LOAD
DATA
INFILE
'../
../std_data
/rpl_loaddata.dat'
INTO
TABLE
mysqltest
.
t1
;
LOAD
DATA
INFILE
'../
std_data_ln
/rpl_loaddata.dat'
INTO
TABLE
mysqltest
.
t1
;
SELECT
COUNT
(
*
)
FROM
mysqltest
.
t1
;
# Now lets check the slave to see what we have :-)
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/rpl_loadfile.test
View file @
436b4985
...
...
@@ -24,12 +24,12 @@ DROP TABLE IF EXISTS test.t1;
CREATE
TABLE
test
.
t1
(
a
INT
,
blob_column
LONGBLOB
,
PRIMARY
KEY
(
a
));
INSERT
INTO
test
.
t1
VALUES
(
1
,
'test'
);
UPDATE
test
.
t1
SET
blob_column
=
LOAD_FILE
(
'../
../std_data
/words2.dat'
)
WHERE
a
=
1
;
UPDATE
test
.
t1
SET
blob_column
=
LOAD_FILE
(
'../
std_data_ln
/words2.dat'
)
WHERE
a
=
1
;
delimiter
|
;
create
procedure
test
.
p1
()
begin
INSERT
INTO
test
.
t1
VALUES
(
2
,
'test'
);
UPDATE
test
.
t1
SET
blob_column
=
LOAD_FILE
(
'../
../std_data
/words2.dat'
)
WHERE
a
=
2
;
UPDATE
test
.
t1
SET
blob_column
=
LOAD_FILE
(
'../
std_data_ln
/words2.dat'
)
WHERE
a
=
2
;
end
|
delimiter
;
|
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/rpl_ndb_bank.test
View file @
436b4985
...
...
@@ -117,10 +117,10 @@ RESET MASTER;
--
exec
$NDB_MGM
--
no
-
defaults
--
ndb
-
connectstring
=
"localhost:
$NDBCLUSTER_PORT
"
-
e
"start backup"
>>
$NDB_TOOLS_OUTPUT
# there is no neat way to find the backupid, this is a hack to find it...
--
exec
$NDB_TOOLS_DIR
/
ndb_select_all
--
ndb
-
connectstring
=
"localhost:
$NDBCLUSTER_PORT
"
-
d
sys
--
delimiter
=
','
SYSTAB_0
|
grep
520093696
>
var
/
tmp
.
dat
--
exec
$NDB_TOOLS_DIR
/
ndb_select_all
--
ndb
-
connectstring
=
"localhost:
$NDBCLUSTER_PORT
"
-
d
sys
--
delimiter
=
','
SYSTAB_0
|
grep
520093696
>
$MYSQLTEST_VARDIR
/
tmp
.
dat
CREATE
TABLE
IF
NOT
EXISTS
cluster_replication
.
backup_info
(
id
INT
,
backup_id
INT
)
ENGINE
=
HEAP
;
DELETE
FROM
cluster_replication
.
backup_info
;
LOAD
DATA
INFILE
'../
../var/
tmp.dat'
INTO
TABLE
cluster_replication
.
backup_info
FIELDS
TERMINATED
BY
','
;
LOAD
DATA
INFILE
'../tmp.dat'
INTO
TABLE
cluster_replication
.
backup_info
FIELDS
TERMINATED
BY
','
;
--
replace_column
1
<
the_backup_id
>
SELECT
@
the_backup_id
:=
backup_id
FROM
cluster_replication
.
backup_info
;
let
the_backup_id
=
`select @the_backup_id`
;
...
...
@@ -191,17 +191,17 @@ while ($1)
# 1. dump database BANK on both master and slave
# 2. compare, there should be no difference
#
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
BANK
ACCOUNT_TYPE
ACCOUNT
GL
TRANSACTION
>
./
var
/
tmp
/
master_BANK
.
sql
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
BANK
ACCOUNT_TYPE
ACCOUNT
GL
TRANSACTION
>
$MYSQLTEST_VARDIR
/
tmp
/
master_BANK
.
sql
--
connection
master
use
test
;
create
table
t1
(
a
int
primary
key
)
engine
=
ndb
;
insert
into
t1
values
(
1
);
--
sync_slave_with_master
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
BANK
ACCOUNT_TYPE
ACCOUNT
GL
TRANSACTION
>
./
var
/
tmp
/
slave_BANK
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
BANK
ACCOUNT_TYPE
ACCOUNT
GL
TRANSACTION
>
$MYSQLTEST_VARDIR
/
tmp
/
slave_BANK
.
sql
--
connection
master
drop
table
t1
;
--
exec
diff
./
var
/
tmp
/
master_BANK
.
sql
./
var
/
tmp
/
slave_BANK
.
sql
--
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
master_BANK
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
slave_BANK
.
sql
--
dec
$
2
}
This diff is collapsed.
Click to expand it.
mysql-test/t/rpl_ndb_sync.test
View file @
436b4985
...
...
@@ -26,10 +26,10 @@ SELECT hex(c2),hex(c3),c1 FROM t2 ORDER BY c1;
# take a backup on master
--
exec
$NDB_MGM
--
no
-
defaults
--
ndb
-
connectstring
=
"localhost:
$NDBCLUSTER_PORT
"
-
e
"start backup"
>>
$NDB_TOOLS_OUTPUT
--
exec
$NDB_TOOLS_DIR
/
ndb_select_all
--
no
-
defaults
--
ndb
-
connectstring
=
"localhost:
$NDBCLUSTER_PORT
"
-
d
sys
--
delimiter
=
','
SYSTAB_0
|
grep
520093696
>
var
/
tmp
.
dat
--
exec
$NDB_TOOLS_DIR
/
ndb_select_all
--
no
-
defaults
--
ndb
-
connectstring
=
"localhost:
$NDBCLUSTER_PORT
"
-
d
sys
--
delimiter
=
','
SYSTAB_0
|
grep
520093696
>
$MYSQLTEST_VARDIR
/
tmp
.
dat
CREATE
TEMPORARY
TABLE
IF
NOT
EXISTS
cluster_replication
.
backup_info
(
id
INT
,
backup_id
INT
)
ENGINE
=
HEAP
;
DELETE
FROM
cluster_replication
.
backup_info
;
LOAD
DATA
INFILE
'../
../var/
tmp.dat'
INTO
TABLE
cluster_replication
.
backup_info
FIELDS
TERMINATED
BY
','
;
LOAD
DATA
INFILE
'../tmp.dat'
INTO
TABLE
cluster_replication
.
backup_info
FIELDS
TERMINATED
BY
','
;
--
replace_column
1
<
the_backup_id
>
SELECT
@
the_backup_id
:=
backup_id
FROM
cluster_replication
.
backup_info
;
let
the_backup_id
=
`select @the_backup_id`
;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/rpl_row_NOW.test
View file @
436b4985
...
...
@@ -50,8 +50,8 @@ sync_slave_with_master;
connection
master
;
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
mysqltest1
>
./
var
/
tmp
/
NOW_master
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
mysqltest1
>
./
var
/
tmp
/
NOW_slave
.
sql
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
mysqltest1
>
$MYSQLTEST_VARDIR
/
tmp
/
NOW_master
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
mysqltest1
>
$MYSQLTEST_VARDIR
/
tmp
/
NOW_slave
.
sql
# lets cleanup
DROP
TABLE
IF
EXISTS
mysqltest1
.
t1
;
...
...
@@ -61,13 +61,13 @@ DROP FUNCTION mysqltest1.f1;
# the test will show that the diff statement failed and not reject file
# 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 :-) The failed dump
# files will be located in
mysql-test/var
/tmp
# files will be located in
$MYSQLTEST_VARDIR
/tmp
exec
diff
./
var
/
tmp
/
NOW_master
.
sql
./
var
/
tmp
/
NOW_slave
.
sql
;
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
NOW_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
NOW_slave
.
sql
;
# If all is good, when can cleanup our dump files.
system
rm
./
var
/
tmp
/
NOW_master
.
sql
;
system
rm
./
var
/
tmp
/
NOW_slave
.
sql
;
system
rm
$MYSQLTEST_VARDIR
/
tmp
/
NOW_master
.
sql
;
system
rm
$MYSQLTEST_VARDIR
/
tmp
/
NOW_slave
.
sql
;
sync_slave_with_master
;
# End of 5.1 test case
This diff is collapsed.
Click to expand it.
mysql-test/t/rpl_row_func002.test
View file @
436b4985
...
...
@@ -84,8 +84,8 @@ connection master;
# time to dump the databases and so we can see if they match
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
./
var
/
tmp
/
func002_master
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
./
var
/
tmp
/
func002_slave
.
sql
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
$MYSQLTEST_VARDIR
/
tmp
/
func002_master
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
$MYSQLTEST_VARDIR
/
tmp
/
func002_slave
.
sql
# Cleanup
DROP
FUNCTION
test
.
f1
;
...
...
@@ -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
./
var
/
tmp
/
func002_master
.
sql
./
var
/
tmp
/
func002_slave
.
sql
;
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
func002_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
func002_slave
.
sql
;
# End of 5.0 test case
This diff is collapsed.
Click to expand it.
mysql-test/t/rpl_row_sp001.test
View file @
436b4985
...
...
@@ -119,8 +119,8 @@ SELECT * FROM t2 ORDER BY a;
# time to dump the databases and so we can see if they match
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
./
var
/
tmp
/
sp001_master
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
./
var
/
tmp
/
sp001_slave
.
sql
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
$MYSQLTEST_VARDIR
/
tmp
/
sp001_master
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
$MYSQLTEST_VARDIR
/
tmp
/
sp001_slave
.
sql
# First lets cleanup
...
...
@@ -135,12 +135,12 @@ sync_slave_with_master;
# the test will show that the diff statement failed and not reject file
# 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 :-) Failed dump files
# will be located in
mysql-test/var
/tmp
# will be located in
$MYSQLTEST_VARDIR
/tmp
--
exec
diff
./
var
/
tmp
/
sp001_master
.
sql
./
var
/
tmp
/
sp001_slave
.
sql
;
--
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
sp001_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
sp001_slave
.
sql
;
# If all is good, when can cleanup our dump files.
system
rm
./
var
/
tmp
/
sp001_master
.
sql
;
system
rm
./
var
/
tmp
/
sp001_slave
.
sql
;
system
rm
$MYSQLTEST_VARDIR
/
tmp
/
sp001_master
.
sql
;
system
rm
$MYSQLTEST_VARDIR
/
tmp
/
sp001_slave
.
sql
;
# End of 5.0 test case
This diff is collapsed.
Click to expand it.
mysql-test/t/rpl_row_sp011.test
View file @
436b4985
...
...
@@ -79,8 +79,8 @@ CALL test.p1();
sync_slave_with_master
;
#SELECT * FROM test.t2;
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
./
var
/
tmp
/
sp011_master
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
./
var
/
tmp
/
sp011_slave
.
sql
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
$MYSQLTEST_VARDIR
/
tmp
/
sp011_master
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
$MYSQLTEST_VARDIR
/
tmp
/
sp011_slave
.
sql
# Cleanup
connection
master
;
...
...
@@ -100,12 +100,12 @@ sync_slave_with_master;
# the test will show that the diff statement failed and not reject file
# 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 :-) Failed test
# Will leave dump files in
mysql-test/var
/tmp
# Will leave dump files in
$MYSQLTEST_VARDIR
/tmp
exec
diff
./
var
/
tmp
/
sp011_master
.
sql
./
var
/
tmp
/
sp011_slave
.
sql
;
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
sp011_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
sp011_slave
.
sql
;
# If all is good, when can cleanup our dump files.
system
rm
./
var
/
tmp
/
sp011_master
.
sql
;
system
rm
./
var
/
tmp
/
sp011_slave
.
sql
;
system
rm
$MYSQLTEST_VARDIR
/
tmp
/
sp011_master
.
sql
;
system
rm
$MYSQLTEST_VARDIR
/
tmp
/
sp011_slave
.
sql
;
# End of 5.0 test case
This diff is collapsed.
Click to expand it.
mysql-test/t/rpl_row_stop_middle_update.test
View file @
436b4985
...
...
@@ -9,7 +9,7 @@
connection
master
;
create
table
t1
(
words
varchar
(
20
))
engine
=
myisam
;
load
data
infile
'../
../std_data
/words.dat'
into
table
t1
(
words
);
load
data
infile
'../
std_data_ln
/words.dat'
into
table
t1
(
words
);
select
count
(
*
)
from
t1
;
save_master_pos
;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/rpl_row_trig001.test
View file @
436b4985
...
...
@@ -75,8 +75,8 @@ let $message=<End test section 2 (Tiggers & SP)>;
# time to dump the databases and so we can see if they match
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
./
var
/
tmp
/
trig001_master
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
./
var
/
tmp
/
trig001_slave
.
sql
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
$MYSQLTEST_VARDIR
/
tmp
/
trig001_master
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
$MYSQLTEST_VARDIR
/
tmp
/
trig001_slave
.
sql
# Cleanup
connection
master
;
...
...
@@ -93,8 +93,8 @@ sync_slave_with_master;
# the test will show that the diff statement failed and not reject file
# 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 :-) Failed tests
# will leave dump files in
mysql-test/var
/tmp
# will leave dump files in
$MYSQLTEST_VARDIR
/tmp
exec
diff
./
var
/
tmp
/
trig001_master
.
sql
./
var
/
tmp
/
trig001_slave
.
sql
;
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
trig001_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
trig001_slave
.
sql
;
# End of 5.0 test case
This diff is collapsed.
Click to expand it.
mysql-test/t/rpl_row_trig003.test
View file @
436b4985
...
...
@@ -125,8 +125,8 @@ connection master;
# time to dump the databases and so we can see if they match
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
./
var
/
tmp
/
trg003_master
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
./
var
/
tmp
/
trg003_slave
.
sql
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
$MYSQLTEST_VARDIR
/
tmp
/
trg003_master
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
$MYSQLTEST_VARDIR
/
tmp
/
trg003_slave
.
sql
# cleanup
--
disable_warnings
...
...
@@ -147,6 +147,6 @@ DROP TABLE IF EXISTS test.t2;
DROP
TABLE
IF
EXISTS
test
.
t3
;
--
enable_warnings
exec
diff
./
var
/
tmp
/
trg003_master
.
sql
./
var
/
tmp
/
trg003_slave
.
sql
;
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
trg003_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
trg003_slave
.
sql
;
# End of 5.0 test case
This diff is collapsed.
Click to expand it.
mysql-test/t/rpl_sp004.test
View file @
436b4985
...
...
@@ -76,8 +76,8 @@ SELECT * FROM test.t1;
SELECT
*
FROM
test
.
t2
;
#SELECT * FROM test.t3;
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
./
var
/
tmp
/
sp004_master
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
./
var
/
tmp
/
sp004_slave
.
sql
--
exec
$MYSQL_DUMP
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
$MYSQLTEST_VARDIR
/
tmp
/
sp004_master
.
sql
--
exec
$MYSQL_DUMP_SLAVE
--
compact
--
order
-
by
-
primary
--
skip
-
extended
-
insert
--
no
-
create
-
info
test
>
$MYSQLTEST_VARDIR
/
tmp
/
sp004_slave
.
sql
# Cleanup
connection
master
;
...
...
@@ -91,7 +91,7 @@ sync_slave_with_master;
# If the test fails, you will need to diff the dumps to see why.
--
exec
diff
./
var
/
tmp
/
sp004_master
.
sql
./
var
/
tmp
/
sp004_slave
.
sql
--
exec
diff
$MYSQLTEST_VARDIR
/
tmp
/
sp004_master
.
sql
$MYSQLTEST_VARDIR
/
tmp
/
sp004_slave
.
sql
# End of 5.0 test case
This diff is collapsed.
Click to expand it.
mysql-test/t/show_check.test
View file @
436b4985
...
...
@@ -393,7 +393,7 @@ SHOW TABLE STATUS like 't1';
--
error
1033
show
create
table
t1
;
drop
table
if
exists
t1
;
system
rm
-
f
var
/
master
-
data
/
test
/
t1
.
frm
;
system
rm
-
f
$MYSQLTEST_VARDIR
/
master
-
data
/
test
/
t1
.
frm
;
# End of 4.1 tests
...
...
This diff is collapsed.
Click to expand it.
win/cmakefiles/client
View file @
436b4985
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
ADD_DEFINITIONS(-DUSE_TLS -DMYSQL_CLIENT)
# The old Windows build method used renamed (.cc -> .cpp) source files, fails
# in #include in mysqlbinlog.cc. So disable that using the USING_CMAKE define.
ADD_DEFINITIONS(-DUSE_TLS -DUSING_CMAKE)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/zlib
${CMAKE_SOURCE_DIR}/extra/yassl/include
${CMAKE_SOURCE_DIR}/libmysql)
${CMAKE_SOURCE_DIR}/libmysql
${CMAKE_SOURCE_DIR}/regex
${CMAKE_SOURCE_DIR}/sql
${CMAKE_SOURCE_DIR}/strings)
ADD_LIBRARY(mysqlclient ../mysys/array.c ../strings/bchange.c ../strings/bmove.c
../strings/bmove_upp.c ../mysys/charset-def.c ../mysys/charset.c
...
...
@@ -47,3 +52,26 @@ ADD_DEPENDENCIES(mysqlclient GenError)
ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
LINK_DIRECTORIES(${MYSQL_BINARY_DIR}/mysys ${MYSQL_BINARY_DIR}/zlib)
TARGET_LINK_LIBRARIES(mysql mysqlclient mysys yassl zlib dbug yassl taocrypt wsock32)
ADD_EXECUTABLE(mysqltest mysqltest.c)
TARGET_LINK_LIBRARIES(mysqltest mysqlclient mysys yassl zlib dbug regex wsock32)
ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient dbug yassl zlib wsock32)
ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c)
TARGET_LINK_LIBRARIES(mysqldump mysqlclient mysys dbug yassl zlib wsock32)
ADD_EXECUTABLE(mysqlimport mysqlimport.c)
TARGET_LINK_LIBRARIES(mysqlimport mysqlclient mysys dbug yassl zlib wsock32)
ADD_EXECUTABLE(mysqlshow mysqlshow.c)
TARGET_LINK_LIBRARIES(mysqlshow mysqlclient mysys dbug yassl zlib wsock32)
ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc ../mysys/mf_tempdir.c ../mysys/my_new.cc
../mysys/my_bit.c ../mysys/my_bitmap.c ../mysys/my_vle.c
../mysys/base64.c)
TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient dbug yassl zlib wsock32)
ADD_EXECUTABLE(mysqladmin mysqladmin.cc)
TARGET_LINK_LIBRARIES(mysqladmin mysqlclient mysys dbug yassl zlib wsock32)
This diff is collapsed.
Click to expand it.
win/cmakefiles/extra
View file @
436b4985
...
...
@@ -19,3 +19,5 @@ ADD_CUSTOM_TARGET(GenError
ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
TARGET_LINK_LIBRARIES(my_print_defaults strings mysys dbug taocrypt odbc32 odbccp32 wsock32)
This diff is collapsed.
Click to expand it.
win/cmakefiles/sql
View file @
436b4985
...
...
@@ -76,14 +76,14 @@ ADD_CUSTOM_COMMAND(
#ADD_CUSTOM_COMMAND(
# SOURCE ${PROJECT_SOURCE_DIR}/include/mysql_version.h.in
# OUTPUT ${PROJECT_SOURCE_DIR}/include/mysql_version.h
# COMMAND ${PROJECT_SOURCE_DIR}/win/config-version.js
# COMMAND
cscript.exe
${PROJECT_SOURCE_DIR}/win/config-version.js
# DEPENDS ${PROJECT_SOURCE_DIR}/include/mysql_version.h.in)
# Handlerton file
ADD_CUSTOM_COMMAND(
SOURCE ${PROJECT_SOURCE_DIR}/sql/handlerton.cc.in
OUTPUT ${PROJECT_SOURCE_DIR}/sql/handlerton.cc
COMMAND ${PROJECT_SOURCE_DIR}/win/config-handlerton.js ARGS ${PROJECT_SOURCE_DIR}/win/configure.data
COMMAND
cscript.exe
${PROJECT_SOURCE_DIR}/win/config-handlerton.js ARGS ${PROJECT_SOURCE_DIR}/win/configure.data
DEPENDS ${PROJECT_SOURCE_DIR}/sql/handlerton.cc.in)
# Error file
...
...
This diff is collapsed.
Click to expand it.
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