merge
This commit is contained in:
commit
1ce81aac15
@ -1,4 +1,4 @@
|
|||||||
[MYSQL]
|
[MYSQL]
|
||||||
post_commit_to = "commits@lists.mysql.com"
|
post_commit_to = "commits@lists.mysql.com"
|
||||||
post_push_to = "commits@lists.mysql.com"
|
post_push_to = "commits@lists.mysql.com"
|
||||||
tree_name = "mysql-5.1-bugteam"
|
tree_name = "mysql-5.0-bugteam"
|
||||||
|
@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
|
|||||||
AC_CANONICAL_SYSTEM
|
AC_CANONICAL_SYSTEM
|
||||||
# The Docs Makefile.am parses this line!
|
# The Docs Makefile.am parses this line!
|
||||||
# remember to also change ndb version below and update version.c in ndb
|
# remember to also change ndb version below and update version.c in ndb
|
||||||
AM_INIT_AUTOMAKE(mysql, 5.0.70)
|
AM_INIT_AUTOMAKE(mysql, 5.0.72)
|
||||||
AM_CONFIG_HEADER([include/config.h:config.h.in])
|
AM_CONFIG_HEADER([include/config.h:config.h.in])
|
||||||
|
|
||||||
PROTOCOL_VERSION=10
|
PROTOCOL_VERSION=10
|
||||||
@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
|
|||||||
# ndb version
|
# ndb version
|
||||||
NDB_VERSION_MAJOR=5
|
NDB_VERSION_MAJOR=5
|
||||||
NDB_VERSION_MINOR=0
|
NDB_VERSION_MINOR=0
|
||||||
NDB_VERSION_BUILD=70
|
NDB_VERSION_BUILD=72
|
||||||
NDB_VERSION_STATUS=""
|
NDB_VERSION_STATUS=""
|
||||||
|
|
||||||
# Set all version vars based on $VERSION. How do we do this more elegant ?
|
# Set all version vars based on $VERSION. How do we do this more elegant ?
|
||||||
@ -2810,6 +2810,9 @@ EOF
|
|||||||
AC_CONFIG_SUBDIRS(innobase)
|
AC_CONFIG_SUBDIRS(innobase)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# "innochecksum" is not in the "innobase/" subdirectory, but should be switched
|
||||||
|
AM_CONDITIONAL([BUILD_INNODB_TOOLS], [test X"$have_innodb" = Xyes])
|
||||||
|
|
||||||
case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc-$have_ndbcluster in
|
case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc-$have_ndbcluster in
|
||||||
*solaris*-i?86-no-yes)
|
*solaris*-i?86-no-yes)
|
||||||
if $CC -xildon 2>&1 | grep "illegal option" >/dev/null
|
if $CC -xildon 2>&1 | grep "illegal option" >/dev/null
|
||||||
|
@ -45,7 +45,12 @@ $(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h
|
|||||||
$(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h
|
$(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h
|
||||||
|
|
||||||
bin_PROGRAMS = replace comp_err perror resolveip my_print_defaults \
|
bin_PROGRAMS = replace comp_err perror resolveip my_print_defaults \
|
||||||
resolve_stack_dump mysql_waitpid innochecksum
|
resolve_stack_dump mysql_waitpid
|
||||||
|
# "innochecksum" should be switched
|
||||||
|
if BUILD_INNODB_TOOLS
|
||||||
|
bin_PROGRAMS += innochecksum
|
||||||
|
endif
|
||||||
|
|
||||||
noinst_PROGRAMS = charset2html
|
noinst_PROGRAMS = charset2html
|
||||||
EXTRA_DIST = CMakeLists.txt
|
EXTRA_DIST = CMakeLists.txt
|
||||||
|
|
||||||
|
@ -21,5 +21,11 @@ man1_MANS = @man1_files@
|
|||||||
man8_MANS = @man8_files@
|
man8_MANS = @man8_files@
|
||||||
EXTRA_DIST = $(man1_MANS) $(man8_MANS)
|
EXTRA_DIST = $(man1_MANS) $(man8_MANS)
|
||||||
|
|
||||||
|
# 1) not needed in Unix binary packages,
|
||||||
|
# 2) programs not generated in 5.0:
|
||||||
|
install-data-hook:
|
||||||
|
rm -f $(DESTDIR)$(manlibdir)/man1/make_win_*
|
||||||
|
rm -f $(DESTDIR)$(manlibdir)/man1/ndb_print_*
|
||||||
|
|
||||||
# Don't update the files from bitkeeper
|
# Don't update the files from bitkeeper
|
||||||
%::SCCS/s.%
|
%::SCCS/s.%
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults $ndb_restore_opts -b $the_backup_id -n 1 $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id $ndb_restore_filter > $MYSQLTEST_VARDIR/tmp/tmp.dat
|
--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults $ndb_restore_opts -b $the_backup_id -n 1 $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id $ndb_restore_filter > $MYSQLTEST_VARDIR/tmp/tmp.dat
|
||||||
--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults $ndb_restore_opts -b $the_backup_id -n 2 $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id $ndb_restore_filter >> $MYSQLTEST_VARDIR/tmp/tmp.dat
|
--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults $ndb_restore_opts -b $the_backup_id -n 2 $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id $ndb_restore_filter >> $MYSQLTEST_VARDIR/tmp/tmp.dat
|
||||||
--exec sort $MYSQLTEST_VARDIR/tmp/tmp.dat
|
--exec sort $MYSQLTEST_VARDIR/tmp/tmp.dat
|
||||||
--exec rm -f $MYSQLTEST_VARDIR/tmp/tmp.dat
|
--error 0,1
|
||||||
|
--remove_file $MYSQLTEST_VARDIR/tmp/tmp.dat
|
||||||
--let ndb_restore_opts=
|
--let ndb_restore_opts=
|
||||||
--let ndb_restore_filter=
|
--let ndb_restore_filter=
|
||||||
|
@ -608,6 +608,65 @@ id select_type table type possible_keys key key_len ref rows Extra
|
|||||||
SELECT DISTINCT a,a FROM t1 WHERE b < 12 ORDER BY a;
|
SELECT DISTINCT a,a FROM t1 WHERE b < 12 ORDER BY a;
|
||||||
a a
|
a a
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
|
DROP TABLE IF EXISTS t1;
|
||||||
|
CREATE TABLE t1 (id INT NOT NULL, fruit_id INT NOT NULL, fruit_name varchar(20)
|
||||||
|
default NULL);
|
||||||
|
INSERT INTO t1 VALUES (1,1,'ORANGE');
|
||||||
|
INSERT INTO t1 VALUES (2,2,'APPLE');
|
||||||
|
INSERT INTO t1 VALUES (3,2,'APPLE');
|
||||||
|
INSERT INTO t1 VALUES (4,3,'PEAR');
|
||||||
|
SELECT DISTINCT fruit_id, fruit_name INTO @v1, @v2 FROM t1 WHERE fruit_name =
|
||||||
|
'APPLE';
|
||||||
|
SELECT @v1, @v2;
|
||||||
|
@v1 @v2
|
||||||
|
2 APPLE
|
||||||
|
SELECT DISTINCT fruit_id, fruit_name INTO @v3, @v4 FROM t1 GROUP BY fruit_id,
|
||||||
|
fruit_name HAVING fruit_name = 'APPLE';
|
||||||
|
SELECT @v3, @v4;
|
||||||
|
@v3 @v4
|
||||||
|
2 APPLE
|
||||||
|
SELECT DISTINCT @v5:= fruit_id, @v6:= fruit_name INTO @v7, @v8 FROM t1 WHERE
|
||||||
|
fruit_name = 'APPLE';
|
||||||
|
SELECT @v5, @v6, @v7, @v8;
|
||||||
|
@v5 @v6 @v7 @v8
|
||||||
|
3 PEAR 3 PEAR
|
||||||
|
SELECT DISTINCT @v5 + fruit_id, CONCAT(@v6, fruit_name) INTO @v9, @v10 FROM t1
|
||||||
|
WHERE fruit_name = 'APPLE';
|
||||||
|
SELECT @v5, @v6, @v7, @v8, @v9, @v10;
|
||||||
|
@v5 @v6 @v7 @v8 @v9 @v10
|
||||||
|
3 PEAR 3 PEAR 5 PEARAPPLE
|
||||||
|
SELECT DISTINCT @v11:= @v5 + fruit_id, @v12:= CONCAT(@v6, fruit_name) INTO
|
||||||
|
@v13, @v14 FROM t1 WHERE fruit_name = 'APPLE';
|
||||||
|
SELECT @v11, @v12, @v13, @v14;
|
||||||
|
@v11 @v12 @v13 @v14
|
||||||
|
6 PEARPEAR 6 PEARPEAR
|
||||||
|
SELECT DISTINCT @v13, @v14 INTO @v15, @v16 FROM t1 WHERE fruit_name = 'APPLE';
|
||||||
|
SELECT @v15, @v16;
|
||||||
|
@v15 @v16
|
||||||
|
6 PEARPEAR
|
||||||
|
SELECT DISTINCT 2 + 2, 'Bob' INTO @v17, @v18 FROM t1 WHERE fruit_name =
|
||||||
|
'APPLE';
|
||||||
|
SELECT @v17, @v18;
|
||||||
|
@v17 @v18
|
||||||
|
4 Bob
|
||||||
|
DROP TABLE IF EXISTS t2;
|
||||||
|
CREATE TABLE t2 (fruit_id INT NOT NULL, fruit_name varchar(20)
|
||||||
|
default NULL);
|
||||||
|
SELECT DISTINCT fruit_id, fruit_name INTO OUTFILE
|
||||||
|
'../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE';
|
||||||
|
LOAD DATA INFILE '../tmp/data1.tmp' INTO TABLE t2;
|
||||||
|
SELECT DISTINCT @v19:= fruit_id, @v20:= fruit_name INTO OUTFILE
|
||||||
|
'../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE';
|
||||||
|
LOAD DATA INFILE '../tmp/data2.tmp' INTO TABLE t2;
|
||||||
|
SELECT @v19, @v20;
|
||||||
|
@v19 @v20
|
||||||
|
2 APPLE
|
||||||
|
SELECT * FROM t2;
|
||||||
|
fruit_id fruit_name
|
||||||
|
2 APPLE
|
||||||
|
2 APPLE
|
||||||
|
DROP TABLE t1;
|
||||||
|
DROP TABLE t2;
|
||||||
CREATE TABLE t1 (a CHAR(1));
|
CREATE TABLE t1 (a CHAR(1));
|
||||||
INSERT INTO t1 VALUES('A'), (0);
|
INSERT INTO t1 VALUES('A'), (0);
|
||||||
SELECT a FROM t1 WHERE a=0;
|
SELECT a FROM t1 WHERE a=0;
|
||||||
|
@ -9,6 +9,10 @@ DROP DATABASE IF EXISTS federated;
|
|||||||
CREATE DATABASE federated;
|
CREATE DATABASE federated;
|
||||||
DROP DATABASE IF EXISTS federated;
|
DROP DATABASE IF EXISTS federated;
|
||||||
CREATE DATABASE federated;
|
CREATE DATABASE federated;
|
||||||
|
SET @OLD_MASTER_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;
|
||||||
|
SET @@GLOBAL.CONCURRENT_INSERT= 0;
|
||||||
|
SET @OLD_SLAVE_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;
|
||||||
|
SET @@GLOBAL.CONCURRENT_INSERT= 0;
|
||||||
DROP TABLE IF EXISTS federated.t1;
|
DROP TABLE IF EXISTS federated.t1;
|
||||||
Warnings:
|
Warnings:
|
||||||
Note 1051 Unknown table 't1'
|
Note 1051 Unknown table 't1'
|
||||||
@ -83,7 +87,7 @@ t2 CREATE TABLE `t2` (
|
|||||||
) ENGINE=FEDERATED DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1'
|
) ENGINE=FEDERATED DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1'
|
||||||
INSERT INTO federated.t2 (id, name) VALUES (1, 'foo');
|
INSERT INTO federated.t2 (id, name) VALUES (1, 'foo');
|
||||||
INSERT INTO federated.t2 (id, name) VALUES (2, 'fee');
|
INSERT INTO federated.t2 (id, name) VALUES (2, 'fee');
|
||||||
SELECT * FROM federated.t2;
|
SELECT * FROM federated.t2 ORDER BY id, name;
|
||||||
id name
|
id name
|
||||||
1 foo
|
1 foo
|
||||||
2 fee
|
2 fee
|
||||||
@ -108,7 +112,7 @@ ENGINE="FEDERATED" DEFAULT CHARSET=latin1
|
|||||||
CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1%';
|
CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1%';
|
||||||
INSERT INTO federated.t1 (id, name) VALUES (1, 'foo');
|
INSERT INTO federated.t1 (id, name) VALUES (1, 'foo');
|
||||||
INSERT INTO federated.t1 (id, name) VALUES (2, 'fee');
|
INSERT INTO federated.t1 (id, name) VALUES (2, 'fee');
|
||||||
SELECT * FROM federated.t1;
|
SELECT * FROM federated.t1 ORDER BY id,name;
|
||||||
id name
|
id name
|
||||||
1 foo
|
1 foo
|
||||||
2 fee
|
2 fee
|
||||||
@ -122,7 +126,7 @@ ENGINE="FEDERATED" DEFAULT CHARSET=latin1
|
|||||||
CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1%';
|
CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1%';
|
||||||
INSERT INTO federated.`t1%` (id, name) VALUES (1, 'foo');
|
INSERT INTO federated.`t1%` (id, name) VALUES (1, 'foo');
|
||||||
INSERT INTO federated.`t1%` (id, name) VALUES (2, 'fee');
|
INSERT INTO federated.`t1%` (id, name) VALUES (2, 'fee');
|
||||||
SELECT * FROM federated.`t1%`;
|
SELECT * FROM federated.`t1%` ORDER BY id, name;
|
||||||
id name
|
id name
|
||||||
1 foo
|
1 foo
|
||||||
2 fee
|
2 fee
|
||||||
@ -160,6 +164,7 @@ INSERT INTO federated.t1 (name, other) VALUES ('Tenth Name', 101010);
|
|||||||
SELECT * FROM federated.t1;
|
SELECT * FROM federated.t1;
|
||||||
id name other created
|
id name other created
|
||||||
1 First Name 11111 2004-04-04 04:04:04
|
1 First Name 11111 2004-04-04 04:04:04
|
||||||
|
10 Tenth Name 101010 2004-04-04 04:04:04
|
||||||
2 Second Name 22222 2004-04-04 04:04:04
|
2 Second Name 22222 2004-04-04 04:04:04
|
||||||
3 Third Name 33333 2004-04-04 04:04:04
|
3 Third Name 33333 2004-04-04 04:04:04
|
||||||
4 Fourth Name 44444 2004-04-04 04:04:04
|
4 Fourth Name 44444 2004-04-04 04:04:04
|
||||||
@ -168,7 +173,6 @@ id name other created
|
|||||||
7 Seventh Name 77777 2004-04-04 04:04:04
|
7 Seventh Name 77777 2004-04-04 04:04:04
|
||||||
8 Eigth Name 88888 2004-04-04 04:04:04
|
8 Eigth Name 88888 2004-04-04 04:04:04
|
||||||
9 Ninth Name 99999 2004-04-04 04:04:04
|
9 Ninth Name 99999 2004-04-04 04:04:04
|
||||||
10 Tenth Name 101010 2004-04-04 04:04:04
|
|
||||||
SELECT * FROM federated.t1 WHERE id = 5;
|
SELECT * FROM federated.t1 WHERE id = 5;
|
||||||
id name other created
|
id name other created
|
||||||
5 Fifth Name 55555 2004-04-04 04:04:04
|
5 Fifth Name 55555 2004-04-04 04:04:04
|
||||||
@ -182,6 +186,7 @@ SELECT * FROM federated.t1 WHERE name = 'Sixth Name' AND other = 44444;
|
|||||||
id name other created
|
id name other created
|
||||||
SELECT * FROM federated.t1 WHERE name like '%th%';
|
SELECT * FROM federated.t1 WHERE name like '%th%';
|
||||||
id name other created
|
id name other created
|
||||||
|
10 Tenth Name 101010 2004-04-04 04:04:04
|
||||||
3 Third Name 33333 2004-04-04 04:04:04
|
3 Third Name 33333 2004-04-04 04:04:04
|
||||||
4 Fourth Name 44444 2004-04-04 04:04:04
|
4 Fourth Name 44444 2004-04-04 04:04:04
|
||||||
5 Fifth Name 55555 2004-04-04 04:04:04
|
5 Fifth Name 55555 2004-04-04 04:04:04
|
||||||
@ -189,7 +194,6 @@ id name other created
|
|||||||
7 Seventh Name 77777 2004-04-04 04:04:04
|
7 Seventh Name 77777 2004-04-04 04:04:04
|
||||||
8 Eigth Name 88888 2004-04-04 04:04:04
|
8 Eigth Name 88888 2004-04-04 04:04:04
|
||||||
9 Ninth Name 99999 2004-04-04 04:04:04
|
9 Ninth Name 99999 2004-04-04 04:04:04
|
||||||
10 Tenth Name 101010 2004-04-04 04:04:04
|
|
||||||
UPDATE federated.t1 SET name = '3rd name' WHERE id = 3;
|
UPDATE federated.t1 SET name = '3rd name' WHERE id = 3;
|
||||||
SELECT * FROM federated.t1 WHERE name = '3rd name';
|
SELECT * FROM federated.t1 WHERE name = '3rd name';
|
||||||
id name other created
|
id name other created
|
||||||
@ -310,6 +314,7 @@ VALUES ('Tenth Name', 101010, '2005-03-12 12:00:01');
|
|||||||
SELECT * FROM federated.t1;
|
SELECT * FROM federated.t1;
|
||||||
id name other created
|
id name other created
|
||||||
1 First Name 11111 2004-01-01 01:01:01
|
1 First Name 11111 2004-01-01 01:01:01
|
||||||
|
10 Tenth Name 101010 2005-03-12 12:00:01
|
||||||
2 Second Name 22222 2004-01-23 02:43:00
|
2 Second Name 22222 2004-01-23 02:43:00
|
||||||
3 Third Name 33333 2004-02-14 02:14:00
|
3 Third Name 33333 2004-02-14 02:14:00
|
||||||
4 Fourth Name 44444 2003-04-05 00:00:00
|
4 Fourth Name 44444 2003-04-05 00:00:00
|
||||||
@ -318,7 +323,6 @@ id name other created
|
|||||||
7 Seventh Name 77777 2003-12-12 18:32:00
|
7 Seventh Name 77777 2003-12-12 18:32:00
|
||||||
8 Eigth Name 88888 2005-03-12 11:00:00
|
8 Eigth Name 88888 2005-03-12 11:00:00
|
||||||
9 Ninth Name 99999 2005-03-12 11:00:01
|
9 Ninth Name 99999 2005-03-12 11:00:01
|
||||||
10 Tenth Name 101010 2005-03-12 12:00:01
|
|
||||||
SELECT * FROM federated.t1 WHERE id = 5;
|
SELECT * FROM federated.t1 WHERE id = 5;
|
||||||
id name other created
|
id name other created
|
||||||
5 Fifth Name 55555 2001-02-02 02:02:02
|
5 Fifth Name 55555 2001-02-02 02:02:02
|
||||||
@ -330,6 +334,7 @@ id name other created
|
|||||||
4 Fourth Name 44444 2003-04-05 00:00:00
|
4 Fourth Name 44444 2003-04-05 00:00:00
|
||||||
SELECT * FROM federated.t1 WHERE name like '%th%';
|
SELECT * FROM federated.t1 WHERE name like '%th%';
|
||||||
id name other created
|
id name other created
|
||||||
|
10 Tenth Name 101010 2005-03-12 12:00:01
|
||||||
3 Third Name 33333 2004-02-14 02:14:00
|
3 Third Name 33333 2004-02-14 02:14:00
|
||||||
4 Fourth Name 44444 2003-04-05 00:00:00
|
4 Fourth Name 44444 2003-04-05 00:00:00
|
||||||
5 Fifth Name 55555 2001-02-02 02:02:02
|
5 Fifth Name 55555 2001-02-02 02:02:02
|
||||||
@ -337,7 +342,6 @@ id name other created
|
|||||||
7 Seventh Name 77777 2003-12-12 18:32:00
|
7 Seventh Name 77777 2003-12-12 18:32:00
|
||||||
8 Eigth Name 88888 2005-03-12 11:00:00
|
8 Eigth Name 88888 2005-03-12 11:00:00
|
||||||
9 Ninth Name 99999 2005-03-12 11:00:01
|
9 Ninth Name 99999 2005-03-12 11:00:01
|
||||||
10 Tenth Name 101010 2005-03-12 12:00:01
|
|
||||||
UPDATE federated.t1 SET name = '3rd name' WHERE id = 3;
|
UPDATE federated.t1 SET name = '3rd name' WHERE id = 3;
|
||||||
SELECT * FROM federated.t1 WHERE name = '3rd name';
|
SELECT * FROM federated.t1 WHERE name = '3rd name';
|
||||||
id name other created
|
id name other created
|
||||||
@ -444,17 +448,17 @@ id name other
|
|||||||
7 Seventh Name NULL
|
7 Seventh Name NULL
|
||||||
SELECT * FROM federated.t1 WHERE name IS NULL;
|
SELECT * FROM federated.t1 WHERE name IS NULL;
|
||||||
id name other
|
id name other
|
||||||
4 NULL NULL
|
|
||||||
10 NULL fee fie foe fum
|
10 NULL fee fie foe fum
|
||||||
|
4 NULL NULL
|
||||||
SELECT * FROM federated.t1 WHERE name IS NULL and other IS NULL;
|
SELECT * FROM federated.t1 WHERE name IS NULL and other IS NULL;
|
||||||
id name other
|
id name other
|
||||||
4 NULL NULL
|
4 NULL NULL
|
||||||
SELECT * FROM federated.t1 WHERE name IS NULL or other IS NULL;
|
SELECT * FROM federated.t1 WHERE name IS NULL or other IS NULL;
|
||||||
id name other
|
id name other
|
||||||
|
10 NULL fee fie foe fum
|
||||||
2 Second Name NULL
|
2 Second Name NULL
|
||||||
4 NULL NULL
|
4 NULL NULL
|
||||||
7 Seventh Name NULL
|
7 Seventh Name NULL
|
||||||
10 NULL fee fie foe fum
|
|
||||||
UPDATE federated.t1
|
UPDATE federated.t1
|
||||||
SET name = 'Fourth Name', other = 'four four four'
|
SET name = 'Fourth Name', other = 'four four four'
|
||||||
WHERE name IS NULL AND other IS NULL;
|
WHERE name IS NULL AND other IS NULL;
|
||||||
@ -466,6 +470,7 @@ id name other
|
|||||||
SELECT * FROM federated.t1;
|
SELECT * FROM federated.t1;
|
||||||
id name other
|
id name other
|
||||||
1 First Name 11111
|
1 First Name 11111
|
||||||
|
10 Tenth Name fee fie foe fum
|
||||||
2 Second Name two two two two
|
2 Second Name two two two two
|
||||||
3 Third Name 33333
|
3 Third Name 33333
|
||||||
4 Fourth Name four four four
|
4 Fourth Name four four four
|
||||||
@ -474,7 +479,6 @@ id name other
|
|||||||
7 Seventh Name seven seven
|
7 Seventh Name seven seven
|
||||||
8 Eigth Name 88888
|
8 Eigth Name 88888
|
||||||
9 Ninth Name 99999
|
9 Ninth Name 99999
|
||||||
10 Tenth Name fee fie foe fum
|
|
||||||
DROP TABLE IF EXISTS federated.t1;
|
DROP TABLE IF EXISTS federated.t1;
|
||||||
CREATE TABLE federated.t1 (
|
CREATE TABLE federated.t1 (
|
||||||
`id` int(20) NOT NULL auto_increment,
|
`id` int(20) NOT NULL auto_increment,
|
||||||
@ -655,8 +659,8 @@ id col1 col2 col3 col4
|
|||||||
SELECT * FROM federated.t1 WHERE (id = 5 AND col2 = 'five 5 five five 5')
|
SELECT * FROM federated.t1 WHERE (id = 5 AND col2 = 'five 5 five five 5')
|
||||||
OR (col2 = 'three Three' AND col3 = 33);
|
OR (col2 = 'three Three' AND col3 = 33);
|
||||||
id col1 col2 col3 col4
|
id col1 col2 col3 col4
|
||||||
5 5 five 5 five five 5 5 55555
|
|
||||||
3 3 three Three 33 33333
|
3 3 three Three 33 33333
|
||||||
|
5 5 five 5 five five 5 5 55555
|
||||||
SELECT * FROM federated.t1 WHERE (id = 5 AND col2 = 'Two two')
|
SELECT * FROM federated.t1 WHERE (id = 5 AND col2 = 'Two two')
|
||||||
OR (col2 = 444 AND col3 = 4444444);
|
OR (col2 = 444 AND col3 = 4444444);
|
||||||
id col1 col2 col3 col4
|
id col1 col2 col3 col4
|
||||||
@ -667,25 +671,25 @@ OR col3 = 33
|
|||||||
OR col4 = 4444444;
|
OR col4 = 4444444;
|
||||||
id col1 col2 col3 col4
|
id col1 col2 col3 col4
|
||||||
1 1 one One 11 1111
|
1 1 one One 11 1111
|
||||||
|
10 10 Tenth ten TEN 1010101 1010
|
||||||
2 2 Two two 22 2222
|
2 2 Two two 22 2222
|
||||||
3 3 three Three 33 33333
|
3 3 three Three 33 33333
|
||||||
4 4 fourfourfour 444 4444444
|
4 4 fourfourfour 444 4444444
|
||||||
10 10 Tenth ten TEN 1010101 1010
|
|
||||||
SELECT * FROM federated.t1 WHERE id > 5;
|
SELECT * FROM federated.t1 WHERE id > 5;
|
||||||
id col1 col2 col3 col4
|
id col1 col2 col3 col4
|
||||||
|
10 10 Tenth ten TEN 1010101 1010
|
||||||
6 6 six six Sixsix 6666 6
|
6 6 six six Sixsix 6666 6
|
||||||
7 7 seven Sevenseven 77777 7777
|
7 7 seven Sevenseven 77777 7777
|
||||||
8 8 eight eight eight 88888 88
|
8 8 eight eight eight 88888 88
|
||||||
9 9 nine Nine 999999 999999
|
9 9 nine Nine 999999 999999
|
||||||
10 10 Tenth ten TEN 1010101 1010
|
|
||||||
SELECT * FROM federated.t1 WHERE id >= 5;
|
SELECT * FROM federated.t1 WHERE id >= 5;
|
||||||
id col1 col2 col3 col4
|
id col1 col2 col3 col4
|
||||||
|
10 10 Tenth ten TEN 1010101 1010
|
||||||
5 5 five 5 five five 5 5 55555
|
5 5 five 5 five five 5 5 55555
|
||||||
6 6 six six Sixsix 6666 6
|
6 6 six six Sixsix 6666 6
|
||||||
7 7 seven Sevenseven 77777 7777
|
7 7 seven Sevenseven 77777 7777
|
||||||
8 8 eight eight eight 88888 88
|
8 8 eight eight eight 88888 88
|
||||||
9 9 nine Nine 999999 999999
|
9 9 nine Nine 999999 999999
|
||||||
10 10 Tenth ten TEN 1010101 1010
|
|
||||||
SELECT * FROM federated.t1 WHERE id < 5;
|
SELECT * FROM federated.t1 WHERE id < 5;
|
||||||
id col1 col2 col3 col4
|
id col1 col2 col3 col4
|
||||||
1 1 one One 11 1111
|
1 1 one One 11 1111
|
||||||
@ -702,6 +706,7 @@ id col1 col2 col3 col4
|
|||||||
SELECT * FROM federated.t1 WHERE id != 5;
|
SELECT * FROM federated.t1 WHERE id != 5;
|
||||||
id col1 col2 col3 col4
|
id col1 col2 col3 col4
|
||||||
1 1 one One 11 1111
|
1 1 one One 11 1111
|
||||||
|
10 10 Tenth ten TEN 1010101 1010
|
||||||
2 2 Two two 22 2222
|
2 2 Two two 22 2222
|
||||||
3 3 three Three 33 33333
|
3 3 three Three 33 33333
|
||||||
4 4 fourfourfour 444 4444444
|
4 4 fourfourfour 444 4444444
|
||||||
@ -709,7 +714,6 @@ id col1 col2 col3 col4
|
|||||||
7 7 seven Sevenseven 77777 7777
|
7 7 seven Sevenseven 77777 7777
|
||||||
8 8 eight eight eight 88888 88
|
8 8 eight eight eight 88888 88
|
||||||
9 9 nine Nine 999999 999999
|
9 9 nine Nine 999999 999999
|
||||||
10 10 Tenth ten TEN 1010101 1010
|
|
||||||
SELECT * FROM federated.t1 WHERE id > 3 AND id < 7;
|
SELECT * FROM federated.t1 WHERE id > 3 AND id < 7;
|
||||||
id col1 col2 col3 col4
|
id col1 col2 col3 col4
|
||||||
4 4 fourfourfour 444 4444444
|
4 4 fourfourfour 444 4444444
|
||||||
@ -737,25 +741,25 @@ id col1 col2 col3 col4
|
|||||||
SELECT * FROM federated.t1 WHERE id < 3 OR id > 7;
|
SELECT * FROM federated.t1 WHERE id < 3 OR id > 7;
|
||||||
id col1 col2 col3 col4
|
id col1 col2 col3 col4
|
||||||
1 1 one One 11 1111
|
1 1 one One 11 1111
|
||||||
|
10 10 Tenth ten TEN 1010101 1010
|
||||||
2 2 Two two 22 2222
|
2 2 Two two 22 2222
|
||||||
8 8 eight eight eight 88888 88
|
8 8 eight eight eight 88888 88
|
||||||
9 9 nine Nine 999999 999999
|
9 9 nine Nine 999999 999999
|
||||||
10 10 Tenth ten TEN 1010101 1010
|
|
||||||
SELECT * FROM federated.t1 WHERE col2 = 'three Three';
|
SELECT * FROM federated.t1 WHERE col2 = 'three Three';
|
||||||
id col1 col2 col3 col4
|
id col1 col2 col3 col4
|
||||||
3 3 three Three 33 33333
|
3 3 three Three 33 33333
|
||||||
SELECT * FROM federated.t1 WHERE col2 > 'one';
|
SELECT * FROM federated.t1 WHERE col2 > 'one';
|
||||||
id col1 col2 col3 col4
|
id col1 col2 col3 col4
|
||||||
1 1 one One 11 1111
|
1 1 one One 11 1111
|
||||||
|
10 10 Tenth ten TEN 1010101 1010
|
||||||
2 2 Two two 22 2222
|
2 2 Two two 22 2222
|
||||||
3 3 three Three 33 33333
|
3 3 three Three 33 33333
|
||||||
6 6 six six Sixsix 6666 6
|
6 6 six six Sixsix 6666 6
|
||||||
7 7 seven Sevenseven 77777 7777
|
7 7 seven Sevenseven 77777 7777
|
||||||
10 10 Tenth ten TEN 1010101 1010
|
|
||||||
SELECT * FROM federated.t1 WHERE col2 LIKE 's%';
|
SELECT * FROM federated.t1 WHERE col2 LIKE 's%';
|
||||||
id col1 col2 col3 col4
|
id col1 col2 col3 col4
|
||||||
7 7 seven Sevenseven 77777 7777
|
|
||||||
6 6 six six Sixsix 6666 6
|
6 6 six six Sixsix 6666 6
|
||||||
|
7 7 seven Sevenseven 77777 7777
|
||||||
SELECT * FROM federated.t1 WHERE col2 LIKE 'si%';
|
SELECT * FROM federated.t1 WHERE col2 LIKE 'si%';
|
||||||
id col1 col2 col3 col4
|
id col1 col2 col3 col4
|
||||||
6 6 six six Sixsix 6666 6
|
6 6 six six Sixsix 6666 6
|
||||||
@ -765,6 +769,7 @@ id col1 col2 col3 col4
|
|||||||
SELECT * FROM federated.t1 WHERE col2 NOT LIKE 'e%';
|
SELECT * FROM federated.t1 WHERE col2 NOT LIKE 'e%';
|
||||||
id col1 col2 col3 col4
|
id col1 col2 col3 col4
|
||||||
1 1 one One 11 1111
|
1 1 one One 11 1111
|
||||||
|
10 10 Tenth ten TEN 1010101 1010
|
||||||
2 2 Two two 22 2222
|
2 2 Two two 22 2222
|
||||||
3 3 three Three 33 33333
|
3 3 three Three 33 33333
|
||||||
4 4 fourfourfour 444 4444444
|
4 4 fourfourfour 444 4444444
|
||||||
@ -772,18 +777,17 @@ id col1 col2 col3 col4
|
|||||||
6 6 six six Sixsix 6666 6
|
6 6 six six Sixsix 6666 6
|
||||||
7 7 seven Sevenseven 77777 7777
|
7 7 seven Sevenseven 77777 7777
|
||||||
9 9 nine Nine 999999 999999
|
9 9 nine Nine 999999 999999
|
||||||
10 10 Tenth ten TEN 1010101 1010
|
|
||||||
SELECT * FROM federated.t1 WHERE col2 <> 'one One';
|
SELECT * FROM federated.t1 WHERE col2 <> 'one One';
|
||||||
id col1 col2 col3 col4
|
id col1 col2 col3 col4
|
||||||
4 4 fourfourfour 444 4444444
|
10 10 Tenth ten TEN 1010101 1010
|
||||||
5 5 five 5 five five 5 5 55555
|
|
||||||
8 8 eight eight eight 88888 88
|
|
||||||
9 9 nine Nine 999999 999999
|
|
||||||
2 2 Two two 22 2222
|
2 2 Two two 22 2222
|
||||||
3 3 three Three 33 33333
|
3 3 three Three 33 33333
|
||||||
|
4 4 fourfourfour 444 4444444
|
||||||
|
5 5 five 5 five five 5 5 55555
|
||||||
6 6 six six Sixsix 6666 6
|
6 6 six six Sixsix 6666 6
|
||||||
7 7 seven Sevenseven 77777 7777
|
7 7 seven Sevenseven 77777 7777
|
||||||
10 10 Tenth ten TEN 1010101 1010
|
8 8 eight eight eight 88888 88
|
||||||
|
9 9 nine Nine 999999 999999
|
||||||
DROP TABLE IF EXISTS federated.t1;
|
DROP TABLE IF EXISTS federated.t1;
|
||||||
CREATE TABLE federated.t1 (
|
CREATE TABLE federated.t1 (
|
||||||
`col1` varchar(8) NOT NULL DEFAULT '',
|
`col1` varchar(8) NOT NULL DEFAULT '',
|
||||||
@ -950,11 +954,11 @@ INSERT INTO federated.t1 (name, floatval, other)
|
|||||||
VALUES (0, 00.3333, NULL);
|
VALUES (0, 00.3333, NULL);
|
||||||
SELECT * FROM federated.t1;
|
SELECT * FROM federated.t1;
|
||||||
id name floatval other
|
id name floatval other
|
||||||
NULL NULL NULL NULL
|
|
||||||
NULL NULL NULL NULL
|
|
||||||
1 NULL NULL NULL
|
1 NULL NULL NULL
|
||||||
NULL foo 33.3333 NULL
|
|
||||||
NULL 0 0.3333 NULL
|
NULL 0 0.3333 NULL
|
||||||
|
NULL NULL NULL NULL
|
||||||
|
NULL NULL NULL NULL
|
||||||
|
NULL foo 33.3333 NULL
|
||||||
SELECT count(*) FROM federated.t1
|
SELECT count(*) FROM federated.t1
|
||||||
WHERE id IS NULL
|
WHERE id IS NULL
|
||||||
AND name IS NULL
|
AND name IS NULL
|
||||||
@ -983,13 +987,13 @@ Warning 1101 BLOB/TEXT column 'blurb' can't have a default value
|
|||||||
INSERT INTO federated.t1 VALUES (1, " MySQL supports a number of column types in several categories: numeric types, date and time types, and string (character) types. This chapter first gives an overview of these column types, and then provides a more detailed description of the properties of the types in each category, and a summary of the column type storage requirements. The overview is intentionally brief. The more detailed descriptions should be consulted for additional information about particular column types, such as the allowable formats in which you can specify values.");
|
INSERT INTO federated.t1 VALUES (1, " MySQL supports a number of column types in several categories: numeric types, date and time types, and string (character) types. This chapter first gives an overview of these column types, and then provides a more detailed description of the properties of the types in each category, and a summary of the column type storage requirements. The overview is intentionally brief. The more detailed descriptions should be consulted for additional information about particular column types, such as the allowable formats in which you can specify values.");
|
||||||
INSERT INTO federated.t1 VALUES (2, "All arithmetic is done using signed BIGINT or DOUBLE values, so you should not use unsigned big integers larger than 9223372036854775807 (63 bits) except with bit functions! If you do that, some of the last digits in the result may be wrong because of rounding errors when converting a BIGINT value to a DOUBLE.");
|
INSERT INTO federated.t1 VALUES (2, "All arithmetic is done using signed BIGINT or DOUBLE values, so you should not use unsigned big integers larger than 9223372036854775807 (63 bits) except with bit functions! If you do that, some of the last digits in the result may be wrong because of rounding errors when converting a BIGINT value to a DOUBLE.");
|
||||||
INSERT INTO federated.t1 VALUES (3, " A floating-point number. p represents the precision. It can be from 0 to 24 for a single-precision floating-point number and from 25 to 53 for a double-precision floating-point number. These types are like the FLOAT and DOUBLE types described immediately following. FLOAT(p) has the same range as the corresponding FLOAT and DOUBLE types, but the display size and number of decimals are undefined. ");
|
INSERT INTO federated.t1 VALUES (3, " A floating-point number. p represents the precision. It can be from 0 to 24 for a single-precision floating-point number and from 25 to 53 for a double-precision floating-point number. These types are like the FLOAT and DOUBLE types described immediately following. FLOAT(p) has the same range as the corresponding FLOAT and DOUBLE types, but the display size and number of decimals are undefined. ");
|
||||||
INSERT INTO federated.t1 VALUES(4, "Die Übersetzung einer so umfangreichen technischen Dokumentation wie des MySQL-Referenzhandbuchs ist schon eine besondere Herausforderung. Zumindest für jemanden, der seine Zielsprache ernst nimmt:");
|
INSERT INTO federated.t1 VALUES(4, "Die Übersetzung einer so umfangreichen technischen Dokumentation wie des MySQL-Referenzhandbuchs ist schon eine besondere Herausforderung. Zumindest für jemanden, der seine Zielsprache ernst nimmt:");
|
||||||
SELECT * FROM federated.t1;
|
SELECT * FROM federated.t1;
|
||||||
blurb_id blurb
|
blurb_id blurb
|
||||||
1 MySQL supports a number of column types in several categories: numeric types, date and time types, and string (character) types. This chapter first gives an overview of these column types, and then provides a more detailed description of the properties of the types in each category, and a summary of the column type storage requirements. The overview is intentionally brief. The more detailed descriptions should be consulted for additional information about particular column types, such as the allowable formats in which you can specify values.
|
1 MySQL supports a number of column types in several categories: numeric types, date and time types, and string (character) types. This chapter first gives an overview of these column types, and then provides a more detailed description of the properties of the types in each category, and a summary of the column type storage requirements. The overview is intentionally brief. The more detailed descriptions should be consulted for additional information about particular column types, such as the allowable formats in which you can specify values.
|
||||||
2 All arithmetic is done using signed BIGINT or DOUBLE values, so you should not use unsigned big integers larger than 9223372036854775807 (63 bits) except with bit functions! If you do that, some of the last digits in the result may be wrong because of rounding errors when converting a BIGINT value to a DOUBLE.
|
2 All arithmetic is done using signed BIGINT or DOUBLE values, so you should not use unsigned big integers larger than 9223372036854775807 (63 bits) except with bit functions! If you do that, some of the last digits in the result may be wrong because of rounding errors when converting a BIGINT value to a DOUBLE.
|
||||||
3 A floating-point number. p represents the precision. It can be from 0 to 24 for a single-precision floating-point number and from 25 to 53 for a double-precision floating-point number. These types are like the FLOAT and DOUBLE types described immediately following. FLOAT(p) has the same range as the corresponding FLOAT and DOUBLE types, but the display size and number of decimals are undefined.
|
3 A floating-point number. p represents the precision. It can be from 0 to 24 for a single-precision floating-point number and from 25 to 53 for a double-precision floating-point number. These types are like the FLOAT and DOUBLE types described immediately following. FLOAT(p) has the same range as the corresponding FLOAT and DOUBLE types, but the display size and number of decimals are undefined.
|
||||||
4 Die Übersetzung einer so umfangreichen technischen Dokumentation wie des MySQL-Referenzhandbuchs ist schon eine besondere Herausforderung. Zumindest für jemanden, der seine Zielsprache ernst nimmt:
|
4 Die Übersetzung einer so umfangreichen technischen Dokumentation wie des MySQL-Referenzhandbuchs ist schon eine besondere Herausforderung. Zumindest für jemanden, der seine Zielsprache ernst nimmt:
|
||||||
DROP TABLE IF EXISTS federated.t1;
|
DROP TABLE IF EXISTS federated.t1;
|
||||||
CREATE TABLE federated.t1 (
|
CREATE TABLE federated.t1 (
|
||||||
`a` int NOT NULL,
|
`a` int NOT NULL,
|
||||||
@ -1741,20 +1745,20 @@ create trigger federated.t1_bi before insert on federated.t1 for each row set ne
|
|||||||
create table federated.t2 (a int, b int);
|
create table federated.t2 (a int, b int);
|
||||||
insert into federated.t2 values (13, 17), (19, 23);
|
insert into federated.t2 values (13, 17), (19, 23);
|
||||||
insert into federated.t1 (a, b) values (1, 2), (3, 5), (7, 11);
|
insert into federated.t1 (a, b) values (1, 2), (3, 5), (7, 11);
|
||||||
select * from federated.t1;
|
select * from federated.t1 order by a;
|
||||||
a b c
|
a b c
|
||||||
1 2 2
|
1 2 2
|
||||||
3 5 15
|
3 5 15
|
||||||
7 11 77
|
7 11 77
|
||||||
delete from federated.t1;
|
delete from federated.t1;
|
||||||
insert into federated.t1 (a, b) select * from federated.t2;
|
insert into federated.t1 (a, b) select * from federated.t2;
|
||||||
select * from federated.t1;
|
select * from federated.t1 order by a;
|
||||||
a b c
|
a b c
|
||||||
13 17 221
|
13 17 221
|
||||||
19 23 437
|
19 23 437
|
||||||
delete from federated.t1;
|
delete from federated.t1;
|
||||||
load data infile '../std_data_ln/loaddata5.dat' into table federated.t1 fields terminated by '' enclosed by '' ignore 1 lines (a, b);
|
load data infile '../std_data_ln/loaddata5.dat' into table federated.t1 fields terminated by '' enclosed by '' ignore 1 lines (a, b);
|
||||||
select * from federated.t1;
|
select * from federated.t1 order by a;
|
||||||
a b c
|
a b c
|
||||||
3 4 12
|
3 4 12
|
||||||
5 6 30
|
5 6 30
|
||||||
@ -2081,8 +2085,10 @@ Table Checksum
|
|||||||
test.t1 2465757603
|
test.t1 2465757603
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
DROP TABLE IF EXISTS federated.t1;
|
|
||||||
DROP DATABASE IF EXISTS federated;
|
|
||||||
DROP TABLE IF EXISTS federated.t1;
|
|
||||||
DROP DATABASE IF EXISTS federated;
|
|
||||||
End of 5.0 tests
|
End of 5.0 tests
|
||||||
|
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_MASTER_CONCURRENT_INSERT;
|
||||||
|
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;
|
||||||
|
DROP TABLE IF EXISTS federated.t1;
|
||||||
|
DROP DATABASE IF EXISTS federated;
|
||||||
|
DROP TABLE IF EXISTS federated.t1;
|
||||||
|
DROP DATABASE IF EXISTS federated;
|
||||||
|
@ -328,3 +328,123 @@ DROP VIEW v2;
|
|||||||
DROP VIEW v3;
|
DROP VIEW v3;
|
||||||
|
|
||||||
# -- End of Bug#35469.
|
# -- End of Bug#35469.
|
||||||
|
Bug#37114
|
||||||
|
SET SESSION character_set_client=latin1;
|
||||||
|
SET SESSION character_set_server=latin1;
|
||||||
|
SET SESSION character_set_connection=latin1;
|
||||||
|
SET @OLD_SQL_MODE=@@SESSION.SQL_MODE;
|
||||||
|
test LOAD DATA INFILE
|
||||||
|
SET sql_mode = '';
|
||||||
|
SELECT '1 \\aa\n' INTO DUMPFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt';
|
||||||
|
CREATE TABLE t1 (id INT, val1 CHAR(3)) ENGINE=MyISAM;
|
||||||
|
SET sql_mode = 'NO_BACKSLASH_ESCAPES';
|
||||||
|
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt' REPLACE INTO TABLE t1 FIELDS TERMINATED BY ' ';
|
||||||
|
SELECT * FROM t1;
|
||||||
|
id val1
|
||||||
|
1 \aa
|
||||||
|
SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug37114_out.txt' FIELDS ESCAPED BY '' TERMINATED BY ' ' FROM t1;
|
||||||
|
SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug37114_out.txt' FIELDS TERMINATED BY ' ' FROM t1;
|
||||||
|
INSERT INTO t1 (id, val1) VALUES (1, '\aa');
|
||||||
|
SELECT * FROM t1;
|
||||||
|
id val1
|
||||||
|
1 \aa
|
||||||
|
1 \aa
|
||||||
|
SET sql_mode='';
|
||||||
|
INSERT INTO t1 (id, val1) VALUES (1, '\aa');
|
||||||
|
SELECT * FROM t1;
|
||||||
|
id val1
|
||||||
|
1 \aa
|
||||||
|
1 \aa
|
||||||
|
1 aa
|
||||||
|
DROP TABLE t1;
|
||||||
|
test SELECT INTO OUTFILE
|
||||||
|
CREATE TABLE t1 (id INT PRIMARY KEY, val1 CHAR(4));
|
||||||
|
CREATE TABLE t2 LIKE t1;
|
||||||
|
SET sql_mode = '';
|
||||||
|
INSERT INTO t1 (id, val1) VALUES (5, '\ttab');
|
||||||
|
INSERT INTO t1 (id, val1) VALUES (4, '\\r');
|
||||||
|
SET sql_mode = 'NO_BACKSLASH_ESCAPES';
|
||||||
|
INSERT INTO t1 (id, val1) VALUES (3, '\tx');
|
||||||
|
1.1 NO_BACKSLASH_ESCAPES, use defaults for ESCAPED BY
|
||||||
|
SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt' FIELDS TERMINATED BY ' ' FROM t1 ORDER BY id;
|
||||||
|
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt' INTO TABLE t2 FIELDS TERMINATED BY ' ';
|
||||||
|
SELECT 'before' AS t, id, val1, hex(val1) FROM t1 UNION
|
||||||
|
SELECT 'after' AS t, id, val1, hex(val1) FROM t2 ORDER BY id,t DESC;
|
||||||
|
t id val1 hex(val1)
|
||||||
|
before 3 \tx 5C7478
|
||||||
|
after 3 \tx 5C7478
|
||||||
|
before 4 \r 5C72
|
||||||
|
after 4 \r 5C72
|
||||||
|
before 5 tab 09746162
|
||||||
|
after 5 tab 09746162
|
||||||
|
TRUNCATE t2;
|
||||||
|
SELECT LOAD_FILE("MYSQLTEST_VARDIR/tmp/bug37114.txt");
|
||||||
|
LOAD_FILE("MYSQLTEST_VARDIR/tmp/bug37114.txt")
|
||||||
|
3 \tx
|
||||||
|
4 \r
|
||||||
|
5 tab
|
||||||
|
|
||||||
|
1.2 NO_BACKSLASH_ESCAPES, override defaults for ESCAPED BY
|
||||||
|
SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt' FIELDS ESCAPED BY '\' TERMINATED BY ' ' FROM t1 ORDER BY id;
|
||||||
|
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt' INTO TABLE t2 FIELDS ESCAPED BY '\' TERMINATED BY ' ';
|
||||||
|
SELECT 'before' AS t, id, val1, hex(val1) FROM t1 UNION
|
||||||
|
SELECT 'after' AS t, id, val1, hex(val1) FROM t2 ORDER BY id,t DESC;
|
||||||
|
t id val1 hex(val1)
|
||||||
|
before 3 \tx 5C7478
|
||||||
|
after 3 \tx 5C7478
|
||||||
|
before 4 \r 5C72
|
||||||
|
after 4 \r 5C72
|
||||||
|
before 5 tab 09746162
|
||||||
|
after 5 tab 09746162
|
||||||
|
TRUNCATE t2;
|
||||||
|
SELECT LOAD_FILE("MYSQLTEST_VARDIR/tmp/bug37114.txt");
|
||||||
|
LOAD_FILE("MYSQLTEST_VARDIR/tmp/bug37114.txt")
|
||||||
|
3 \\tx
|
||||||
|
4 \\r
|
||||||
|
5 tab
|
||||||
|
|
||||||
|
SET sql_mode = '';
|
||||||
|
2.1 !NO_BACKSLASH_ESCAPES, use defaults for ESCAPED BY
|
||||||
|
SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt' FIELDS TERMINATED BY ' ' FROM t1 ORDER BY id;
|
||||||
|
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt' INTO TABLE t2 FIELDS TERMINATED BY ' ';
|
||||||
|
SELECT 'before' AS t, id, val1, hex(val1) FROM t1 UNION
|
||||||
|
SELECT 'after' AS t, id, val1, hex(val1) FROM t2 ORDER BY id,t DESC;
|
||||||
|
t id val1 hex(val1)
|
||||||
|
before 3 \tx 5C7478
|
||||||
|
after 3 \tx 5C7478
|
||||||
|
before 4 \r 5C72
|
||||||
|
after 4 \r 5C72
|
||||||
|
before 5 tab 09746162
|
||||||
|
after 5 tab 09746162
|
||||||
|
TRUNCATE t2;
|
||||||
|
SET sql_mode = 'NO_BACKSLASH_ESCAPES';
|
||||||
|
SELECT LOAD_FILE("MYSQLTEST_VARDIR/tmp/bug37114.txt");
|
||||||
|
LOAD_FILE("MYSQLTEST_VARDIR/tmp/bug37114.txt")
|
||||||
|
3 \\tx
|
||||||
|
4 \\r
|
||||||
|
5 tab
|
||||||
|
|
||||||
|
SET sql_mode = '';
|
||||||
|
2.2 !NO_BACKSLASH_ESCAPES, override defaults for ESCAPED BY
|
||||||
|
SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt' FIELDS ESCAPED BY '' TERMINATED BY ' ' FROM t1 ORDER BY id;
|
||||||
|
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt' INTO TABLE t2 FIELDS ESCAPED BY '' TERMINATED BY ' ';
|
||||||
|
SELECT 'before' AS t, id, val1, hex(val1) FROM t1 UNION
|
||||||
|
SELECT 'after' AS t, id, val1, hex(val1) FROM t2 ORDER BY id,t DESC;
|
||||||
|
t id val1 hex(val1)
|
||||||
|
before 3 \tx 5C7478
|
||||||
|
after 3 \tx 5C7478
|
||||||
|
before 4 \r 5C72
|
||||||
|
after 4 \r 5C72
|
||||||
|
before 5 tab 09746162
|
||||||
|
after 5 tab 09746162
|
||||||
|
TRUNCATE t2;
|
||||||
|
SET sql_mode = 'NO_BACKSLASH_ESCAPES';
|
||||||
|
SELECT LOAD_FILE("MYSQLTEST_VARDIR/tmp/bug37114.txt");
|
||||||
|
LOAD_FILE("MYSQLTEST_VARDIR/tmp/bug37114.txt")
|
||||||
|
3 \tx
|
||||||
|
4 \r
|
||||||
|
5 tab
|
||||||
|
|
||||||
|
set session sql_mode=@OLD_SQL_MODE;
|
||||||
|
DROP TABLE t1,t2;
|
||||||
|
End of 5.0 tests
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
Bug#37938 - Test "mysqldump" lacks various insert statements
|
||||||
|
Turn off concurrent inserts to avoid random errors
|
||||||
|
NOTE: We reset the variable back to saved value at the end of test
|
||||||
|
SET @OLD_CONCURRENT_INSERT = @@GLOBAL.CONCURRENT_INSERT;
|
||||||
|
SET @@GLOBAL.CONCURRENT_INSERT = 0;
|
||||||
DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa, t3;
|
DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa, t3;
|
||||||
drop database if exists mysqldump_test_db;
|
drop database if exists mysqldump_test_db;
|
||||||
drop database if exists db1;
|
drop database if exists db1;
|
||||||
@ -3565,6 +3570,7 @@ DROP TABLE t1,t2;
|
|||||||
|
|
||||||
|
|
||||||
-- Dump completed on DATE
|
-- Dump completed on DATE
|
||||||
|
SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
|
||||||
#
|
#
|
||||||
# End of 5.0 tests
|
# End of 5.0 tests
|
||||||
#
|
#
|
||||||
|
@ -1513,3 +1513,10 @@ end loop label1;
|
|||||||
end loop;
|
end loop;
|
||||||
end|
|
end|
|
||||||
ERROR 42000: End-label label1 without match
|
ERROR 42000: End-label label1 without match
|
||||||
|
CREATE TABLE t1 (a INT)|
|
||||||
|
INSERT INTO t1 VALUES (1),(2)|
|
||||||
|
CREATE PROCEDURE p1(a INT) BEGIN END|
|
||||||
|
CALL p1((SELECT * FROM t1))|
|
||||||
|
ERROR 21000: Subquery returns more than 1 row
|
||||||
|
DROP PROCEDURE IF EXISTS p1|
|
||||||
|
DROP TABLE t1|
|
||||||
|
@ -6662,6 +6662,16 @@ drop procedure p1;
|
|||||||
drop function f1;
|
drop function f1;
|
||||||
drop view v1;
|
drop view v1;
|
||||||
drop table t1;
|
drop table t1;
|
||||||
|
drop procedure if exists `p2` $
|
||||||
|
create procedure `p2`(in `a` text charset utf8)
|
||||||
|
begin
|
||||||
|
declare `pos` int default 1;
|
||||||
|
declare `str` text charset utf8;
|
||||||
|
set `str` := `a`;
|
||||||
|
select substr(`str`, `pos`+ 1 ) into `str`;
|
||||||
|
end $
|
||||||
|
call `p2`('s s s s s s');
|
||||||
|
drop procedure `p2`;
|
||||||
# ------------------------------------------------------------------
|
# ------------------------------------------------------------------
|
||||||
# -- End of 5.0 tests
|
# -- End of 5.0 tests
|
||||||
# ------------------------------------------------------------------
|
# ------------------------------------------------------------------
|
||||||
|
@ -30,7 +30,7 @@ let $error_code= `select @a like "%#%error_code=0%" /* must return 1 */`;
|
|||||||
eval select $error_code /* must return 1 as query completed before got killed*/;
|
eval select $error_code /* must return 1 as query completed before got killed*/;
|
||||||
|
|
||||||
# cleanup for the sub-case
|
# cleanup for the sub-case
|
||||||
system rm $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog;
|
remove_file $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog;
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -58,7 +58,7 @@ let $error_code= `select @a like "%#%error_code=0%" /* must return 0*/`;
|
|||||||
eval select $error_code /* must return 0 to mean the killed query is in */;
|
eval select $error_code /* must return 0 to mean the killed query is in */;
|
||||||
|
|
||||||
# cleanup for the sub-case
|
# cleanup for the sub-case
|
||||||
system rm $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog;
|
remove_file $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog;
|
||||||
|
|
||||||
|
|
||||||
drop table t1,t2;
|
drop table t1,t2;
|
||||||
|
@ -21,4 +21,4 @@ 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
|
||||||
|
@ -79,7 +79,8 @@ delete from t1;
|
|||||||
--eval select hex(load_file('$MYSQLTEST_VARDIR/master-data/test/t1.txt'));
|
--eval select hex(load_file('$MYSQLTEST_VARDIR/master-data/test/t1.txt'));
|
||||||
load data infile 't1.txt' into table t1;
|
load data infile 't1.txt' into table t1;
|
||||||
select hex(a) from t1;
|
select hex(a) from t1;
|
||||||
--exec rm $MYSQLTEST_VARDIR/master-data/test/t1.txt
|
--remove_file $MYSQLTEST_VARDIR/master-data/test/t1.txt
|
||||||
|
|
||||||
drop table t1;
|
drop table t1;
|
||||||
|
|
||||||
--echo End of 5.0 tests
|
--echo End of 5.0 tests
|
||||||
|
@ -438,72 +438,71 @@ EXPLAIN SELECT DISTINCT a,a FROM t1 WHERE b < 12 ORDER BY a;
|
|||||||
SELECT DISTINCT a,a FROM t1 WHERE b < 12 ORDER BY a;
|
SELECT DISTINCT a,a FROM t1 WHERE b < 12 ORDER BY a;
|
||||||
|
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
# The test case for bug#20836 should be re-enabled when bug#16861 is resolved
|
|
||||||
# The results for the test should be the same as in 4.1.
|
|
||||||
#
|
|
||||||
#Bug #20836: Selecting into variables results in wrong results being returned
|
#Bug #20836: Selecting into variables results in wrong results being returned
|
||||||
#
|
|
||||||
#--disable_warnings
|
--disable_warnings
|
||||||
#DROP TABLE IF EXISTS t1;
|
DROP TABLE IF EXISTS t1;
|
||||||
#--enable_warnings
|
--enable_warnings
|
||||||
#
|
|
||||||
#CREATE TABLE t1 (id INT NOT NULL, fruit_id INT NOT NULL, fruit_name varchar(20)
|
CREATE TABLE t1 (id INT NOT NULL, fruit_id INT NOT NULL, fruit_name varchar(20)
|
||||||
#default NULL);
|
default NULL);
|
||||||
#
|
|
||||||
#INSERT INTO t1 VALUES (1,1,'ORANGE');
|
INSERT INTO t1 VALUES (1,1,'ORANGE');
|
||||||
#INSERT INTO t1 VALUES (2,2,'APPLE');
|
INSERT INTO t1 VALUES (2,2,'APPLE');
|
||||||
#INSERT INTO t1 VALUES (3,2,'APPLE');
|
INSERT INTO t1 VALUES (3,2,'APPLE');
|
||||||
#INSERT INTO t1 VALUES (4,3,'PEAR');
|
INSERT INTO t1 VALUES (4,3,'PEAR');
|
||||||
#
|
|
||||||
#SELECT DISTINCT fruit_id, fruit_name INTO @v1, @v2 FROM t1 WHERE fruit_name =
|
SELECT DISTINCT fruit_id, fruit_name INTO @v1, @v2 FROM t1 WHERE fruit_name =
|
||||||
#'APPLE';
|
'APPLE';
|
||||||
#SELECT @v1, @v2;
|
SELECT @v1, @v2;
|
||||||
#
|
|
||||||
#SELECT DISTINCT fruit_id, fruit_name INTO @v3, @v4 FROM t1 GROUP BY fruit_id,
|
SELECT DISTINCT fruit_id, fruit_name INTO @v3, @v4 FROM t1 GROUP BY fruit_id,
|
||||||
#fruit_name HAVING fruit_name = 'APPLE';
|
fruit_name HAVING fruit_name = 'APPLE';
|
||||||
#SELECT @v3, @v4;
|
SELECT @v3, @v4;
|
||||||
#
|
|
||||||
#SELECT DISTINCT @v5:= fruit_id, @v6:= fruit_name INTO @v7, @v8 FROM t1 WHERE
|
SELECT DISTINCT @v5:= fruit_id, @v6:= fruit_name INTO @v7, @v8 FROM t1 WHERE
|
||||||
#fruit_name = 'APPLE';
|
fruit_name = 'APPLE';
|
||||||
#SELECT @v5, @v6, @v7, @v8;
|
SELECT @v5, @v6, @v7, @v8;
|
||||||
#
|
|
||||||
#SELECT DISTINCT @v5 + fruit_id, CONCAT(@v6, fruit_name) INTO @v9, @v10 FROM t1
|
SELECT DISTINCT @v5 + fruit_id, CONCAT(@v6, fruit_name) INTO @v9, @v10 FROM t1
|
||||||
#WHERE fruit_name = 'APPLE';
|
WHERE fruit_name = 'APPLE';
|
||||||
#SELECT @v5, @v6, @v7, @v8, @v9, @v10;
|
SELECT @v5, @v6, @v7, @v8, @v9, @v10;
|
||||||
#
|
|
||||||
#SELECT DISTINCT @v11:= @v5 + fruit_id, @v12:= CONCAT(@v6, fruit_name) INTO
|
SELECT DISTINCT @v11:= @v5 + fruit_id, @v12:= CONCAT(@v6, fruit_name) INTO
|
||||||
#@v13, @v14 FROM t1 WHERE fruit_name = 'APPLE';
|
@v13, @v14 FROM t1 WHERE fruit_name = 'APPLE';
|
||||||
#SELECT @v11, @v12, @v13, @v14;
|
SELECT @v11, @v12, @v13, @v14;
|
||||||
#
|
|
||||||
#SELECT DISTINCT @v13, @v14 INTO @v15, @v16 FROM t1 WHERE fruit_name = 'APPLE';
|
SELECT DISTINCT @v13, @v14 INTO @v15, @v16 FROM t1 WHERE fruit_name = 'APPLE';
|
||||||
#SELECT @v15, @v16;
|
SELECT @v15, @v16;
|
||||||
#
|
|
||||||
#SELECT DISTINCT 2 + 2, 'Bob' INTO @v17, @v18 FROM t1 WHERE fruit_name =
|
SELECT DISTINCT 2 + 2, 'Bob' INTO @v17, @v18 FROM t1 WHERE fruit_name =
|
||||||
#'APPLE';
|
'APPLE';
|
||||||
#SELECT @v17, @v18;
|
SELECT @v17, @v18;
|
||||||
#
|
|
||||||
#--disable_warnings
|
--disable_warnings
|
||||||
#DROP TABLE IF EXISTS t2;
|
DROP TABLE IF EXISTS t2;
|
||||||
#--enable_warnings
|
--enable_warnings
|
||||||
#
|
|
||||||
#CREATE TABLE t2 (fruit_id INT NOT NULL, fruit_name varchar(20)
|
CREATE TABLE t2 (fruit_id INT NOT NULL, fruit_name varchar(20)
|
||||||
#default NULL);
|
default NULL);
|
||||||
#
|
|
||||||
#SELECT DISTINCT fruit_id, fruit_name INTO OUTFILE
|
SELECT DISTINCT fruit_id, fruit_name INTO OUTFILE
|
||||||
#'../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE';
|
'../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE';
|
||||||
#LOAD DATA INFILE '../tmp/data1.tmp' INTO TABLE t2;
|
LOAD DATA INFILE '../tmp/data1.tmp' INTO TABLE t2;
|
||||||
#--exec rm $MYSQL_TEST_DIR/var/tmp/data1.tmp
|
--error 0,1
|
||||||
#
|
--remove_file $MYSQLTEST_VARDIR/tmp/data1.tmp
|
||||||
#SELECT DISTINCT @v19:= fruit_id, @v20:= fruit_name INTO OUTFILE
|
|
||||||
#'../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE';
|
SELECT DISTINCT @v19:= fruit_id, @v20:= fruit_name INTO OUTFILE
|
||||||
#LOAD DATA INFILE '../tmp/data2.tmp' INTO TABLE t2;
|
'../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE';
|
||||||
#--exec rm $MYSQL_TEST_DIR/var/tmp/data2.tmp
|
LOAD DATA INFILE '../tmp/data2.tmp' INTO TABLE t2;
|
||||||
#
|
--remove_file $MYSQLTEST_VARDIR/tmp/data2.tmp
|
||||||
#SELECT @v19, @v20;
|
|
||||||
#SELECT * FROM t2;
|
SELECT @v19, @v20;
|
||||||
#
|
SELECT * FROM t2;
|
||||||
#DROP TABLE t1;
|
|
||||||
#DROP TABLE t2;
|
DROP TABLE t1;
|
||||||
|
DROP TABLE t2;
|
||||||
|
|
||||||
#
|
#
|
||||||
# Bug #15881: cast problems
|
# Bug #15881: cast problems
|
||||||
|
@ -1,6 +1,22 @@
|
|||||||
source include/federated.inc;
|
# Note: This test is tricky. It reuses the prerequisites generated for
|
||||||
|
# replication tests (master+slave server and connections) for its
|
||||||
|
# own purposes. But the replication feature itself is stopped.
|
||||||
|
#
|
||||||
|
|
||||||
|
|
||||||
|
--source include/federated.inc
|
||||||
|
|
||||||
|
connection default;
|
||||||
|
|
||||||
|
# Disable concurrent inserts to avoid test failures when reading
|
||||||
|
# data from concurrent connections (insert might return before
|
||||||
|
# the data is actually in the table).
|
||||||
|
SET @OLD_MASTER_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;
|
||||||
|
SET @@GLOBAL.CONCURRENT_INSERT= 0;
|
||||||
|
|
||||||
connection slave;
|
connection slave;
|
||||||
|
SET @OLD_SLAVE_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;
|
||||||
|
SET @@GLOBAL.CONCURRENT_INSERT= 0;
|
||||||
DROP TABLE IF EXISTS federated.t1;
|
DROP TABLE IF EXISTS federated.t1;
|
||||||
CREATE TABLE federated.t1 (
|
CREATE TABLE federated.t1 (
|
||||||
`id` int(20) NOT NULL,
|
`id` int(20) NOT NULL,
|
||||||
@ -11,7 +27,7 @@ CREATE TABLE federated.t1 (
|
|||||||
connection master;
|
connection master;
|
||||||
DROP TABLE IF EXISTS federated.t1;
|
DROP TABLE IF EXISTS federated.t1;
|
||||||
# test too many items (malformed) in the comment string url
|
# test too many items (malformed) in the comment string url
|
||||||
--error 1432
|
--error ER_FOREIGN_DATA_STRING_INVALID_CANT_CREATE
|
||||||
CREATE TABLE federated.t1 (
|
CREATE TABLE federated.t1 (
|
||||||
`id` int(20) NOT NULL,
|
`id` int(20) NOT NULL,
|
||||||
`name` varchar(32) NOT NULL default ''
|
`name` varchar(32) NOT NULL default ''
|
||||||
@ -20,7 +36,7 @@ CREATE TABLE federated.t1 (
|
|||||||
CONNECTION='mysql://root@127.0.0.1:@/too/many/items/federated/t1';
|
CONNECTION='mysql://root@127.0.0.1:@/too/many/items/federated/t1';
|
||||||
|
|
||||||
# test not enough items (malformed) in the comment string url
|
# test not enough items (malformed) in the comment string url
|
||||||
--error 1432
|
--error ER_FOREIGN_DATA_STRING_INVALID_CANT_CREATE
|
||||||
CREATE TABLE federated.t1 (
|
CREATE TABLE federated.t1 (
|
||||||
`id` int(20) NOT NULL,
|
`id` int(20) NOT NULL,
|
||||||
`name` varchar(32) NOT NULL default ''
|
`name` varchar(32) NOT NULL default ''
|
||||||
@ -36,7 +52,7 @@ eval CREATE TABLE federated.t1 (
|
|||||||
)
|
)
|
||||||
ENGINE="FEDERATED" DEFAULT CHARSET=latin1
|
ENGINE="FEDERATED" DEFAULT CHARSET=latin1
|
||||||
CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t3';
|
CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t3';
|
||||||
--error 1431
|
--error ER_FOREIGN_DATA_SOURCE_DOESNT_EXIST
|
||||||
SELECT * FROM federated.t1;
|
SELECT * FROM federated.t1;
|
||||||
DROP TABLE federated.t1;
|
DROP TABLE federated.t1;
|
||||||
|
|
||||||
@ -48,7 +64,7 @@ eval CREATE TABLE federated.t1 (
|
|||||||
)
|
)
|
||||||
ENGINE="FEDERATED" DEFAULT CHARSET=latin1
|
ENGINE="FEDERATED" DEFAULT CHARSET=latin1
|
||||||
CONNECTION='mysql://user:pass@127.0.0.1:$SLAVE_MYPORT/federated/t1';
|
CONNECTION='mysql://user:pass@127.0.0.1:$SLAVE_MYPORT/federated/t1';
|
||||||
--error 1429
|
--error ER_CONNECT_TO_FOREIGN_DATA_SOURCE
|
||||||
SELECT * FROM federated.t1;
|
SELECT * FROM federated.t1;
|
||||||
DROP TABLE federated.t1;
|
DROP TABLE federated.t1;
|
||||||
|
|
||||||
@ -64,6 +80,7 @@ eval CREATE TABLE federated.t1 (
|
|||||||
INSERT INTO federated.t1 (id, name) VALUES (1, 'foo');
|
INSERT INTO federated.t1 (id, name) VALUES (1, 'foo');
|
||||||
INSERT INTO federated.t1 (id, name) VALUES (2, 'fee');
|
INSERT INTO federated.t1 (id, name) VALUES (2, 'fee');
|
||||||
|
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1;
|
SELECT * FROM federated.t1;
|
||||||
DELETE FROM federated.t1;
|
DELETE FROM federated.t1;
|
||||||
DROP TABLE federated.t1;
|
DROP TABLE federated.t1;
|
||||||
@ -84,7 +101,7 @@ eval SHOW CREATE TABLE federated.t2;
|
|||||||
INSERT INTO federated.t2 (id, name) VALUES (1, 'foo');
|
INSERT INTO federated.t2 (id, name) VALUES (1, 'foo');
|
||||||
INSERT INTO federated.t2 (id, name) VALUES (2, 'fee');
|
INSERT INTO federated.t2 (id, name) VALUES (2, 'fee');
|
||||||
|
|
||||||
SELECT * FROM federated.t2;
|
SELECT * FROM federated.t2 ORDER BY id, name;
|
||||||
DROP TABLE federated.t2;
|
DROP TABLE federated.t2;
|
||||||
|
|
||||||
connection slave;
|
connection slave;
|
||||||
@ -111,7 +128,7 @@ eval CREATE TABLE federated.t1 (
|
|||||||
INSERT INTO federated.t1 (id, name) VALUES (1, 'foo');
|
INSERT INTO federated.t1 (id, name) VALUES (1, 'foo');
|
||||||
INSERT INTO federated.t1 (id, name) VALUES (2, 'fee');
|
INSERT INTO federated.t1 (id, name) VALUES (2, 'fee');
|
||||||
|
|
||||||
SELECT * FROM federated.t1;
|
SELECT * FROM federated.t1 ORDER BY id,name;
|
||||||
DELETE FROM federated.t1;
|
DELETE FROM federated.t1;
|
||||||
DROP TABLE IF EXISTS federated.t1;
|
DROP TABLE IF EXISTS federated.t1;
|
||||||
|
|
||||||
@ -126,7 +143,7 @@ eval CREATE TABLE federated.`t1%` (
|
|||||||
INSERT INTO federated.`t1%` (id, name) VALUES (1, 'foo');
|
INSERT INTO federated.`t1%` (id, name) VALUES (1, 'foo');
|
||||||
INSERT INTO federated.`t1%` (id, name) VALUES (2, 'fee');
|
INSERT INTO federated.`t1%` (id, name) VALUES (2, 'fee');
|
||||||
|
|
||||||
SELECT * FROM federated.`t1%`;
|
SELECT * FROM federated.`t1%` ORDER BY id, name;
|
||||||
DELETE FROM federated.`t1%`;
|
DELETE FROM federated.`t1%`;
|
||||||
DROP TABLE IF EXISTS federated.`t1%`;
|
DROP TABLE IF EXISTS federated.`t1%`;
|
||||||
|
|
||||||
@ -166,12 +183,14 @@ INSERT INTO federated.t1 (name, other) VALUES ('Ninth Name', 99999);
|
|||||||
INSERT INTO federated.t1 (name, other) VALUES ('Tenth Name', 101010);
|
INSERT INTO federated.t1 (name, other) VALUES ('Tenth Name', 101010);
|
||||||
|
|
||||||
# basic select
|
# basic select
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1;
|
SELECT * FROM federated.t1;
|
||||||
# with PRIMARY KEY index_read_idx
|
# with PRIMARY KEY index_read_idx
|
||||||
SELECT * FROM federated.t1 WHERE id = 5;
|
SELECT * FROM federated.t1 WHERE id = 5;
|
||||||
SELECT * FROM federated.t1 WHERE name = 'Sixth Name';
|
SELECT * FROM federated.t1 WHERE name = 'Sixth Name';
|
||||||
SELECT * FROM federated.t1 WHERE id = 6 and name = 'Sixth Name';
|
SELECT * FROM federated.t1 WHERE id = 6 and name = 'Sixth Name';
|
||||||
SELECT * FROM federated.t1 WHERE name = 'Sixth Name' AND other = 44444;
|
SELECT * FROM federated.t1 WHERE name = 'Sixth Name' AND other = 44444;
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE name like '%th%';
|
SELECT * FROM federated.t1 WHERE name like '%th%';
|
||||||
UPDATE federated.t1 SET name = '3rd name' WHERE id = 3;
|
UPDATE federated.t1 SET name = '3rd name' WHERE id = 3;
|
||||||
SELECT * FROM federated.t1 WHERE name = '3rd name';
|
SELECT * FROM federated.t1 WHERE name = '3rd name';
|
||||||
@ -243,6 +262,7 @@ INSERT INTO federated.t1 (name, other, created)
|
|||||||
VALUES ('Tenth Name', 101010, '2005-03-12 12:00:01');
|
VALUES ('Tenth Name', 101010, '2005-03-12 12:00:01');
|
||||||
|
|
||||||
# basic select
|
# basic select
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1;
|
SELECT * FROM federated.t1;
|
||||||
# with PRIMARY KEY index_read_idx
|
# with PRIMARY KEY index_read_idx
|
||||||
SELECT * FROM federated.t1 WHERE id = 5;
|
SELECT * FROM federated.t1 WHERE id = 5;
|
||||||
@ -251,6 +271,7 @@ SELECT * FROM federated.t1 WHERE id = 5;
|
|||||||
SELECT * FROM federated.t1 WHERE id = 6 and name = 'Sixth Name';
|
SELECT * FROM federated.t1 WHERE id = 6 and name = 'Sixth Name';
|
||||||
# with regular key index_read -> index_read_idx
|
# with regular key index_read -> index_read_idx
|
||||||
SELECT * FROM federated.t1 WHERE other = 44444;
|
SELECT * FROM federated.t1 WHERE other = 44444;
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE name like '%th%';
|
SELECT * FROM federated.t1 WHERE name like '%th%';
|
||||||
# update - update_row, index_read_idx
|
# update - update_row, index_read_idx
|
||||||
UPDATE federated.t1 SET name = '3rd name' WHERE id = 3;
|
UPDATE federated.t1 SET name = '3rd name' WHERE id = 3;
|
||||||
@ -303,9 +324,12 @@ INSERT INTO federated.t1 (name, other) VALUES ('Eigth Name', 88888);
|
|||||||
INSERT INTO federated.t1 (name, other) VALUES ('Ninth Name', 99999);
|
INSERT INTO federated.t1 (name, other) VALUES ('Ninth Name', 99999);
|
||||||
INSERT INTO federated.t1 (other) VALUES ('fee fie foe fum');
|
INSERT INTO federated.t1 (other) VALUES ('fee fie foe fum');
|
||||||
|
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE other IS NULL;
|
SELECT * FROM federated.t1 WHERE other IS NULL;
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE name IS NULL;
|
SELECT * FROM federated.t1 WHERE name IS NULL;
|
||||||
SELECT * FROM federated.t1 WHERE name IS NULL and other IS NULL;
|
SELECT * FROM federated.t1 WHERE name IS NULL and other IS NULL;
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE name IS NULL or other IS NULL;
|
SELECT * FROM federated.t1 WHERE name IS NULL or other IS NULL;
|
||||||
|
|
||||||
UPDATE federated.t1
|
UPDATE federated.t1
|
||||||
@ -316,6 +340,7 @@ UPDATE federated.t1 SET other = 'two two two two' WHERE name = 'Second Name';
|
|||||||
UPDATE federated.t1 SET other = 'seven seven' WHERE name like 'Sev%';
|
UPDATE federated.t1 SET other = 'seven seven' WHERE name like 'Sev%';
|
||||||
UPDATE federated.t1 SET name = 'Tenth Name' WHERE other like 'fee fie%';
|
UPDATE federated.t1 SET name = 'Tenth Name' WHERE other like 'fee fie%';
|
||||||
SELECT * FROM federated.t1 WHERE name IS NULL OR other IS NULL ;
|
SELECT * FROM federated.t1 WHERE name IS NULL OR other IS NULL ;
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1;
|
SELECT * FROM federated.t1;
|
||||||
|
|
||||||
# test multi-keys
|
# test multi-keys
|
||||||
@ -386,6 +411,7 @@ INSERT INTO federated.t1 (name, bincol, floatval, other)
|
|||||||
VALUES ('second', 0x66, 22.22, 2222);
|
VALUES ('second', 0x66, 22.22, 2222);
|
||||||
INSERT INTO federated.t1 (name, bincol, floatval, other)
|
INSERT INTO federated.t1 (name, bincol, floatval, other)
|
||||||
VALUES ('third', 'g', 22.22, 2222);
|
VALUES ('third', 'g', 22.22, 2222);
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1;
|
SELECT * FROM federated.t1;
|
||||||
SELECT * FROM federated.t1 WHERE name = 'second';
|
SELECT * FROM federated.t1 WHERE name = 'second';
|
||||||
SELECT * FROM federated.t1 WHERE bincol= 'f';
|
SELECT * FROM federated.t1 WHERE bincol= 'f';
|
||||||
@ -394,6 +420,7 @@ SELECT * FROM federated.t1 WHERE bincol= 0x67;
|
|||||||
SELECT * FROM federated.t1 WHERE bincol= 'g';
|
SELECT * FROM federated.t1 WHERE bincol= 'g';
|
||||||
SELECT * FROM federated.t1 WHERE floatval=11.11;
|
SELECT * FROM federated.t1 WHERE floatval=11.11;
|
||||||
SELECT * FROM federated.t1 WHERE name='third';
|
SELECT * FROM federated.t1 WHERE name='third';
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE other=2222;
|
SELECT * FROM federated.t1 WHERE other=2222;
|
||||||
SELECT * FROM federated.t1 WHERE name='third' and other=2222;
|
SELECT * FROM federated.t1 WHERE name='third' and other=2222;
|
||||||
|
|
||||||
@ -467,32 +494,47 @@ SELECT * FROM federated.t1 WHERE id = 5
|
|||||||
SELECT * FROM federated.t1 WHERE id = 5
|
SELECT * FROM federated.t1 WHERE id = 5
|
||||||
AND col2 = 'five 5 five five 5' AND col3 = 5
|
AND col2 = 'five 5 five five 5' AND col3 = 5
|
||||||
AND col4 = 55555;
|
AND col4 = 55555;
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE (id = 5 AND col2 = 'five 5 five five 5')
|
SELECT * FROM federated.t1 WHERE (id = 5 AND col2 = 'five 5 five five 5')
|
||||||
OR (col2 = 'three Three' AND col3 = 33);
|
OR (col2 = 'three Three' AND col3 = 33);
|
||||||
SELECT * FROM federated.t1 WHERE (id = 5 AND col2 = 'Two two')
|
SELECT * FROM federated.t1 WHERE (id = 5 AND col2 = 'Two two')
|
||||||
OR (col2 = 444 AND col3 = 4444444);
|
OR (col2 = 444 AND col3 = 4444444);
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE id = 1
|
SELECT * FROM federated.t1 WHERE id = 1
|
||||||
OR col1 = 10
|
OR col1 = 10
|
||||||
OR col2 = 'Two two'
|
OR col2 = 'Two two'
|
||||||
OR col3 = 33
|
OR col3 = 33
|
||||||
OR col4 = 4444444;
|
OR col4 = 4444444;
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE id > 5;
|
SELECT * FROM federated.t1 WHERE id > 5;
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE id >= 5;
|
SELECT * FROM federated.t1 WHERE id >= 5;
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE id < 5;
|
SELECT * FROM federated.t1 WHERE id < 5;
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE id <= 5;
|
SELECT * FROM federated.t1 WHERE id <= 5;
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE id != 5;
|
SELECT * FROM federated.t1 WHERE id != 5;
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE id > 3 AND id < 7;
|
SELECT * FROM federated.t1 WHERE id > 3 AND id < 7;
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE id > 3 AND id <= 7;
|
SELECT * FROM federated.t1 WHERE id > 3 AND id <= 7;
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE id >= 3 AND id <= 7;
|
SELECT * FROM federated.t1 WHERE id >= 3 AND id <= 7;
|
||||||
SELECT * FROM federated.t1 WHERE id < 3 AND id <= 7;
|
SELECT * FROM federated.t1 WHERE id < 3 AND id <= 7;
|
||||||
SELECT * FROM federated.t1 WHERE id < 3 AND id > 7;
|
SELECT * FROM federated.t1 WHERE id < 3 AND id > 7;
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE id < 3 OR id > 7;
|
SELECT * FROM federated.t1 WHERE id < 3 OR id > 7;
|
||||||
SELECT * FROM federated.t1 WHERE col2 = 'three Three';
|
SELECT * FROM federated.t1 WHERE col2 = 'three Three';
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE col2 > 'one';
|
SELECT * FROM federated.t1 WHERE col2 > 'one';
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE col2 LIKE 's%';
|
SELECT * FROM federated.t1 WHERE col2 LIKE 's%';
|
||||||
SELECT * FROM federated.t1 WHERE col2 LIKE 'si%';
|
SELECT * FROM federated.t1 WHERE col2 LIKE 'si%';
|
||||||
SELECT * FROM federated.t1 WHERE col2 LIKE 'se%';
|
SELECT * FROM federated.t1 WHERE col2 LIKE 'se%';
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE col2 NOT LIKE 'e%';
|
SELECT * FROM federated.t1 WHERE col2 NOT LIKE 'e%';
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE col2 <> 'one One';
|
SELECT * FROM federated.t1 WHERE col2 <> 'one One';
|
||||||
|
|
||||||
# more multi-column indexes, in the primary key
|
# more multi-column indexes, in the primary key
|
||||||
@ -546,13 +588,19 @@ SELECT * FROM federated.t1 WHERE col3 = 'bababababa';
|
|||||||
SELECT * FROM federated.t1 WHERE col1 = 'gggg' AND col2 = 'ggggggggggggggggggg';
|
SELECT * FROM federated.t1 WHERE col1 = 'gggg' AND col2 = 'ggggggggggggggggggg';
|
||||||
SELECT * FROM federated.t1 WHERE col1 = 'gggg' AND col3 = 'gagagagaga';
|
SELECT * FROM federated.t1 WHERE col1 = 'gggg' AND col3 = 'gagagagaga';
|
||||||
SELECT * FROM federated.t1 WHERE col1 = 'ffff' AND col4 = 'fcfcfcfcfcfcfcfc';
|
SELECT * FROM federated.t1 WHERE col1 = 'ffff' AND col4 = 'fcfcfcfcfcfcfcfc';
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE col1 > 'bbbb';
|
SELECT * FROM federated.t1 WHERE col1 > 'bbbb';
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE col1 >= 'bbbb';
|
SELECT * FROM federated.t1 WHERE col1 >= 'bbbb';
|
||||||
SELECT * FROM federated.t1 WHERE col1 < 'bbbb';
|
SELECT * FROM federated.t1 WHERE col1 < 'bbbb';
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE col1 <= 'bbbb';
|
SELECT * FROM federated.t1 WHERE col1 <= 'bbbb';
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE col1 <> 'bbbb';
|
SELECT * FROM federated.t1 WHERE col1 <> 'bbbb';
|
||||||
SELECT * FROM federated.t1 WHERE col1 LIKE 'b%';
|
SELECT * FROM federated.t1 WHERE col1 LIKE 'b%';
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE col4 LIKE '%b%';
|
SELECT * FROM federated.t1 WHERE col4 LIKE '%b%';
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1 WHERE col1 NOT LIKE 'c%';
|
SELECT * FROM federated.t1 WHERE col1 NOT LIKE 'c%';
|
||||||
SELECT * FROM federated.t1 WHERE col4 NOT LIKE '%c%';
|
SELECT * FROM federated.t1 WHERE col4 NOT LIKE '%c%';
|
||||||
connection slave;
|
connection slave;
|
||||||
@ -583,11 +631,13 @@ INSERT INTO federated.t1 VALUES ('ccd', '112', 'zzzz');
|
|||||||
|
|
||||||
# let's see what the foreign database says
|
# let's see what the foreign database says
|
||||||
connection slave;
|
connection slave;
|
||||||
|
--sorted_result
|
||||||
SELECT col3 FROM federated.t1 WHERE (
|
SELECT col3 FROM federated.t1 WHERE (
|
||||||
(col1 = 'aaa' AND col2 >= '111') OR col1 > 'aaa') AND
|
(col1 = 'aaa' AND col2 >= '111') OR col1 > 'aaa') AND
|
||||||
(col1 < 'ccc' OR ( col1 = 'ccc' AND col2 <= '111'));
|
(col1 < 'ccc' OR ( col1 = 'ccc' AND col2 <= '111'));
|
||||||
|
|
||||||
connection master;
|
connection master;
|
||||||
|
--sorted_result
|
||||||
SELECT col3 FROM federated.t1 WHERE (
|
SELECT col3 FROM federated.t1 WHERE (
|
||||||
(col1 = 'aaa' AND col2 >= '111') OR col1 > 'aaa') AND
|
(col1 = 'aaa' AND col2 >= '111') OR col1 > 'aaa') AND
|
||||||
(col1 < 'ccc' OR ( col1 = 'ccc' AND col2 <= '111'));
|
(col1 < 'ccc' OR ( col1 = 'ccc' AND col2 <= '111'));
|
||||||
@ -622,6 +672,7 @@ INSERT INTO federated.t1 (name, floatval, other)
|
|||||||
VALUES ('foo', 33.33333332, NULL);
|
VALUES ('foo', 33.33333332, NULL);
|
||||||
INSERT INTO federated.t1 (name, floatval, other)
|
INSERT INTO federated.t1 (name, floatval, other)
|
||||||
VALUES (0, 00.3333, NULL);
|
VALUES (0, 00.3333, NULL);
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1;
|
SELECT * FROM federated.t1;
|
||||||
SELECT count(*) FROM federated.t1
|
SELECT count(*) FROM federated.t1
|
||||||
WHERE id IS NULL
|
WHERE id IS NULL
|
||||||
@ -651,7 +702,8 @@ eval CREATE TABLE federated.t1 (
|
|||||||
INSERT INTO federated.t1 VALUES (1, " MySQL supports a number of column types in several categories: numeric types, date and time types, and string (character) types. This chapter first gives an overview of these column types, and then provides a more detailed description of the properties of the types in each category, and a summary of the column type storage requirements. The overview is intentionally brief. The more detailed descriptions should be consulted for additional information about particular column types, such as the allowable formats in which you can specify values.");
|
INSERT INTO federated.t1 VALUES (1, " MySQL supports a number of column types in several categories: numeric types, date and time types, and string (character) types. This chapter first gives an overview of these column types, and then provides a more detailed description of the properties of the types in each category, and a summary of the column type storage requirements. The overview is intentionally brief. The more detailed descriptions should be consulted for additional information about particular column types, such as the allowable formats in which you can specify values.");
|
||||||
INSERT INTO federated.t1 VALUES (2, "All arithmetic is done using signed BIGINT or DOUBLE values, so you should not use unsigned big integers larger than 9223372036854775807 (63 bits) except with bit functions! If you do that, some of the last digits in the result may be wrong because of rounding errors when converting a BIGINT value to a DOUBLE.");
|
INSERT INTO federated.t1 VALUES (2, "All arithmetic is done using signed BIGINT or DOUBLE values, so you should not use unsigned big integers larger than 9223372036854775807 (63 bits) except with bit functions! If you do that, some of the last digits in the result may be wrong because of rounding errors when converting a BIGINT value to a DOUBLE.");
|
||||||
INSERT INTO federated.t1 VALUES (3, " A floating-point number. p represents the precision. It can be from 0 to 24 for a single-precision floating-point number and from 25 to 53 for a double-precision floating-point number. These types are like the FLOAT and DOUBLE types described immediately following. FLOAT(p) has the same range as the corresponding FLOAT and DOUBLE types, but the display size and number of decimals are undefined. ");
|
INSERT INTO federated.t1 VALUES (3, " A floating-point number. p represents the precision. It can be from 0 to 24 for a single-precision floating-point number and from 25 to 53 for a double-precision floating-point number. These types are like the FLOAT and DOUBLE types described immediately following. FLOAT(p) has the same range as the corresponding FLOAT and DOUBLE types, but the display size and number of decimals are undefined. ");
|
||||||
INSERT INTO federated.t1 VALUES(4, "Die Übersetzung einer so umfangreichen technischen Dokumentation wie des MySQL-Referenzhandbuchs ist schon eine besondere Herausforderung. Zumindest für jemanden, der seine Zielsprache ernst nimmt:");
|
INSERT INTO federated.t1 VALUES(4, "Die Übersetzung einer so umfangreichen technischen Dokumentation wie des MySQL-Referenzhandbuchs ist schon eine besondere Herausforderung. Zumindest für jemanden, der seine Zielsprache ernst nimmt:");
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1;
|
SELECT * FROM federated.t1;
|
||||||
|
|
||||||
connection slave;
|
connection slave;
|
||||||
@ -1010,6 +1062,7 @@ eval CREATE TABLE federated.t1 (
|
|||||||
INSERT INTO federated.t1 (code, fileguts, creation_date) VALUES ('ASDFWERQWETWETAWETA', '*()w*09*$()*#)(*09*^90*d)(*s()d8g)(s*ned)(*)(s*d)(*hn(d*)(*sbn)D((#$*(#*%%&#&^$#&#&#&#&^&#*&*#$*&^*(&#(&Q*&&(*!&!(*&*(#&*(%&#<S-F8>*<S-F8><S-F8><S-F8>#<S-F8>#<S-F8>#<S-F8>[[', '2003-03-03 03:03:03');
|
INSERT INTO federated.t1 (code, fileguts, creation_date) VALUES ('ASDFWERQWETWETAWETA', '*()w*09*$()*#)(*09*^90*d)(*s()d8g)(s*ned)(*)(s*d)(*hn(d*)(*sbn)D((#$*(#*%%&#&^$#&#&#&#&^&#*&*#$*&^*(&#(&Q*&&(*!&!(*&*(#&*(%&#<S-F8>*<S-F8><S-F8><S-F8>#<S-F8>#<S-F8>#<S-F8>[[', '2003-03-03 03:03:03');
|
||||||
INSERT INTO federated.t1 (code, fileguts, creation_date) VALUES ('DEUEUEUEUEUEUEUEUEU', '*()w*09*$()*#)(*09*^90*d)(*s()d8g)(s*ned)(*)(s*d)(*hn(d*)(*sbn)D((#$*(#*%%&#&^$#&#&#&#&^&#*&*#$*&^*(&#(&Q*&&(*!&!(*&*(#&*(%&#<S-F8>*<S-F8><S-F8><S-F8>#<S-F8>#<S-F8>#<S-F8>[[', '2004-04-04 04:04:04');
|
INSERT INTO federated.t1 (code, fileguts, creation_date) VALUES ('DEUEUEUEUEUEUEUEUEU', '*()w*09*$()*#)(*09*^90*d)(*s()d8g)(s*ned)(*)(s*d)(*hn(d*)(*sbn)D((#$*(#*%%&#&^$#&#&#&#&^&#*&*#$*&^*(&#(&Q*&&(*!&!(*&*(#&*(%&#<S-F8>*<S-F8><S-F8><S-F8>#<S-F8>#<S-F8>#<S-F8>[[', '2004-04-04 04:04:04');
|
||||||
INSERT INTO federated.t1 (code, fileguts, creation_date) VALUES ('DEUEUEUEUEUEUEUEUEU', 'jimbob', '2004-04-04 04:04:04');
|
INSERT INTO federated.t1 (code, fileguts, creation_date) VALUES ('DEUEUEUEUEUEUEUEUEU', 'jimbob', '2004-04-04 04:04:04');
|
||||||
|
--sorted_result
|
||||||
SELECT * FROM federated.t1;
|
SELECT * FROM federated.t1;
|
||||||
# test blob indexes
|
# test blob indexes
|
||||||
SELECT * FROM federated.t1 WHERE fileguts = 'jimbob';
|
SELECT * FROM federated.t1 WHERE fileguts = 'jimbob';
|
||||||
@ -1030,6 +1083,7 @@ CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
|
|||||||
INSERT INTO federated.t1 VALUES (0x00);
|
INSERT INTO federated.t1 VALUES (0x00);
|
||||||
INSERT INTO federated.t1 VALUES (0x0001);
|
INSERT INTO federated.t1 VALUES (0x0001);
|
||||||
INSERT INTO federated.t1 VALUES (0x0100);
|
INSERT INTO federated.t1 VALUES (0x0100);
|
||||||
|
--sorted_result
|
||||||
SELECT HEX(a) FROM federated.t1;
|
SELECT HEX(a) FROM federated.t1;
|
||||||
|
|
||||||
# # simple tests for cyrillic, given to me by
|
# # simple tests for cyrillic, given to me by
|
||||||
@ -1044,20 +1098,20 @@ SELECT HEX(a) FROM federated.t1;
|
|||||||
# CREATE TABLE federated.t1 (a char(20)) charset=cp1251;
|
# CREATE TABLE federated.t1 (a char(20)) charset=cp1251;
|
||||||
# #
|
# #
|
||||||
# connection master;
|
# connection master;
|
||||||
# INSERT INTO federated.t1 values (_cp1251'À-ÁÂÃ-1');
|
# INSERT INTO federated.t1 values (_cp1251'À-ÁÂÃ-1');
|
||||||
# INSERT INTO federated.t1 values (_cp1251'Á-ÂÃÄ-2');
|
# INSERT INTO federated.t1 values (_cp1251'Á-ÂÃÄ-2');
|
||||||
# SELECT * FROM federated.t1;
|
# SELECT * FROM federated.t1;
|
||||||
# SET names cp1251;
|
# SET names cp1251;
|
||||||
# INSERT INTO federated.t1 values ('Â-ÃÄÅ-3');
|
# INSERT INTO federated.t1 values ('Â-ÃÄÅ-3');
|
||||||
# INSERT INTO federated.t1 values ('Ã-ŨÆ-4');
|
# INSERT INTO federated.t1 values ('Ã-ŨÆ-4');
|
||||||
# SELECT * FROM federated.t1;
|
# SELECT * FROM federated.t1;
|
||||||
# SELECT hex(a) from federated.t1;
|
# SELECT hex(a) from federated.t1;
|
||||||
# SELECT hex(a) from federated.t1 ORDER BY a desc;
|
# SELECT hex(a) from federated.t1 ORDER BY a desc;
|
||||||
# UPDATE federated.t1 SET a='À-ÁÂÃ-1íîâûé' WHERE a='À-ÁÂÃ-1';
|
# UPDATE federated.t1 SET a='À-ÁÂÃ-1íîâûé' WHERE a='À-ÁÂÃ-1';
|
||||||
# SELECT * FROM federated.t1;
|
# SELECT * FROM federated.t1;
|
||||||
# DELETE FROM federated.t1 WHERE a='Ã-ŨÆ-4';
|
# DELETE FROM federated.t1 WHERE a='Ã-ŨÆ-4';
|
||||||
# SELECT * FROM federated.t1;
|
# SELECT * FROM federated.t1;
|
||||||
# DELETE FROM federated.t1 WHERE a>'Â-';
|
# DELETE FROM federated.t1 WHERE a>'Â-';
|
||||||
# SELECT * FROM federated.t1;
|
# SELECT * FROM federated.t1;
|
||||||
# SET names default;
|
# SET names default;
|
||||||
# DROP TABLE IF EXISTS federated.t1;
|
# DROP TABLE IF EXISTS federated.t1;
|
||||||
@ -1108,6 +1162,7 @@ INSERT INTO federated.t1 (name, country_id, other) VALUES ('Monty', 4, 33333);
|
|||||||
INSERT INTO federated.t1 (name, country_id, other) VALUES ('Sanja', 5, 33333);
|
INSERT INTO federated.t1 (name, country_id, other) VALUES ('Sanja', 5, 33333);
|
||||||
|
|
||||||
#inner join
|
#inner join
|
||||||
|
--sorted_result
|
||||||
SELECT federated.t1.name AS name, federated.t1.country_id AS country_id,
|
SELECT federated.t1.name AS name, federated.t1.country_id AS country_id,
|
||||||
federated.t1.other AS other, federated.countries.country AS country
|
federated.t1.other AS other, federated.countries.country AS country
|
||||||
FROM federated.t1, federated.countries WHERE
|
FROM federated.t1, federated.countries WHERE
|
||||||
@ -1181,7 +1236,7 @@ INSERT INTO federated.alter_me (id, name) VALUES (2, 'David');
|
|||||||
|
|
||||||
SELECT * FROM federated.alter_me;
|
SELECT * FROM federated.alter_me;
|
||||||
|
|
||||||
--error 1031
|
--error ER_ILLEGAL_HA
|
||||||
ALTER TABLE federated.alter_me MODIFY COLUMN id int(16) NOT NULL;
|
ALTER TABLE federated.alter_me MODIFY COLUMN id int(16) NOT NULL;
|
||||||
|
|
||||||
SELECT * FROM federated.alter_me;
|
SELECT * FROM federated.alter_me;
|
||||||
@ -1452,15 +1507,15 @@ insert into federated.t2 values (13, 17), (19, 23);
|
|||||||
# Each of three statements should correctly set values for all three fields
|
# Each of three statements should correctly set values for all three fields
|
||||||
# insert
|
# insert
|
||||||
insert into federated.t1 (a, b) values (1, 2), (3, 5), (7, 11);
|
insert into federated.t1 (a, b) values (1, 2), (3, 5), (7, 11);
|
||||||
select * from federated.t1;
|
select * from federated.t1 order by a;
|
||||||
delete from federated.t1;
|
delete from federated.t1;
|
||||||
# insert ... select
|
# insert ... select
|
||||||
insert into federated.t1 (a, b) select * from federated.t2;
|
insert into federated.t1 (a, b) select * from federated.t2;
|
||||||
select * from federated.t1;
|
select * from federated.t1 order by a;
|
||||||
delete from federated.t1;
|
delete from federated.t1;
|
||||||
# load
|
# load
|
||||||
load data infile '../std_data_ln/loaddata5.dat' into table federated.t1 fields terminated by '' enclosed by '' ignore 1 lines (a, b);
|
load data infile '../std_data_ln/loaddata5.dat' into table federated.t1 fields terminated by '' enclosed by '' ignore 1 lines (a, b);
|
||||||
select * from federated.t1;
|
select * from federated.t1 order by a;
|
||||||
drop tables federated.t1, federated.t2;
|
drop tables federated.t1, federated.t2;
|
||||||
|
|
||||||
connection slave;
|
connection slave;
|
||||||
@ -1769,7 +1824,13 @@ DROP TABLE t1;
|
|||||||
connection master;
|
connection master;
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
|
|
||||||
|
connection default;
|
||||||
source include/federated_cleanup.inc;
|
|
||||||
|
|
||||||
--echo End of 5.0 tests
|
--echo End of 5.0 tests
|
||||||
|
|
||||||
|
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_MASTER_CONCURRENT_INSERT;
|
||||||
|
connection slave;
|
||||||
|
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;
|
||||||
|
|
||||||
|
connection default;
|
||||||
|
source include/federated_cleanup.inc;
|
||||||
|
@ -318,4 +318,184 @@ DROP VIEW v3;
|
|||||||
|
|
||||||
###########################################################################
|
###########################################################################
|
||||||
|
|
||||||
# End of 5.0 tests
|
|
||||||
|
#
|
||||||
|
# Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with
|
||||||
|
# LOAD DATA INFILE
|
||||||
|
#
|
||||||
|
|
||||||
|
# - For each plain "SELECT id,...", the 1st pair ("before" SELECT...OUTFILE,
|
||||||
|
# LOAD...INFILE) and the 2nd pair of lines ("after") in the result should
|
||||||
|
# look the same, otherwise we broke the dumpe/restore cycle!
|
||||||
|
#
|
||||||
|
# - the \r is always { '\\', 'r' } in memory, but on-disk format changes
|
||||||
|
#
|
||||||
|
# - the \t is { '\t' } or { '\\', 't' } in memory depending on whether \
|
||||||
|
# is magic (that is, NO_BACKSLASH_ESCAPES is not set) at INSERT-time.
|
||||||
|
# on-disk format varies.
|
||||||
|
#
|
||||||
|
# - while INFILE/OUTFILE behaviour changes according to NO_BACKSLASH_ESCAPES,
|
||||||
|
# we can override these defaults using ESCAPED BY '...'
|
||||||
|
# 1: NO_BACKSLASH_ESCAPES default, \ on-disk: \,t,x,\r
|
||||||
|
# 2: NO_BACKSLASH_ESCAPES override, \\ on-disk: \,\,t,x,\,\,r
|
||||||
|
# 3: !NO_BACKSLASH_ESCAPES default, \\ on-disk: tab,\,\,r
|
||||||
|
# 3: !NO_BACKSLASH_ESCAPES override, \ on-disk: tab,\,r
|
||||||
|
|
||||||
|
--echo Bug#37114
|
||||||
|
|
||||||
|
SET SESSION character_set_client=latin1;
|
||||||
|
SET SESSION character_set_server=latin1;
|
||||||
|
SET SESSION character_set_connection=latin1;
|
||||||
|
SET @OLD_SQL_MODE=@@SESSION.SQL_MODE;
|
||||||
|
|
||||||
|
# 0. test LOAD DATA INFILE first; if that works, all issues in
|
||||||
|
# SELECT INTO OUTFILE / LOAD DATA INFILE cycles below are
|
||||||
|
# arguably in the saving.
|
||||||
|
|
||||||
|
--echo test LOAD DATA INFILE
|
||||||
|
|
||||||
|
--let $file=$MYSQLTEST_VARDIR/tmp/bug37114.txt
|
||||||
|
--let $file2=$MYSQLTEST_VARDIR/tmp/bug37114_out.txt
|
||||||
|
|
||||||
|
SET sql_mode = '';
|
||||||
|
|
||||||
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
|
--eval SELECT '1 \\\\aa\n' INTO DUMPFILE '$file'
|
||||||
|
|
||||||
|
CREATE TABLE t1 (id INT, val1 CHAR(3)) ENGINE=MyISAM;
|
||||||
|
|
||||||
|
SET sql_mode = 'NO_BACKSLASH_ESCAPES';
|
||||||
|
|
||||||
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
|
--eval LOAD DATA INFILE '$file' REPLACE INTO TABLE t1 FIELDS TERMINATED BY ' '
|
||||||
|
SELECT * FROM t1;
|
||||||
|
|
||||||
|
# show we can write this with OUTFILE, forcing the parameters for now
|
||||||
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
|
--eval SELECT * INTO OUTFILE '$file2' FIELDS ESCAPED BY '' TERMINATED BY ' ' FROM t1
|
||||||
|
--diff_files $file $file2
|
||||||
|
--remove_file $file2
|
||||||
|
|
||||||
|
# now show the OUTFILE defaults are correct with NO_BACKSLASH_ESCAPES
|
||||||
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
|
--eval SELECT * INTO OUTFILE '$file2' FIELDS TERMINATED BY ' ' FROM t1
|
||||||
|
--diff_files $file $file2
|
||||||
|
--remove_file $file2
|
||||||
|
|
||||||
|
INSERT INTO t1 (id, val1) VALUES (1, '\aa');
|
||||||
|
SELECT * FROM t1;
|
||||||
|
|
||||||
|
SET sql_mode='';
|
||||||
|
INSERT INTO t1 (id, val1) VALUES (1, '\aa');
|
||||||
|
SELECT * FROM t1;
|
||||||
|
|
||||||
|
DROP TABLE t1;
|
||||||
|
|
||||||
|
--remove_file $file
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
--echo test SELECT INTO OUTFILE
|
||||||
|
|
||||||
|
CREATE TABLE t1 (id INT PRIMARY KEY, val1 CHAR(4));
|
||||||
|
CREATE TABLE t2 LIKE t1;
|
||||||
|
|
||||||
|
# 1. with NO_BACKSLASH_ESCAPES on
|
||||||
|
|
||||||
|
SET sql_mode = '';
|
||||||
|
INSERT INTO t1 (id, val1) VALUES (5, '\ttab');
|
||||||
|
INSERT INTO t1 (id, val1) VALUES (4, '\\r');
|
||||||
|
SET sql_mode = 'NO_BACKSLASH_ESCAPES';
|
||||||
|
INSERT INTO t1 (id, val1) VALUES (3, '\tx');
|
||||||
|
|
||||||
|
--echo 1.1 NO_BACKSLASH_ESCAPES, use defaults for ESCAPED BY
|
||||||
|
|
||||||
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
|
--eval SELECT * INTO OUTFILE '$file' FIELDS TERMINATED BY ' ' FROM t1 ORDER BY id
|
||||||
|
|
||||||
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
|
--eval LOAD DATA INFILE '$file' INTO TABLE t2 FIELDS TERMINATED BY ' '
|
||||||
|
|
||||||
|
SELECT 'before' AS t, id, val1, hex(val1) FROM t1 UNION
|
||||||
|
SELECT 'after' AS t, id, val1, hex(val1) FROM t2 ORDER BY id,t DESC;
|
||||||
|
|
||||||
|
TRUNCATE t2;
|
||||||
|
|
||||||
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
|
eval SELECT LOAD_FILE("$file");
|
||||||
|
--remove_file $file
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
--echo 1.2 NO_BACKSLASH_ESCAPES, override defaults for ESCAPED BY
|
||||||
|
|
||||||
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
|
--eval SELECT * INTO OUTFILE '$file' FIELDS ESCAPED BY '\' TERMINATED BY ' ' FROM t1 ORDER BY id
|
||||||
|
|
||||||
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
|
--eval LOAD DATA INFILE '$file' INTO TABLE t2 FIELDS ESCAPED BY '\' TERMINATED BY ' '
|
||||||
|
|
||||||
|
SELECT 'before' AS t, id, val1, hex(val1) FROM t1 UNION
|
||||||
|
SELECT 'after' AS t, id, val1, hex(val1) FROM t2 ORDER BY id,t DESC;
|
||||||
|
|
||||||
|
TRUNCATE t2;
|
||||||
|
|
||||||
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
|
eval SELECT LOAD_FILE("$file");
|
||||||
|
--remove_file $file
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# 2. with NO_BACKSLASH_ESCAPES off
|
||||||
|
|
||||||
|
SET sql_mode = '';
|
||||||
|
|
||||||
|
--echo 2.1 !NO_BACKSLASH_ESCAPES, use defaults for ESCAPED BY
|
||||||
|
|
||||||
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
|
--eval SELECT * INTO OUTFILE '$file' FIELDS TERMINATED BY ' ' FROM t1 ORDER BY id
|
||||||
|
|
||||||
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
|
--eval LOAD DATA INFILE '$file' INTO TABLE t2 FIELDS TERMINATED BY ' '
|
||||||
|
|
||||||
|
SELECT 'before' AS t, id, val1, hex(val1) FROM t1 UNION
|
||||||
|
SELECT 'after' AS t, id, val1, hex(val1) FROM t2 ORDER BY id,t DESC;
|
||||||
|
|
||||||
|
TRUNCATE t2;
|
||||||
|
|
||||||
|
SET sql_mode = 'NO_BACKSLASH_ESCAPES';
|
||||||
|
|
||||||
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
|
eval SELECT LOAD_FILE("$file");
|
||||||
|
--remove_file $file
|
||||||
|
|
||||||
|
SET sql_mode = '';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
--echo 2.2 !NO_BACKSLASH_ESCAPES, override defaults for ESCAPED BY
|
||||||
|
|
||||||
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
|
--eval SELECT * INTO OUTFILE '$file' FIELDS ESCAPED BY '' TERMINATED BY ' ' FROM t1 ORDER BY id
|
||||||
|
|
||||||
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
|
--eval LOAD DATA INFILE '$file' INTO TABLE t2 FIELDS ESCAPED BY '' TERMINATED BY ' '
|
||||||
|
|
||||||
|
SELECT 'before' AS t, id, val1, hex(val1) FROM t1 UNION
|
||||||
|
SELECT 'after' AS t, id, val1, hex(val1) FROM t2 ORDER BY id,t DESC;
|
||||||
|
|
||||||
|
TRUNCATE t2;
|
||||||
|
|
||||||
|
SET sql_mode = 'NO_BACKSLASH_ESCAPES';
|
||||||
|
|
||||||
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
|
eval SELECT LOAD_FILE("$file");
|
||||||
|
--remove_file $file
|
||||||
|
|
||||||
|
# clean up
|
||||||
|
set session sql_mode=@OLD_SQL_MODE;
|
||||||
|
DROP TABLE t1,t2;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
--echo End of 5.0 tests
|
||||||
|
@ -5,6 +5,14 @@
|
|||||||
# Binlog is required
|
# Binlog is required
|
||||||
--source include/have_log_bin.inc
|
--source include/have_log_bin.inc
|
||||||
|
|
||||||
|
|
||||||
|
--echo Bug#37938 - Test "mysqldump" lacks various insert statements
|
||||||
|
--echo Turn off concurrent inserts to avoid random errors
|
||||||
|
--echo NOTE: We reset the variable back to saved value at the end of test
|
||||||
|
SET @OLD_CONCURRENT_INSERT = @@GLOBAL.CONCURRENT_INSERT;
|
||||||
|
SET @@GLOBAL.CONCURRENT_INSERT = 0;
|
||||||
|
|
||||||
|
|
||||||
--disable_warnings
|
--disable_warnings
|
||||||
DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa, t3;
|
DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa, t3;
|
||||||
drop database if exists mysqldump_test_db;
|
drop database if exists mysqldump_test_db;
|
||||||
@ -1594,6 +1602,10 @@ DROP TABLE t1,t2;
|
|||||||
--replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// / on [0-9 :-]+/ on DATE/
|
--replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// / on [0-9 :-]+/ on DATE/
|
||||||
--exec $MYSQL_DUMP test
|
--exec $MYSQL_DUMP test
|
||||||
|
|
||||||
|
# We reset concurrent_inserts value to whatever it was at the start of the test
|
||||||
|
SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
|
||||||
|
|
||||||
|
|
||||||
--echo #
|
--echo #
|
||||||
--echo # End of 5.0 tests
|
--echo # End of 5.0 tests
|
||||||
--echo #
|
--echo #
|
||||||
|
@ -24,7 +24,7 @@ create table t1(
|
|||||||
|
|
||||||
insert into t1 values(1, "Autodiscover");
|
insert into t1 values(1, "Autodiscover");
|
||||||
flush tables;
|
flush tables;
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/test/t1.frm ;
|
remove_file $MYSQLTEST_VARDIR/master-data/test/t1.frm ;
|
||||||
select * from t1;
|
select * from t1;
|
||||||
show status like 'handler_discover%';
|
show status like 'handler_discover%';
|
||||||
|
|
||||||
@ -33,13 +33,13 @@ show status like 'handler_discover%';
|
|||||||
#
|
#
|
||||||
|
|
||||||
flush tables;
|
flush tables;
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/test/t1.frm ;
|
remove_file $MYSQLTEST_VARDIR/master-data/test/t1.frm ;
|
||||||
insert into t1 values (2, "Auto 2");
|
insert into t1 values (2, "Auto 2");
|
||||||
show status like 'handler_discover%';
|
show status like 'handler_discover%';
|
||||||
insert into t1 values (3, "Discover 3");
|
insert into t1 values (3, "Discover 3");
|
||||||
show status like 'handler_discover%';
|
show status like 'handler_discover%';
|
||||||
flush tables;
|
flush tables;
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/test/t1.frm ;
|
remove_file $MYSQLTEST_VARDIR/master-data/test/t1.frm ;
|
||||||
select * from t1 order by id;
|
select * from t1 order by id;
|
||||||
show status like 'handler_discover%';
|
show status like 'handler_discover%';
|
||||||
|
|
||||||
@ -48,7 +48,7 @@ show status like 'handler_discover%';
|
|||||||
#
|
#
|
||||||
|
|
||||||
flush tables;
|
flush tables;
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/test/t1.frm ;
|
remove_file $MYSQLTEST_VARDIR/master-data/test/t1.frm ;
|
||||||
update t1 set name="Autodiscover" where id = 2;
|
update t1 set name="Autodiscover" where id = 2;
|
||||||
show status like 'handler_discover%';
|
show status like 'handler_discover%';
|
||||||
select * from t1 order by id;
|
select * from t1 order by id;
|
||||||
@ -59,7 +59,7 @@ show status like 'handler_discover%';
|
|||||||
#
|
#
|
||||||
|
|
||||||
flush tables;
|
flush tables;
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/test/t1.frm ;
|
remove_file $MYSQLTEST_VARDIR/master-data/test/t1.frm ;
|
||||||
delete from t1 where id = 3;
|
delete from t1 where id = 3;
|
||||||
select * from t1 order by id;
|
select * from t1 order by id;
|
||||||
show status like 'handler_discover%';
|
show status like 'handler_discover%';
|
||||||
@ -111,9 +111,9 @@ show status like 'handler_discover%';
|
|||||||
flush tables;
|
flush tables;
|
||||||
|
|
||||||
# Remove the frm file from disk
|
# Remove the frm file from disk
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/test/t3.frm ;
|
remove_file $MYSQLTEST_VARDIR/master-data/test/t3.frm ;
|
||||||
|
|
||||||
--error 1050
|
--error ER_TABLE_EXISTS_ERROR
|
||||||
create table t3(
|
create table t3(
|
||||||
id int not null primary key,
|
id int not null primary key,
|
||||||
name char(20), a int, b float, c char(24)
|
name char(20), a int, b float, c char(24)
|
||||||
@ -168,14 +168,14 @@ show status like 'handler_discover%';
|
|||||||
|
|
||||||
# Remove the frm file from disk
|
# Remove the frm file from disk
|
||||||
flush tables;
|
flush tables;
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/test/t7.frm ;
|
remove_file $MYSQLTEST_VARDIR/master-data/test/t7.frm ;
|
||||||
|
|
||||||
show tables from test;
|
show tables from test;
|
||||||
show status like 'handler_discover%';
|
show status like 'handler_discover%';
|
||||||
|
|
||||||
# Remove the frm file from disk again
|
# Remove the frm file from disk again
|
||||||
flush tables;
|
flush tables;
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/test/t7.frm ;
|
remove_file $MYSQLTEST_VARDIR/master-data/test/t7.frm ;
|
||||||
|
|
||||||
--replace_column 7 # 8 # 9 # 12 # 13 # 15 # 18 #
|
--replace_column 7 # 8 # 9 # 12 # 13 # 15 # 18 #
|
||||||
show table status;
|
show table status;
|
||||||
@ -204,13 +204,13 @@ system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t4 >> $NDB_TOOLS
|
|||||||
|
|
||||||
#
|
#
|
||||||
# Test that correct error is returned
|
# Test that correct error is returned
|
||||||
--error 1146
|
--error ER_NO_SUCH_TABLE
|
||||||
select * from t4;
|
select * from t4;
|
||||||
--error 1146
|
--error ER_NO_SUCH_TABLE
|
||||||
select * from t4;
|
select * from t4;
|
||||||
|
|
||||||
show status like 'handler_discover%';
|
show status like 'handler_discover%';
|
||||||
--error 1051
|
--error ER_BAD_TABLE_ERROR
|
||||||
drop table t4;
|
drop table t4;
|
||||||
|
|
||||||
create table t4(
|
create table t4(
|
||||||
@ -223,14 +223,14 @@ select * from t4;
|
|||||||
# Remove the table from NDB
|
# Remove the table from NDB
|
||||||
system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t4 >> $NDB_TOOLS_OUTPUT ;
|
system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t4 >> $NDB_TOOLS_OUTPUT ;
|
||||||
|
|
||||||
--error 1146
|
--error ER_NO_SUCH_TABLE
|
||||||
select * from t4;
|
select * from t4;
|
||||||
|
|
||||||
drop table if exists t4;
|
drop table if exists t4;
|
||||||
|
|
||||||
# Test that dropping a table that does not exists
|
# Test that dropping a table that does not exists
|
||||||
# on disk or in NDB gives same result as above
|
# on disk or in NDB gives same result as above
|
||||||
--error 1051
|
--error ER_BAD_TABLE_ERROR
|
||||||
drop table t5;
|
drop table t5;
|
||||||
drop table if exists t5;
|
drop table if exists t5;
|
||||||
|
|
||||||
@ -257,7 +257,7 @@ system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t4 >> $NDB_TOOLS
|
|||||||
|
|
||||||
SHOW TABLES;
|
SHOW TABLES;
|
||||||
|
|
||||||
--error 1146
|
--error ER_NO_SUCH_TABLE
|
||||||
select * from t4;
|
select * from t4;
|
||||||
|
|
||||||
#######################################################
|
#######################################################
|
||||||
@ -290,8 +290,8 @@ insert into t9 values (9);
|
|||||||
system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t3 >> $NDB_TOOLS_OUTPUT ;
|
system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t3 >> $NDB_TOOLS_OUTPUT ;
|
||||||
system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t5 >> $NDB_TOOLS_OUTPUT ;
|
system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t5 >> $NDB_TOOLS_OUTPUT ;
|
||||||
# Remove t6, t7 from disk
|
# Remove t6, t7 from disk
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/test/t6.frm > /dev/null ;
|
remove_file $MYSQLTEST_VARDIR/master-data/test/t6.frm;
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/test/t7.frm > /dev/null ;
|
remove_file $MYSQLTEST_VARDIR/master-data/test/t7.frm;
|
||||||
|
|
||||||
SHOW TABLES;
|
SHOW TABLES;
|
||||||
|
|
||||||
@ -332,8 +332,8 @@ insert into t9 values (9);
|
|||||||
system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t3 > /dev/null ;
|
system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t3 > /dev/null ;
|
||||||
system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t5 > /dev/null ;
|
system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t5 > /dev/null ;
|
||||||
# Remove t6, t7 from disk
|
# Remove t6, t7 from disk
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/test/t6.frm > /dev/null ;
|
remove_file $MYSQLTEST_VARDIR/master-data/test/t6.frm;
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/test/t7.frm > /dev/null ;
|
remove_file $MYSQLTEST_VARDIR/master-data/test/t7.frm;
|
||||||
|
|
||||||
|
|
||||||
SHOW TABLES LIKE 't6';
|
SHOW TABLES LIKE 't6';
|
||||||
@ -342,9 +342,9 @@ show status like 'handler_discover%';
|
|||||||
|
|
||||||
# Check that t3 or t5 can't be created
|
# Check that t3 or t5 can't be created
|
||||||
# frm files for these tables is stilll on disk
|
# frm files for these tables is stilll on disk
|
||||||
--error 1050
|
--error ER_TABLE_EXISTS_ERROR
|
||||||
create table t3(a int);
|
create table t3(a int);
|
||||||
--error 1050
|
--error ER_TABLE_EXISTS_ERROR
|
||||||
create table t5(a int);
|
create table t5(a int);
|
||||||
|
|
||||||
SHOW TABLES LIKE 't%';
|
SHOW TABLES LIKE 't%';
|
||||||
@ -375,9 +375,9 @@ insert into t3 values (3, "ndb table 3");
|
|||||||
insert into t4 values (4);
|
insert into t4 values (4);
|
||||||
|
|
||||||
# Remove t1, t2, t3 from disk
|
# Remove t1, t2, t3 from disk
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/test/t1.frm > /dev/null ;
|
remove_file $MYSQLTEST_VARDIR/master-data/test/t1.frm;
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/test/t2.frm > /dev/null ;
|
remove_file $MYSQLTEST_VARDIR/master-data/test/t2.frm;
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/test/t3.frm > /dev/null ;
|
remove_file $MYSQLTEST_VARDIR/master-data/test/t3.frm;
|
||||||
flush tables;
|
flush tables;
|
||||||
|
|
||||||
# Select from the table which only exists in NDB.
|
# Select from the table which only exists in NDB.
|
||||||
@ -462,7 +462,7 @@ show tables;
|
|||||||
create database test2;
|
create database test2;
|
||||||
use test2;
|
use test2;
|
||||||
show tables;
|
show tables;
|
||||||
--error 1146
|
--error ER_NO_SUCH_TABLE
|
||||||
select * from t1;
|
select * from t1;
|
||||||
create table t2 (b int,c longblob) engine=ndb;
|
create table t2 (b int,c longblob) engine=ndb;
|
||||||
use test;
|
use test;
|
||||||
@ -487,7 +487,7 @@ create table t1 (a int primary key) engine=ndb;
|
|||||||
select * from t1;
|
select * from t1;
|
||||||
--exec $NDB_MGM --no-defaults -e "all restart -n" > /dev/null
|
--exec $NDB_MGM --no-defaults -e "all restart -n" > /dev/null
|
||||||
--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults --not-started > /dev/null
|
--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults --not-started > /dev/null
|
||||||
--error 1015
|
--error ER_CANT_LOCK
|
||||||
select * from t1;
|
select * from t1;
|
||||||
--exec $NDB_MGM --no-defaults -e "all start" > /dev/null
|
--exec $NDB_MGM --no-defaults -e "all start" > /dev/null
|
||||||
--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults > /dev/null
|
--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults > /dev/null
|
||||||
@ -503,17 +503,17 @@ drop database test_only_ndb_tables;
|
|||||||
# discovered( for example a table created via NDBAPI)
|
# discovered( for example a table created via NDBAPI)
|
||||||
|
|
||||||
# Test disabled since it doesn't work on case insensitive systems
|
# Test disabled since it doesn't work on case insensitive systems
|
||||||
#--error 1050
|
#--error ER_TABLE_EXISTS_ERROR
|
||||||
#CREATE TABLE sys.SYSTAB_0 (a int);
|
#CREATE TABLE sys.SYSTAB_0 (a int);
|
||||||
#--error 1105
|
#--error ER_UNKNOWN_ERROR
|
||||||
#select * from sys.SYSTAB_0;
|
#select * from sys.SYSTAB_0;
|
||||||
|
|
||||||
#CREATE TABLE IF NOT EXISTS sys.SYSTAB_0 (a int);
|
#CREATE TABLE IF NOT EXISTS sys.SYSTAB_0 (a int);
|
||||||
#show warnings;
|
#show warnings;
|
||||||
#--error 1105
|
#--error ER_UNKNOWN_ERROR
|
||||||
#select * from sys.SYSTAB_0;
|
#select * from sys.SYSTAB_0;
|
||||||
|
|
||||||
#--error 1051
|
#--error ER_BAD_TABLE_ERROR
|
||||||
#drop table sys.SYSTAB_0;
|
#drop table sys.SYSTAB_0;
|
||||||
#drop table IF EXISTS sys.SYSTAB_0;
|
#drop table IF EXISTS sys.SYSTAB_0;
|
||||||
|
|
||||||
@ -531,7 +531,7 @@ CREATE TABLE t9 (
|
|||||||
insert t9 values(1, 2), (2,3), (3, 4), (4, 5);
|
insert t9 values(1, 2), (2,3), (3, 4), (4, 5);
|
||||||
|
|
||||||
#Don't drop the table, instead remove the frm file
|
#Don't drop the table, instead remove the frm file
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/test/t9.frm ;
|
remove_file $MYSQLTEST_VARDIR/master-data/test/t9.frm ;
|
||||||
|
|
||||||
# Now leave test case, when ndb_autodiscover2 will run, this
|
# Now leave test case, when ndb_autodiscover2 will run, this
|
||||||
# MySQL Server will have been restarted because it has a
|
# MySQL Server will have been restarted because it has a
|
||||||
|
@ -25,7 +25,7 @@ create table t1(a int) engine=ndb;
|
|||||||
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
eval load data local infile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;
|
eval load data local infile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;
|
||||||
select count(*) from t1;
|
select count(*) from t1;
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile ;
|
remove_file $MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile ;
|
||||||
drop table t1;
|
drop table t1;
|
||||||
|
|
||||||
create table t1(a int) engine=myisam;
|
create table t1(a int) engine=myisam;
|
||||||
@ -37,7 +37,7 @@ drop table t1;
|
|||||||
create table t1(a int primary key) engine=ndb;
|
create table t1(a int primary key) engine=ndb;
|
||||||
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
eval load data local infile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;
|
eval load data local infile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile;
|
remove_file $MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile;
|
||||||
select * from t1 order by a;
|
select * from t1 order by a;
|
||||||
drop table t1;
|
drop table t1;
|
||||||
|
|
||||||
@ -50,7 +50,7 @@ drop table t1;
|
|||||||
create table t1(a int primary key) engine=ndb;
|
create table t1(a int primary key) engine=ndb;
|
||||||
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
eval load data local infile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;
|
eval load data local infile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile;
|
remove_file $MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile;
|
||||||
select * from t1 order by a;
|
select * from t1 order by a;
|
||||||
drop table t1;
|
drop table t1;
|
||||||
|
|
||||||
@ -63,7 +63,7 @@ drop table t1;
|
|||||||
create table t1(a int primary key) engine=ndb;
|
create table t1(a int primary key) engine=ndb;
|
||||||
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
eval load data local infile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;
|
eval load data local infile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile;
|
remove_file $MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile;
|
||||||
select * from t1 order by a;
|
select * from t1 order by a;
|
||||||
drop table t1;
|
drop table t1;
|
||||||
|
|
||||||
|
@ -134,10 +134,14 @@ insert into t4 values (1,31),(2,32),(3,33),(4,34),(5,35);
|
|||||||
--let ndb_restore_filter=test t1
|
--let ndb_restore_filter=test t1
|
||||||
--source include/ndb_backup_print.inc
|
--source include/ndb_backup_print.inc
|
||||||
|
|
||||||
--exec rm -f $MYSQLTEST_VARDIR/tmp/t1.txt
|
--error 0,1
|
||||||
--exec rm -f $MYSQLTEST_VARDIR/tmp/t2.txt
|
--remove_file $MYSQLTEST_VARDIR/tmp/t1.txt
|
||||||
--exec rm -f $MYSQLTEST_VARDIR/tmp/t3.txt
|
--error 0,1
|
||||||
--exec rm -f $MYSQLTEST_VARDIR/tmp/t4.txt
|
--remove_file $MYSQLTEST_VARDIR/tmp/t2.txt
|
||||||
|
--error 0,1
|
||||||
|
--remove_file $MYSQLTEST_VARDIR/tmp/t3.txt
|
||||||
|
--error 0,1
|
||||||
|
--remove_file $MYSQLTEST_VARDIR/tmp/t4.txt
|
||||||
|
|
||||||
--let ndb_restore_opts=--verbose=0 --print_data --hex --tab $MYSQLTEST_VARDIR/tmp --append
|
--let ndb_restore_opts=--verbose=0 --print_data --hex --tab $MYSQLTEST_VARDIR/tmp --append
|
||||||
--let ndb_restore_filter=test
|
--let ndb_restore_filter=test
|
||||||
@ -156,10 +160,10 @@ insert into t4 values (1,31),(2,32),(3,33),(4,34),(5,35);
|
|||||||
--source include/show_msg.inc
|
--source include/show_msg.inc
|
||||||
--exec sort $MYSQLTEST_VARDIR/tmp/t4.txt
|
--exec sort $MYSQLTEST_VARDIR/tmp/t4.txt
|
||||||
|
|
||||||
--exec rm -f $MYSQLTEST_VARDIR/tmp/t1.txt
|
--remove_file $MYSQLTEST_VARDIR/tmp/t1.txt
|
||||||
--exec rm -f $MYSQLTEST_VARDIR/tmp/t2.txt
|
--remove_file $MYSQLTEST_VARDIR/tmp/t2.txt
|
||||||
--exec rm -f $MYSQLTEST_VARDIR/tmp/t3.txt
|
--remove_file $MYSQLTEST_VARDIR/tmp/t3.txt
|
||||||
--exec rm -f $MYSQLTEST_VARDIR/tmp/t4.txt
|
--remove_file $MYSQLTEST_VARDIR/tmp/t4.txt
|
||||||
|
|
||||||
# now test some other datatypes
|
# now test some other datatypes
|
||||||
drop table t1;
|
drop table t1;
|
||||||
|
@ -31,13 +31,13 @@ select load_file(concat(@tmpdir,"/outfile-test.3"));
|
|||||||
# the following should give errors
|
# the following should give errors
|
||||||
|
|
||||||
disable_query_log;
|
disable_query_log;
|
||||||
--error 1086
|
--error ER_FILE_EXISTS_ERROR
|
||||||
eval select * into outfile "../tmp/outfile-test.1" from t1;
|
eval select * into outfile "../tmp/outfile-test.1" from t1;
|
||||||
|
|
||||||
--error 1086
|
--error ER_FILE_EXISTS_ERROR
|
||||||
eval select * into dumpfile "../tmp/outfile-test.2" from t1;
|
eval select * into dumpfile "../tmp/outfile-test.2" from t1;
|
||||||
|
|
||||||
--error 1086
|
--error ER_FILE_EXISTS_ERROR
|
||||||
eval select * into dumpfile "../tmp/outfile-test.3" from t1;
|
eval select * into dumpfile "../tmp/outfile-test.3" from t1;
|
||||||
enable_query_log;
|
enable_query_log;
|
||||||
select load_file(concat(@tmpdir,"/outfile-test.not-exist"));
|
select load_file(concat(@tmpdir,"/outfile-test.not-exist"));
|
||||||
@ -92,7 +92,7 @@ use test;
|
|||||||
# It should not be possible to write to a file outside of vardir
|
# It should not be possible to write to a file outside of vardir
|
||||||
create table t1(a int);
|
create table t1(a int);
|
||||||
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
|
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
|
||||||
--error 1290
|
--error ER_OPTION_PREVENTS_STATEMENT
|
||||||
eval select * into outfile "$MYSQL_TEST_DIR/outfile-test1" from t1;
|
eval select * into outfile "$MYSQL_TEST_DIR/outfile-test1" from t1;
|
||||||
drop table t1;
|
drop table t1;
|
||||||
|
|
||||||
@ -105,7 +105,7 @@ create user user_1@localhost;
|
|||||||
grant all on mysqltest.* to user_1@localhost;
|
grant all on mysqltest.* to user_1@localhost;
|
||||||
connect (con28181_1,localhost,user_1,,mysqltest);
|
connect (con28181_1,localhost,user_1,,mysqltest);
|
||||||
|
|
||||||
--error 1044
|
--error ER_DBACCESS_DENIED_ERROR
|
||||||
eval select schema_name
|
eval select schema_name
|
||||||
into outfile "../tmp/outfile-test.4"
|
into outfile "../tmp/outfile-test.4"
|
||||||
fields terminated by ',' optionally enclosed by '"'
|
fields terminated by ',' optionally enclosed by '"'
|
||||||
@ -125,7 +125,7 @@ from information_schema.schemata
|
|||||||
where schema_name like 'mysqltest';
|
where schema_name like 'mysqltest';
|
||||||
|
|
||||||
connection default;
|
connection default;
|
||||||
--exec rm $MYSQLTEST_VARDIR/tmp/outfile-test.4
|
--remove_file $MYSQLTEST_VARDIR/tmp/outfile-test.4
|
||||||
use test;
|
use test;
|
||||||
revoke all privileges on *.* from user_1@localhost;
|
revoke all privileges on *.* from user_1@localhost;
|
||||||
drop user user_1@localhost;
|
drop user user_1@localhost;
|
||||||
|
@ -6,9 +6,11 @@
|
|||||||
|
|
||||||
source include/master-slave.inc;
|
source include/master-slave.inc;
|
||||||
|
|
||||||
|
|
||||||
create table t1 (a int) engine=myisam;
|
create table t1 (a int) engine=myisam;
|
||||||
flush tables;
|
flush tables;
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/test/t1.MYI ;
|
--remove_file $MYSQLTEST_VARDIR/master-data/test/t1.MYI
|
||||||
|
|
||||||
drop table if exists t1;
|
drop table if exists t1;
|
||||||
save_master_pos;
|
save_master_pos;
|
||||||
connection slave;
|
connection slave;
|
||||||
@ -22,7 +24,7 @@ set sql_log_bin=0;
|
|||||||
insert into t1 values(2);
|
insert into t1 values(2);
|
||||||
set sql_log_bin=1;
|
set sql_log_bin=1;
|
||||||
save_master_pos;
|
save_master_pos;
|
||||||
--error 1062
|
--error ER_DUP_ENTRY
|
||||||
insert into t1 values(1),(2);
|
insert into t1 values(1),(2);
|
||||||
drop table t1;
|
drop table t1;
|
||||||
save_master_pos;
|
save_master_pos;
|
||||||
|
@ -25,7 +25,7 @@ eval select * into outfile '$MYSQLTEST_VARDIR/master-data/rpl_loaddatalocal.sele
|
|||||||
truncate table t1;
|
truncate table t1;
|
||||||
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
eval load data local infile '$MYSQLTEST_VARDIR/master-data/rpl_loaddatalocal.select_outfile' into table t1;
|
eval load data local infile '$MYSQLTEST_VARDIR/master-data/rpl_loaddatalocal.select_outfile' into table t1;
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/rpl_loaddatalocal.select_outfile ;
|
--remove_file $MYSQLTEST_VARDIR/master-data/rpl_loaddatalocal.select_outfile
|
||||||
save_master_pos;
|
save_master_pos;
|
||||||
connection slave;
|
connection slave;
|
||||||
sync_with_master;
|
sync_with_master;
|
||||||
@ -52,7 +52,7 @@ drop table t1;
|
|||||||
create table t1(a int primary key);
|
create table t1(a int primary key);
|
||||||
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
eval load data local infile '$MYSQLTEST_VARDIR/master-data/rpl_loaddatalocal.select_outfile' into table t1;
|
eval load data local infile '$MYSQLTEST_VARDIR/master-data/rpl_loaddatalocal.select_outfile' into table t1;
|
||||||
system rm $MYSQLTEST_VARDIR/master-data/rpl_loaddatalocal.select_outfile ;
|
remove_file $MYSQLTEST_VARDIR/master-data/rpl_loaddatalocal.select_outfile ;
|
||||||
select * from t1;
|
select * from t1;
|
||||||
save_master_pos;
|
save_master_pos;
|
||||||
connection slave;
|
connection slave;
|
||||||
|
@ -2173,6 +2173,14 @@ begin
|
|||||||
end loop;
|
end loop;
|
||||||
end|
|
end|
|
||||||
|
|
||||||
|
CREATE TABLE t1 (a INT)|
|
||||||
|
INSERT INTO t1 VALUES (1),(2)|
|
||||||
|
CREATE PROCEDURE p1(a INT) BEGIN END|
|
||||||
|
--error ER_SUBQUERY_NO_1_ROW
|
||||||
|
CALL p1((SELECT * FROM t1))|
|
||||||
|
DROP PROCEDURE IF EXISTS p1|
|
||||||
|
DROP TABLE t1|
|
||||||
|
|
||||||
delimiter ;|
|
delimiter ;|
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -7818,6 +7818,24 @@ drop function f1;
|
|||||||
drop view v1;
|
drop view v1;
|
||||||
drop table t1;
|
drop table t1;
|
||||||
|
|
||||||
|
#
|
||||||
|
# Bug#38469 invalid memory read and/or crash with utf8 text field, stored procedure, uservar
|
||||||
|
#
|
||||||
|
delimiter $;
|
||||||
|
--disable_warnings
|
||||||
|
drop procedure if exists `p2` $
|
||||||
|
--enable_warnings
|
||||||
|
create procedure `p2`(in `a` text charset utf8)
|
||||||
|
begin
|
||||||
|
declare `pos` int default 1;
|
||||||
|
declare `str` text charset utf8;
|
||||||
|
set `str` := `a`;
|
||||||
|
select substr(`str`, `pos`+ 1 ) into `str`;
|
||||||
|
end $
|
||||||
|
delimiter ;$
|
||||||
|
call `p2`('s s s s s s');
|
||||||
|
drop procedure `p2`;
|
||||||
|
|
||||||
--echo # ------------------------------------------------------------------
|
--echo # ------------------------------------------------------------------
|
||||||
--echo # -- End of 5.0 tests
|
--echo # -- End of 5.0 tests
|
||||||
--echo # ------------------------------------------------------------------
|
--echo # ------------------------------------------------------------------
|
||||||
|
@ -80,7 +80,7 @@ create database mysqltest;
|
|||||||
create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="/this-dir-does-not-exist";
|
create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="/this-dir-does-not-exist";
|
||||||
|
|
||||||
# temporarily disabled as it returns different result in the embedded server
|
# temporarily disabled as it returns different result in the embedded server
|
||||||
# --error 1210, 1210
|
# --error ER_WRONG_ARGUMENTS,ER_WRONG_ARGUMENTS
|
||||||
# create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="not-hard-path";
|
# create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="not-hard-path";
|
||||||
|
|
||||||
# Should fail becasue the file t9.MYI already exist in 'run'
|
# Should fail becasue the file t9.MYI already exist in 'run'
|
||||||
@ -185,7 +185,12 @@ drop table t1;
|
|||||||
#
|
#
|
||||||
# Protect ourselves from data left in tmp/ by a previos possibly failed
|
# Protect ourselves from data left in tmp/ by a previos possibly failed
|
||||||
# test
|
# test
|
||||||
--system rm -f $MYSQLTEST_VARDIR/tmp/t1.*
|
--error 0,1
|
||||||
|
--remove_file $MYSQLTEST_VARDIR/tmp/t1.frm
|
||||||
|
--error 0,1
|
||||||
|
--remove_file $MYSQLTEST_VARDIR/tmp/t1.MYD
|
||||||
|
--error 0,1
|
||||||
|
--remove_file $MYSQLTEST_VARDIR/tmp/t1.MYI
|
||||||
--disable_query_log
|
--disable_query_log
|
||||||
eval prepare stmt from "create table t1 (c char(10)) data directory='$MYSQLTEST_VARDIR/tmp'";
|
eval prepare stmt from "create table t1 (c char(10)) data directory='$MYSQLTEST_VARDIR/tmp'";
|
||||||
--enable_query_log
|
--enable_query_log
|
||||||
@ -203,19 +208,19 @@ deallocate prepare stmt;
|
|||||||
# Bug#32167 another privilege bypass with DATA/INDEX DIRECORY
|
# Bug#32167 another privilege bypass with DATA/INDEX DIRECORY
|
||||||
#
|
#
|
||||||
--replace_result $MYSQL_TEST_DIR TEST_DIR
|
--replace_result $MYSQL_TEST_DIR TEST_DIR
|
||||||
--error 1,1210
|
--error 1,ER_WRONG_ARGUMENTS
|
||||||
eval CREATE TABLE t1(a INT)
|
eval CREATE TABLE t1(a INT)
|
||||||
DATA DIRECTORY='$MYSQL_TEST_DIR/var/master-data/test';
|
DATA DIRECTORY='$MYSQL_TEST_DIR/var/master-data/test';
|
||||||
--replace_result $MYSQL_TEST_DIR TEST_DIR
|
--replace_result $MYSQL_TEST_DIR TEST_DIR
|
||||||
--error 1,1210
|
--error 1,ER_WRONG_ARGUMENTS
|
||||||
eval CREATE TABLE t1(a INT)
|
eval CREATE TABLE t1(a INT)
|
||||||
DATA DIRECTORY='$MYSQL_TEST_DIR/var/master-data/';
|
DATA DIRECTORY='$MYSQL_TEST_DIR/var/master-data/';
|
||||||
--replace_result $MYSQL_TEST_DIR TEST_DIR
|
--replace_result $MYSQL_TEST_DIR TEST_DIR
|
||||||
--error 1,1210
|
--error 1,ER_WRONG_ARGUMENTS
|
||||||
eval CREATE TABLE t1(a INT)
|
eval CREATE TABLE t1(a INT)
|
||||||
INDEX DIRECTORY='$MYSQL_TEST_DIR/var/master-data';
|
INDEX DIRECTORY='$MYSQL_TEST_DIR/var/master-data';
|
||||||
--replace_result $MYSQL_TEST_DIR TEST_DIR
|
--replace_result $MYSQL_TEST_DIR TEST_DIR
|
||||||
--error 1,1210
|
--error 1,ER_WRONG_ARGUMENTS
|
||||||
eval CREATE TABLE t1(a INT)
|
eval CREATE TABLE t1(a INT)
|
||||||
INDEX DIRECTORY='$MYSQL_TEST_DIR/var/master-data_var';
|
INDEX DIRECTORY='$MYSQL_TEST_DIR/var/master-data_var';
|
||||||
|
|
||||||
|
@ -272,6 +272,8 @@ if [ $BASE_SYSTEM != "netware" ] ; then
|
|||||||
if [ -d man ] ; then
|
if [ -d man ] ; then
|
||||||
$CP man/*.1 $BASE/man/man1
|
$CP man/*.1 $BASE/man/man1
|
||||||
$CP man/*.8 $BASE/man/man8
|
$CP man/*.8 $BASE/man/man8
|
||||||
|
# In a Unix binary package, these tools and their manuals are not useful
|
||||||
|
rm -f $BASE/man/man1/make_win_*
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -331,6 +333,7 @@ fi
|
|||||||
|
|
||||||
rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh \
|
rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh \
|
||||||
$BASE/bin/mysql_install_db $BASE/bin/make_binary_distribution \
|
$BASE/bin/mysql_install_db $BASE/bin/make_binary_distribution \
|
||||||
|
$BASE/bin/make_win_* \
|
||||||
$BASE/bin/setsomevars $BASE/support-files/Makefile* \
|
$BASE/bin/setsomevars $BASE/support-files/Makefile* \
|
||||||
$BASE/support-files/*.sh
|
$BASE/support-files/*.sh
|
||||||
|
|
||||||
|
12
sql/field.cc
12
sql/field.cc
@ -6992,8 +6992,18 @@ int Field_blob::store(const char *from,uint length,CHARSET_INFO *cs)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (from == value.ptr())
|
/*
|
||||||
|
If the 'from' address is in the range of the temporary 'value'-
|
||||||
|
object we need to copy the content to a different location or it will be
|
||||||
|
invalidated when the 'value'-object is reallocated to make room for
|
||||||
|
the new character set.
|
||||||
|
*/
|
||||||
|
if (from >= value.ptr() && from <= value.ptr()+value.length())
|
||||||
{
|
{
|
||||||
|
/*
|
||||||
|
If content of the 'from'-address is cached in the 'value'-object
|
||||||
|
it is possible that the content needs a character conversion.
|
||||||
|
*/
|
||||||
uint32 dummy_offset;
|
uint32 dummy_offset;
|
||||||
if (!String::needs_conversion(length, cs, field_charset, &dummy_offset))
|
if (!String::needs_conversion(length, cs, field_charset, &dummy_offset))
|
||||||
{
|
{
|
||||||
|
10
sql/field.h
10
sql/field.h
@ -1213,8 +1213,16 @@ public:
|
|||||||
|
|
||||||
class Field_blob :public Field_longstr {
|
class Field_blob :public Field_longstr {
|
||||||
protected:
|
protected:
|
||||||
|
/**
|
||||||
|
The number of bytes used to represent the length of the blob.
|
||||||
|
*/
|
||||||
uint packlength;
|
uint packlength;
|
||||||
String value; // For temporaries
|
|
||||||
|
/**
|
||||||
|
The 'value'-object is a cache fronting the storage engine.
|
||||||
|
*/
|
||||||
|
String value;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Field_blob(char *ptr_arg, uchar *null_ptr_arg, uchar null_bit_arg,
|
Field_blob(char *ptr_arg, uchar *null_ptr_arg, uchar null_bit_arg,
|
||||||
enum utype unireg_check_arg, const char *field_name_arg,
|
enum utype unireg_check_arg, const char *field_name_arg,
|
||||||
|
@ -21,6 +21,9 @@
|
|||||||
#include <my_sys.h>
|
#include <my_sys.h>
|
||||||
#include <my_dir.h>
|
#include <my_dir.h>
|
||||||
|
|
||||||
|
/* from sql_db.cc */
|
||||||
|
extern long mysql_rm_arc_files(THD *thd, MY_DIR *dirp, const char *org_path);
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
write string with escaping
|
write string with escaping
|
||||||
@ -265,8 +268,9 @@ sql_create_definition_file(const LEX_STRING *dir, const LEX_STRING *file_name,
|
|||||||
DBUG_RETURN(TRUE);
|
DBUG_RETURN(TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
// archive copies management
|
|
||||||
path[path_end]='\0';
|
path[path_end]='\0';
|
||||||
|
#ifdef FRM_ARCHIVE
|
||||||
|
// archive copies management: disabled unused feature (see bug #17823).
|
||||||
if (!access(path, F_OK))
|
if (!access(path, F_OK))
|
||||||
{
|
{
|
||||||
if (old_version != ULONGLONG_MAX && max_versions != 0)
|
if (old_version != ULONGLONG_MAX && max_versions != 0)
|
||||||
@ -313,6 +317,7 @@ sql_create_definition_file(const LEX_STRING *dir, const LEX_STRING *file_name,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif//FRM_ARCHIVE
|
||||||
|
|
||||||
{
|
{
|
||||||
// rename temporary file
|
// rename temporary file
|
||||||
@ -337,6 +342,7 @@ err_w_file:
|
|||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
rename_in_schema_file
|
rename_in_schema_file
|
||||||
|
thd thread handler
|
||||||
schema name of given schema
|
schema name of given schema
|
||||||
old_name original file name
|
old_name original file name
|
||||||
new_name new file name
|
new_name new file name
|
||||||
@ -348,7 +354,8 @@ err_w_file:
|
|||||||
1 - Error (only if renaming of frm failed)
|
1 - Error (only if renaming of frm failed)
|
||||||
|
|
||||||
*/
|
*/
|
||||||
my_bool rename_in_schema_file(const char *schema, const char *old_name,
|
my_bool rename_in_schema_file(THD *thd,
|
||||||
|
const char *schema, const char *old_name,
|
||||||
const char *new_name, ulonglong revision,
|
const char *new_name, ulonglong revision,
|
||||||
uint num_view_backups)
|
uint num_view_backups)
|
||||||
{
|
{
|
||||||
@ -365,10 +372,11 @@ my_bool rename_in_schema_file(const char *schema, const char *old_name,
|
|||||||
if (my_rename(old_path, new_path, MYF(MY_WME)))
|
if (my_rename(old_path, new_path, MYF(MY_WME)))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
/* check if arc_dir exists */
|
/* check if arc_dir exists: disabled unused feature (see bug #17823). */
|
||||||
strxnmov(arc_path, FN_REFLEN, mysql_data_home, "/", schema, "/arc", NullS);
|
strxnmov(arc_path, FN_REFLEN, mysql_data_home, "/", schema, "/arc", NullS);
|
||||||
(void) unpack_filename(arc_path, arc_path);
|
(void) unpack_filename(arc_path, arc_path);
|
||||||
|
|
||||||
|
#ifdef FRM_ARCHIVE
|
||||||
if (revision > 0 && !access(arc_path, F_OK))
|
if (revision > 0 && !access(arc_path, F_OK))
|
||||||
{
|
{
|
||||||
ulonglong limit= ((revision > num_view_backups) ?
|
ulonglong limit= ((revision > num_view_backups) ?
|
||||||
@ -384,6 +392,16 @@ my_bool rename_in_schema_file(const char *schema, const char *old_name,
|
|||||||
my_rename(old_path, new_path, MYF(0));
|
my_rename(old_path, new_path, MYF(0));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#else//FRM_ARCHIVE
|
||||||
|
{ // remove obsolete 'arc' directory and files if any
|
||||||
|
MY_DIR *new_dirp;
|
||||||
|
if ((new_dirp = my_dir(arc_path, MYF(MY_DONT_SORT))))
|
||||||
|
{
|
||||||
|
DBUG_PRINT("my",("Archive subdir found: %s", arc_path));
|
||||||
|
(void) mysql_rm_arc_files(thd, new_dirp, arc_path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif//FRM_ARCHIVE
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -82,7 +82,8 @@ my_bool
|
|||||||
sql_create_definition_file(const LEX_STRING *dir, const LEX_STRING *file_name,
|
sql_create_definition_file(const LEX_STRING *dir, const LEX_STRING *file_name,
|
||||||
const LEX_STRING *type,
|
const LEX_STRING *type,
|
||||||
gptr base, File_option *parameters, uint versions);
|
gptr base, File_option *parameters, uint versions);
|
||||||
my_bool rename_in_schema_file(const char *schema, const char *old_name,
|
my_bool rename_in_schema_file(THD *thd,
|
||||||
|
const char *schema, const char *old_name,
|
||||||
const char *new_name, ulonglong revision,
|
const char *new_name, ulonglong revision,
|
||||||
uint num_view_backups);
|
uint num_view_backups);
|
||||||
|
|
||||||
|
@ -1765,7 +1765,11 @@ sp_head::execute_procedure(THD *thd, List<Item> *args)
|
|||||||
we'll leave it here.
|
we'll leave it here.
|
||||||
*/
|
*/
|
||||||
if (!thd->in_sub_stmt)
|
if (!thd->in_sub_stmt)
|
||||||
close_thread_tables(thd, 0, 0);
|
{
|
||||||
|
thd->lex->unit.cleanup();
|
||||||
|
close_thread_tables(thd);
|
||||||
|
thd->rollback_item_tree_changes();
|
||||||
|
}
|
||||||
|
|
||||||
DBUG_PRINT("info",(" %.*s: eval args done", m_name.length, m_name.str));
|
DBUG_PRINT("info",(" %.*s: eval args done", m_name.length, m_name.str));
|
||||||
}
|
}
|
||||||
|
@ -974,6 +974,12 @@ sql_exchange::sql_exchange(char *name,bool flag)
|
|||||||
cs= NULL;
|
cs= NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool sql_exchange::escaped_given(void)
|
||||||
|
{
|
||||||
|
return escaped != &default_escaped;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool select_send::send_fields(List<Item> &list, uint flags)
|
bool select_send::send_fields(List<Item> &list, uint flags)
|
||||||
{
|
{
|
||||||
bool res;
|
bool res;
|
||||||
@ -1234,8 +1240,11 @@ select_export::prepare(List<Item> &list, SELECT_LEX_UNIT *u)
|
|||||||
exchange->line_term=exchange->field_term; // Use this if it exists
|
exchange->line_term=exchange->field_term; // Use this if it exists
|
||||||
field_sep_char= (exchange->enclosed->length() ?
|
field_sep_char= (exchange->enclosed->length() ?
|
||||||
(int) (uchar) (*exchange->enclosed)[0] : field_term_char);
|
(int) (uchar) (*exchange->enclosed)[0] : field_term_char);
|
||||||
escape_char= (exchange->escaped->length() ?
|
if (exchange->escaped->length() && (exchange->escaped_given() ||
|
||||||
(int) (uchar) (*exchange->escaped)[0] : -1);
|
!(thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES)))
|
||||||
|
escape_char= (int) (uchar) (*exchange->escaped)[0];
|
||||||
|
else
|
||||||
|
escape_char= -1;
|
||||||
is_ambiguous_field_sep= test(strchr(ESCAPE_CHARS, field_sep_char));
|
is_ambiguous_field_sep= test(strchr(ESCAPE_CHARS, field_sep_char));
|
||||||
is_unsafe_field_sep= test(strchr(NUMERIC_CHARS, field_sep_char));
|
is_unsafe_field_sep= test(strchr(NUMERIC_CHARS, field_sep_char));
|
||||||
line_sep_char= (exchange->line_term->length() ?
|
line_sep_char= (exchange->line_term->length() ?
|
||||||
|
@ -1896,6 +1896,7 @@ public:
|
|||||||
ulong skip_lines;
|
ulong skip_lines;
|
||||||
CHARSET_INFO *cs;
|
CHARSET_INFO *cs;
|
||||||
sql_exchange(char *name,bool dumpfile_flag);
|
sql_exchange(char *name,bool dumpfile_flag);
|
||||||
|
bool escaped_given(void);
|
||||||
};
|
};
|
||||||
|
|
||||||
#include "log_event.h"
|
#include "log_event.h"
|
||||||
|
@ -35,7 +35,7 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp,
|
|||||||
const char *db, const char *path, uint level,
|
const char *db, const char *path, uint level,
|
||||||
TABLE_LIST **dropped_tables);
|
TABLE_LIST **dropped_tables);
|
||||||
|
|
||||||
static long mysql_rm_arc_files(THD *thd, MY_DIR *dirp, const char *org_path);
|
long mysql_rm_arc_files(THD *thd, MY_DIR *dirp, const char *org_path);
|
||||||
static my_bool rm_dir_w_symlink(const char *org_path, my_bool send_error);
|
static my_bool rm_dir_w_symlink(const char *org_path, my_bool send_error);
|
||||||
/* Database options hash */
|
/* Database options hash */
|
||||||
static HASH dboptions;
|
static HASH dboptions;
|
||||||
@ -906,7 +906,11 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
|
|||||||
else if (file->name[0] == 'a' && file->name[1] == 'r' &&
|
else if (file->name[0] == 'a' && file->name[1] == 'r' &&
|
||||||
file->name[2] == 'c' && file->name[3] == '\0')
|
file->name[2] == 'c' && file->name[3] == '\0')
|
||||||
{
|
{
|
||||||
/* .frm archive */
|
/* .frm archive:
|
||||||
|
Those archives are obsolete, but following code should
|
||||||
|
exist to remove existent "arc" directories.
|
||||||
|
See #ifdef FRM_ARCHIVE directives for obsolete code.
|
||||||
|
*/
|
||||||
char newpath[FN_REFLEN];
|
char newpath[FN_REFLEN];
|
||||||
MY_DIR *new_dirp;
|
MY_DIR *new_dirp;
|
||||||
strxmov(newpath, org_path, "/", "arc", NullS);
|
strxmov(newpath, org_path, "/", "arc", NullS);
|
||||||
@ -1061,9 +1065,13 @@ static my_bool rm_dir_w_symlink(const char *org_path, my_bool send_error)
|
|||||||
RETURN
|
RETURN
|
||||||
> 0 number of removed files
|
> 0 number of removed files
|
||||||
-1 error
|
-1 error
|
||||||
|
|
||||||
|
NOTE
|
||||||
|
A support of "arc" directories is obsolete, however this
|
||||||
|
function should exist to remove existent "arc" directories.
|
||||||
|
See #ifdef FRM_ARCHIVE directives for obsolete code.
|
||||||
*/
|
*/
|
||||||
static long mysql_rm_arc_files(THD *thd, MY_DIR *dirp,
|
long mysql_rm_arc_files(THD *thd, MY_DIR *dirp, const char *org_path)
|
||||||
const char *org_path)
|
|
||||||
{
|
{
|
||||||
long deleted= 0;
|
long deleted= 0;
|
||||||
ulong found_other_files= 0;
|
ulong found_other_files= 0;
|
||||||
@ -1105,6 +1113,7 @@ static long mysql_rm_arc_files(THD *thd, MY_DIR *dirp,
|
|||||||
{
|
{
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
|
deleted++;
|
||||||
}
|
}
|
||||||
if (thd->killed)
|
if (thd->killed)
|
||||||
goto err;
|
goto err;
|
||||||
|
@ -325,7 +325,9 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
|
|||||||
bzero((char*) &info,sizeof(info));
|
bzero((char*) &info,sizeof(info));
|
||||||
info.ignore= ignore;
|
info.ignore= ignore;
|
||||||
info.handle_duplicates=handle_duplicates;
|
info.handle_duplicates=handle_duplicates;
|
||||||
info.escape_char=escaped->length() ? (*escaped)[0] : INT_MAX;
|
info.escape_char= (escaped->length() && (ex->escaped_given() ||
|
||||||
|
!(thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES)))
|
||||||
|
? (*escaped)[0] : INT_MAX;
|
||||||
|
|
||||||
READ_INFO read_info(file,tot_length,
|
READ_INFO read_info(file,tot_length,
|
||||||
ex->cs ? ex->cs : thd->variables.collation_database,
|
ex->cs ? ex->cs : thd->variables.collation_database,
|
||||||
|
@ -1858,7 +1858,7 @@ mysql_rename_view(THD *thd,
|
|||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
/* rename view and it's backups */
|
/* rename view and it's backups */
|
||||||
if (rename_in_schema_file(view->db, view->table_name, new_name,
|
if (rename_in_schema_file(thd, view->db, view->table_name, new_name,
|
||||||
view_def.revision - 1, num_view_backups))
|
view_def.revision - 1, num_view_backups))
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
@ -1877,7 +1877,7 @@ mysql_rename_view(THD *thd,
|
|||||||
num_view_backups))
|
num_view_backups))
|
||||||
{
|
{
|
||||||
/* restore renamed view in case of error */
|
/* restore renamed view in case of error */
|
||||||
rename_in_schema_file(view->db, new_name, view->table_name,
|
rename_in_schema_file(thd, view->db, new_name, view->table_name,
|
||||||
view_def.revision - 1, num_view_backups);
|
view_def.revision - 1, num_view_backups);
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
|
@ -261,6 +261,7 @@ void write_core(int sig)
|
|||||||
#else /* __WIN__*/
|
#else /* __WIN__*/
|
||||||
|
|
||||||
#include <dbghelp.h>
|
#include <dbghelp.h>
|
||||||
|
#include <tlhelp32.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Stack tracing on Windows is implemented using Debug Helper library(dbghelp.dll)
|
Stack tracing on Windows is implemented using Debug Helper library(dbghelp.dll)
|
||||||
@ -349,6 +350,68 @@ void set_exception_pointers(EXCEPTION_POINTERS *ep)
|
|||||||
exception_ptrs = ep;
|
exception_ptrs = ep;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
Get symbol path - semicolon-separated list of directories to search for debug
|
||||||
|
symbols. We expect PDB in the same directory as corresponding exe or dll,
|
||||||
|
so the path is build from directories of the loaded modules. If environment
|
||||||
|
variable _NT_SYMBOL_PATH is set, it's value appended to the symbol search path
|
||||||
|
*/
|
||||||
|
static void get_symbol_path(char *path, size_t size)
|
||||||
|
{
|
||||||
|
HANDLE hSnap;
|
||||||
|
char *envvar;
|
||||||
|
|
||||||
|
path[0]= '\0';
|
||||||
|
/*
|
||||||
|
Enumerate all modules, and add their directories to the path.
|
||||||
|
Avoid duplicate entries.
|
||||||
|
*/
|
||||||
|
hSnap= CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, GetCurrentProcessId());
|
||||||
|
if (hSnap != INVALID_HANDLE_VALUE)
|
||||||
|
{
|
||||||
|
BOOL ret;
|
||||||
|
MODULEENTRY32 mod;
|
||||||
|
mod.dwSize= sizeof(MODULEENTRY32);
|
||||||
|
for (ret= Module32First(hSnap, &mod); ret; ret= Module32Next(hSnap, &mod))
|
||||||
|
{
|
||||||
|
char *module_dir= mod.szExePath;
|
||||||
|
char *p= strrchr(module_dir,'\\');
|
||||||
|
if (!p)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
Path separator was not found. Not known to happen, if ever happens,
|
||||||
|
will indicate current directory.
|
||||||
|
*/
|
||||||
|
module_dir[0]= '.';
|
||||||
|
p= module_dir + 1;
|
||||||
|
}
|
||||||
|
*p++= ';';
|
||||||
|
*p= '\0';
|
||||||
|
|
||||||
|
if (!strstr(path, module_dir))
|
||||||
|
{
|
||||||
|
size_t dir_len = strlen(module_dir);
|
||||||
|
if (size > dir_len)
|
||||||
|
{
|
||||||
|
strncat(path, module_dir, size-1);
|
||||||
|
size -= dir_len;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
CloseHandle(hSnap);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Add _NT_SYMBOL_PATH, if present. */
|
||||||
|
envvar= getenv("_NT_SYMBOL_PATH");
|
||||||
|
if(envvar && size)
|
||||||
|
{
|
||||||
|
strncat(path, envvar, size-1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#define MAX_SYMBOL_PATH 32768
|
||||||
|
|
||||||
/* Platform SDK in VS2003 does not have definition for SYMOPT_NO_PROMPTS*/
|
/* Platform SDK in VS2003 does not have definition for SYMOPT_NO_PROMPTS*/
|
||||||
#ifndef SYMOPT_NO_PROMPTS
|
#ifndef SYMOPT_NO_PROMPTS
|
||||||
#define SYMOPT_NO_PROMPTS 0
|
#define SYMOPT_NO_PROMPTS 0
|
||||||
@ -365,6 +428,7 @@ void print_stacktrace(gptr unused1, ulong unused2)
|
|||||||
int i;
|
int i;
|
||||||
CONTEXT context;
|
CONTEXT context;
|
||||||
STACKFRAME64 frame={0};
|
STACKFRAME64 frame={0};
|
||||||
|
static char symbol_path[MAX_SYMBOL_PATH];
|
||||||
|
|
||||||
if(!exception_ptrs || !init_dbghelp_functions())
|
if(!exception_ptrs || !init_dbghelp_functions())
|
||||||
return;
|
return;
|
||||||
@ -373,7 +437,8 @@ void print_stacktrace(gptr unused1, ulong unused2)
|
|||||||
context = *(exception_ptrs->ContextRecord);
|
context = *(exception_ptrs->ContextRecord);
|
||||||
/*Initialize symbols.*/
|
/*Initialize symbols.*/
|
||||||
pSymSetOptions(SYMOPT_LOAD_LINES|SYMOPT_NO_PROMPTS|SYMOPT_DEFERRED_LOADS|SYMOPT_DEBUG);
|
pSymSetOptions(SYMOPT_LOAD_LINES|SYMOPT_NO_PROMPTS|SYMOPT_DEFERRED_LOADS|SYMOPT_DEBUG);
|
||||||
pSymInitialize(hProcess,NULL,TRUE);
|
get_symbol_path(symbol_path, sizeof(symbol_path));
|
||||||
|
pSymInitialize(hProcess, symbol_path, TRUE);
|
||||||
|
|
||||||
/*Prepare stackframe for the first StackWalk64 call*/
|
/*Prepare stackframe for the first StackWalk64 call*/
|
||||||
frame.AddrFrame.Mode= frame.AddrPC.Mode= frame.AddrStack.Mode= AddrModeFlat;
|
frame.AddrFrame.Mode= frame.AddrPC.Mode= frame.AddrStack.Mode= AddrModeFlat;
|
||||||
|
@ -591,6 +591,7 @@ fi
|
|||||||
|
|
||||||
%doc %attr(644, root, root) %{_infodir}/mysql.info*
|
%doc %attr(644, root, root) %{_infodir}/mysql.info*
|
||||||
|
|
||||||
|
%doc %attr(644, root, man) %{_mandir}/man1/innochecksum.1*
|
||||||
%doc %attr(644, root, man) %{_mandir}/man1/my_print_defaults.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/my_print_defaults.1*
|
||||||
%doc %attr(644, root, man) %{_mandir}/man1/myisam_ftdump.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/myisam_ftdump.1*
|
||||||
%doc %attr(644, root, man) %{_mandir}/man1/myisamchk.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/myisamchk.1*
|
||||||
@ -610,6 +611,7 @@ fi
|
|||||||
%doc %attr(644, root, man) %{_mandir}/man1/mysqltest.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/mysqltest.1*
|
||||||
%doc %attr(644, root, man) %{_mandir}/man1/mysql_tzinfo_to_sql.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/mysql_tzinfo_to_sql.1*
|
||||||
%doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1*
|
||||||
|
%doc %attr(644, root, man) %{_mandir}/man1/mysqlbug.1*
|
||||||
%doc %attr(644, root, man) %{_mandir}/man1/perror.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/perror.1*
|
||||||
%doc %attr(644, root, man) %{_mandir}/man1/replace.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/replace.1*
|
||||||
%doc %attr(644, root, man) %{_mandir}/man1/safe_mysqld.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/safe_mysqld.1*
|
||||||
@ -617,6 +619,7 @@ fi
|
|||||||
%ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
|
%ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
|
||||||
%ghost %config(noreplace,missingok) %{_sysconfdir}/mysqlmanager.passwd
|
%ghost %config(noreplace,missingok) %{_sysconfdir}/mysqlmanager.passwd
|
||||||
|
|
||||||
|
%attr(755, root, root) %{_bindir}/innochecksum
|
||||||
%attr(755, root, root) %{_bindir}/my_print_defaults
|
%attr(755, root, root) %{_bindir}/my_print_defaults
|
||||||
%attr(755, root, root) %{_bindir}/myisam_ftdump
|
%attr(755, root, root) %{_bindir}/myisam_ftdump
|
||||||
%attr(755, root, root) %{_bindir}/myisamchk
|
%attr(755, root, root) %{_bindir}/myisamchk
|
||||||
@ -661,6 +664,7 @@ fi
|
|||||||
%attr(755, root, root) %{_bindir}/mysql
|
%attr(755, root, root) %{_bindir}/mysql
|
||||||
%attr(755, root, root) %{_bindir}/mysql_find_rows
|
%attr(755, root, root) %{_bindir}/mysql_find_rows
|
||||||
%attr(755, root, root) %{_bindir}/mysql_tableinfo
|
%attr(755, root, root) %{_bindir}/mysql_tableinfo
|
||||||
|
%attr(755, root, root) %{_bindir}/mysql_upgrade_shell
|
||||||
%attr(755, root, root) %{_bindir}/mysql_waitpid
|
%attr(755, root, root) %{_bindir}/mysql_waitpid
|
||||||
%attr(755, root, root) %{_bindir}/mysqlaccess
|
%attr(755, root, root) %{_bindir}/mysqlaccess
|
||||||
%attr(755, root, root) %{_bindir}/mysqladmin
|
%attr(755, root, root) %{_bindir}/mysqladmin
|
||||||
@ -672,6 +676,8 @@ fi
|
|||||||
|
|
||||||
%doc %attr(644, root, man) %{_mandir}/man1/msql2mysql.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/msql2mysql.1*
|
||||||
%doc %attr(644, root, man) %{_mandir}/man1/mysql.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/mysql.1*
|
||||||
|
%doc %attr(644, root, man) %{_mandir}/man1/mysql_find_rows.1*
|
||||||
|
%doc %attr(644, root, man) %{_mandir}/man1/mysql_tableinfo.1*
|
||||||
%doc %attr(644, root, man) %{_mandir}/man1/mysqlaccess.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/mysqlaccess.1*
|
||||||
%doc %attr(644, root, man) %{_mandir}/man1/mysqladmin.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/mysqladmin.1*
|
||||||
%doc %attr(644, root, man) %{_mandir}/man1/mysqlbinlog.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/mysqlbinlog.1*
|
||||||
@ -713,6 +719,8 @@ fi
|
|||||||
%doc %attr(644, root, man) %{_mandir}/man1/ndb_config.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/ndb_config.1*
|
||||||
%doc %attr(644, root, man) %{_mandir}/man1/ndb_desc.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/ndb_desc.1*
|
||||||
%doc %attr(644, root, man) %{_mandir}/man1/ndb_error_reporter.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/ndb_error_reporter.1*
|
||||||
|
%doc %attr(644, root, man) %{_mandir}/man1/ndb_mgm.1*
|
||||||
|
%doc %attr(644, root, man) %{_mandir}/man1/ndb_restore.1*
|
||||||
%doc %attr(644, root, man) %{_mandir}/man1/ndb_select_all.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/ndb_select_all.1*
|
||||||
%doc %attr(644, root, man) %{_mandir}/man1/ndb_select_count.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/ndb_select_count.1*
|
||||||
%doc %attr(644, root, man) %{_mandir}/man1/ndb_show_tables.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/ndb_show_tables.1*
|
||||||
@ -724,13 +732,16 @@ fi
|
|||||||
%attr(755, root, root) %{_bindir}/ndb_delete_all
|
%attr(755, root, root) %{_bindir}/ndb_delete_all
|
||||||
%attr(755, root, root) %{_bindir}/ndb_drop_index
|
%attr(755, root, root) %{_bindir}/ndb_drop_index
|
||||||
%attr(755, root, root) %{_bindir}/ndb_drop_table
|
%attr(755, root, root) %{_bindir}/ndb_drop_table
|
||||||
|
%attr(755, root, root) %{_sbindir}/ndb_cpcd
|
||||||
%doc %attr(644, root, man) %{_mandir}/man1/ndb_delete_all.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/ndb_delete_all.1*
|
||||||
%doc %attr(644, root, man) %{_mandir}/man1/ndb_drop_index.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/ndb_drop_index.1*
|
||||||
%doc %attr(644, root, man) %{_mandir}/man1/ndb_drop_table.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/ndb_drop_table.1*
|
||||||
|
%doc %attr(644, root, man) %{_mandir}/man1/ndb_cpcd.1*
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-, root, root, 0755)
|
%defattr(-, root, root, 0755)
|
||||||
%doc EXCEPTIONS-CLIENT
|
%doc EXCEPTIONS-CLIENT
|
||||||
|
%doc %attr(644, root, man) %{_mandir}/man1/comp_err.1*
|
||||||
%doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1*
|
%doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1*
|
||||||
%attr(755, root, root) %{_bindir}/comp_err
|
%attr(755, root, root) %{_bindir}/comp_err
|
||||||
%attr(755, root, root) %{_bindir}/mysql_config
|
%attr(755, root, root) %{_bindir}/mysql_config
|
||||||
@ -784,6 +795,18 @@ fi
|
|||||||
# itself - note that they must be ordered by date (important when
|
# itself - note that they must be ordered by date (important when
|
||||||
# merging BK trees)
|
# merging BK trees)
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 18 2008 Joerg Bruehe <joerg@mysql.com>
|
||||||
|
|
||||||
|
- Get rid of the "warning: Installed (but unpackaged) file(s) found:"
|
||||||
|
Some files were missing:
|
||||||
|
- Manual "mysqlbug" ("server" subpackage)
|
||||||
|
- Program "innochecksum" and its manual ("server" subpackage)
|
||||||
|
- Manuals "mysql_find_rows" + "mysql_tableinfo" ("client" subpackage)
|
||||||
|
- Script "mysql_upgrade_shell" ("client" subpackage)
|
||||||
|
- Manual "comp_err" ("devel" subpackage)
|
||||||
|
- Program "ndb_cpcd" and its manual ("ndb-extra" subpackage)
|
||||||
|
- Manuals "ndb_mgm" + "ndb_restore" ("ndb-tools" subpackage)
|
||||||
|
|
||||||
* Wed Mar 19 2008 Joerg Bruehe <joerg@mysql.com>
|
* Wed Mar 19 2008 Joerg Bruehe <joerg@mysql.com>
|
||||||
|
|
||||||
- Add the man pages for "ndbd" and "ndb_mgmd".
|
- Add the man pages for "ndbd" and "ndb_mgmd".
|
||||||
|
@ -31,7 +31,17 @@ try
|
|||||||
var end= supp_version.indexOf("-");
|
var end= supp_version.indexOf("-");
|
||||||
if (end == -1) end= supp_version.length;
|
if (end == -1) end= supp_version.length;
|
||||||
var app_version= supp_version.substring(0, end);
|
var app_version= supp_version.substring(0, end);
|
||||||
app_version+= ".0";
|
var fourth_element= 0;
|
||||||
|
if(app_version.match(/[a-z]$/)) {
|
||||||
|
fourth_element+= (1 + app_version.charCodeAt(end-1) - "a".charCodeAt(0));
|
||||||
|
app_version= app_version.substring(0,--end);
|
||||||
|
}
|
||||||
|
if(app_version.match(/sp[1-9]$/)) {
|
||||||
|
fourth_element+= 100*(app_version.charCodeAt(end-1) - "0".charCodeAt(0));
|
||||||
|
app_version= app_version.substring(0, end-3);
|
||||||
|
end-= 3;
|
||||||
|
}
|
||||||
|
app_version+= "." + fourth_element;
|
||||||
break;
|
break;
|
||||||
case "arch":
|
case "arch":
|
||||||
var app_arch= parts[1];
|
var app_arch= parts[1];
|
||||||
|
@ -7,10 +7,10 @@
|
|||||||
|
|
||||||
/* @(#) $Id$ */
|
/* @(#) $Id$ */
|
||||||
|
|
||||||
#include "zutil.h"
|
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
|
#include "zutil.h"
|
||||||
|
|
||||||
#ifdef NO_DEFLATE /* for compatibility with old definition */
|
#ifdef NO_DEFLATE /* for compatibility with old definition */
|
||||||
# define NO_GZCOMPRESS
|
# define NO_GZCOMPRESS
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user