Skip to content

M
MariaDB
Commit 99685a0b authored by Matthias Leich's avatar Matthias Leich
Browse files
Options

Merge 5.0 -> 5.1 

+ fix wrong resultfile have_outfile.require
parents 6cfd0f25 1a04fc03
Hide whitespace changes
Inline Side-by-side
Showing with 530 additions and 292 deletions
mysql-test/include/count_sessions.inc 0 → 100644
View file @ 99685a0b
# include/count_sessions.inc
#
# SUMMARY
#
# Stores the number of current sessions in $count_sessions.
#
#
# USAGE
#
# Please look into include/wait_until_count_sessions.inc
# for examples of typical usage.
#
#
# EXAMPLE
# backup.test, grant3.test
#
#
# Created: 2009-01-14 mleich
#
let $count_sessions= query_get_value(SHOW STATUS LIKE 'Threads_connected', Value, 1);
mysql-test/include/wait_until_count_sessions.inc 0 → 100644
View file @ 99685a0b
# include/wait_until_count_sessions.inc
#
# SUMMARY
#
# Waits until the passed number ($count_sessions) of concurrent sessions was
# observed via
# SHOW STATUS LIKE 'Threads_connected'
# or the operation times out.
# Note: Starting with 5.1 we could also use
# SELECT COUNT(*) FROM information_schema.processlist
# I stay with "SHOW STATUS LIKE 'Threads_connected'" because this
# runs in all versions 5.0+
#
#
# USAGE
#
# let $count_sessions= 3;
# --source include/wait_until_count_sessions.inc
#
# OR typical example of a test which uses more than one session
# Such a test could harm successing tests if there is no server shutdown
# and start between.cw
#
# If the testing box is slow than the disconnect of sessions belonging to
# the current test might happen when the successing test gets executed.
# This means the successing test might see activities like unexpected
# rows within the general log or the PROCESSLIST.
# Example from bug http://bugs.mysql.com/bug.php?id=40377
# --- bzr_mysql-6.0-rpl/.../r/log_state.result
# +++ bzr_mysql-6.0-rpl/.../r/log_state.reject
# @@ -25,6 +25,7 @@
# event_time user_host ... command_type argument
# TIMESTAMP USER_HOST ... Query create table t1(f1 int)
# TIMESTAMP USER_HOST ... Query select * from mysql.general_log
# +TIMESTAMP USER_HOST ... Quit
# ....
#
# What to do?
# -----------
# <start of test>
# # Determine initial number of connections (set $count_sessions)
# --source include/count_sessions.inc
# ...
# connect (con1,.....)
# ...
# connection default;
# ...
# disconnect con1;
# ...
# # Wait until we have reached the initial number of connections
# # or more than the sleep time above (10 seconds) has passed.
# # $count_sessions
# --source include/wait_until_count_sessions.inc
# <end of test>
#
# Important note about tests with unfortunate (= not cooperative
# to successing tests) architecture:
# connection con1;
# send SELECT ..., sleep(10)
# connection default;
# ...
# disconnect con1;
# <end of test>
# should be fixed by
# connection con1;
# send SELECT ..., sleep(10)
# connection default;
# ...
# connect con1;
# reap;
# connection default;
# disconnect con1;
# <end of test>
# and not only by appending include/wait_until_count_sessions.inc etc.
#
#
# EXAMPLE
#
# backup.test, grant3.test
#
#
# Created: 2009-01-14 mleich
#
let $wait_counter= 50;
if ($wait_timeout)
{
let $wait_counter= `SELECT $wait_timeout * 10`;
}
# Reset $wait_timeout so that its value won't be used on subsequent
# calls, and default will be used instead.
let $wait_timeout= 0;
while ($wait_counter)
{
let $current_sessions= query_get_value(SHOW STATUS LIKE 'Threads_connected', Value, 1);
let $success= `SELECT $current_sessions = $count_sessions`;
if ($success)
{
let $wait_counter= 0;
}
if (!$success)
{
real_sleep 0.1;
dec $wait_counter;
}
}
if (!$success)
{
--echo # Timeout in wait_until_count_sessions.inc
--echo # Number of sessions expected: $count_sessions found: $current_sessions
}
mysql-test/r/grant2.result
View file @ 99685a0b
...@@ -367,20 +367,20 @@ drop database TESTDB; ...@@ -367,20 +367,20 @@ drop database TESTDB;
flush privileges; flush privileges;
SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators;
SET GLOBAL log_bin_trust_function_creators = 1; SET GLOBAL log_bin_trust_function_creators = 1;
grant all privileges on test.* to `a@`@localhost; GRANT ALL PRIVILEGES ON test.* TO `a@`@localhost;
grant execute on * to `a@`@localhost; GRANT EXECUTE ON * TO `a@`@localhost;
create table t2 (s1 int); CREATE TABLE t2 (s1 INT);
insert into t2 values (1); INSERT INTO t2 VALUES (1);
drop function if exists f2; DROP FUNCTION IF EXISTS f2;
create function f2 () returns int CREATE FUNCTION f2 () RETURNS INT
begin declare v int; select s1 from t2 into v; return v; end// BEGIN DECLARE v INT; SELECT s1 FROM t2 INTO v; RETURN v; END//
select f2(); SELECT f2();
f2() f2()
1 1
drop function f2; DROP FUNCTION f2;
drop table t2; DROP TABLE t2;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM `a@`@localhost; REVOKE ALL PRIVILEGES, GRANT OPTION FROM `a@`@localhost;
drop user `a@`@localhost; DROP USER `a@`@localhost;
SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators;
drop database if exists mysqltest_1; drop database if exists mysqltest_1;
drop database if exists mysqltest_2; drop database if exists mysqltest_2;
...@@ -438,6 +438,7 @@ SELECT * FROM t2; ...@@ -438,6 +438,7 @@ SELECT * FROM t2;
ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for table 't2' ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for table 't2'
SELECT * FROM t1 JOIN t2 USING (b); SELECT * FROM t1 JOIN t2 USING (b);
ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for column 'c' in table 't2' ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for column 'c' in table 't2'
USE test;
DROP TABLE db1.t1, db1.t2; DROP TABLE db1.t1, db1.t2;
DROP USER mysqltest1@localhost; DROP USER mysqltest1@localhost;
DROP DATABASE db1; DROP DATABASE db1;
......
mysql-test/r/have_outfile.require
View file @ 99685a0b
load_file(concat(@tmpdir,"/outfile.test")) load_file(concat(@tmpdir,'/outfile.test'))
Outfile OK Outfile OK
mysql-test/r/lock_tables_lost_commit.result
View file @ 99685a0b
drop table if exists t1; DROP TABLE IF EXISTS t1;
create table t1(a int) engine=innodb; CREATE TABLE t1(a INT) ENGINE=innodb;
lock tables t1 write; LOCK TABLES t1 WRITE;
insert into t1 values(10); INSERT INTO t1 VALUES(10);
select * from t1; SELECT * FROM t1;
a a
10 10
drop table t1; DROP TABLE t1;
mysql-test/r/mysqldump.result
View file @ 99685a0b
Bug#37938 - Test "mysqldump" lacks various insert statements # Bug#37938 Test "mysqldump" lacks various insert statements
Turn off concurrent inserts to avoid random errors # Turn off concurrent inserts to avoid random errors
NOTE: We reset the variable back to saved value at the end of test # NOTE: We reset the variable back to saved value at the end of test
SET @OLD_CONCURRENT_INSERT = @@GLOBAL.CONCURRENT_INSERT; SET @OLD_CONCURRENT_INSERT = @@GLOBAL.CONCURRENT_INSERT;
SET @@GLOBAL.CONCURRENT_INSERT = 0; 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;
...@@ -8,7 +8,7 @@ drop database if exists mysqldump_test_db; ...@@ -8,7 +8,7 @@ drop database if exists mysqldump_test_db;
drop database if exists db1; drop database if exists db1;
drop database if exists db2; drop database if exists db2;
drop view if exists v1, v2, v3; drop view if exists v1, v2, v3;
CREATE TABLE t1(a int, key (a)) key_block_size=1024; CREATE TABLE t1(a INT, KEY (a)) KEY_BLOCK_SIZE=1024;
INSERT INTO t1 VALUES (1), (2); INSERT INTO t1 VALUES (1), (2);
<?xml version="1.0"?> <?xml version="1.0"?>
<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
...@@ -29,7 +29,7 @@ INSERT INTO t1 VALUES (1), (2); ...@@ -29,7 +29,7 @@ INSERT INTO t1 VALUES (1), (2);
</mysqldump> </mysqldump>
DROP TABLE t1; DROP TABLE t1;
# #
# Bug #2005 # Bug#2005 Long decimal comparison bug.
# #
CREATE TABLE t1 (a decimal(64, 20)); CREATE TABLE t1 (a decimal(64, 20));
INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"), INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"),
...@@ -43,7 +43,7 @@ SET character_set_client = @saved_cs_client; ...@@ -43,7 +43,7 @@ SET character_set_client = @saved_cs_client;
INSERT INTO `t1` VALUES ('1234567890123456789012345678901234567890.00000000000000000000'),('987654321098765432109876543210987654321.00000000000000000000'); INSERT INTO `t1` VALUES ('1234567890123456789012345678901234567890.00000000000000000000'),('987654321098765432109876543210987654321.00000000000000000000');
DROP TABLE t1; DROP TABLE t1;
# #
# Bug #2055 # Bug#2055 mysqldump should replace "-inf" numeric field values with "NULL"
# #
CREATE TABLE t1 (a double); CREATE TABLE t1 (a double);
INSERT INTO t1 VALUES ('-9e999999'); INSERT INTO t1 VALUES ('-9e999999');
...@@ -58,7 +58,7 @@ SET character_set_client = @saved_cs_client; ...@@ -58,7 +58,7 @@ SET character_set_client = @saved_cs_client;
INSERT INTO `t1` VALUES (RES); INSERT INTO `t1` VALUES (RES);
DROP TABLE t1; DROP TABLE t1;
# #
# Bug #3361 mysqldump quotes DECIMAL values inconsistently # Bug#3361 mysqldump quotes DECIMAL values inconsistently
# #
CREATE TABLE t1 (a DECIMAL(10,5), b FLOAT); CREATE TABLE t1 (a DECIMAL(10,5), b FLOAT);
INSERT INTO t1 VALUES (1.2345, 2.3456); INSERT INTO t1 VALUES (1.2345, 2.3456);
...@@ -170,7 +170,7 @@ INSERT INTO t1 VALUES (1, "test", "tes"), (2, "TEST", "TES"); ...@@ -170,7 +170,7 @@ INSERT INTO t1 VALUES (1, "test", "tes"), (2, "TEST", "TES");
</mysqldump> </mysqldump>
DROP TABLE t1; DROP TABLE t1;
# #
# Bug #1707 # Bug#1707 mysqldump -X does't quote field and table names
# #
CREATE TABLE t1 (`a"b"` char(2)); CREATE TABLE t1 (`a"b"` char(2));
INSERT INTO t1 VALUES ("1\""), ("\"2"); INSERT INTO t1 VALUES ("1\""), ("\"2");
...@@ -192,8 +192,8 @@ INSERT INTO t1 VALUES ("1\""), ("\"2"); ...@@ -192,8 +192,8 @@ INSERT INTO t1 VALUES ("1\""), ("\"2");
</mysqldump> </mysqldump>
DROP TABLE t1; DROP TABLE t1;
# #
# Bug #1994 # Bug#1994 mysqldump does not correctly dump UCS2 data
# Bug #4261 # Bug#4261 mysqldump 10.7 (mysql 4.1.2) --skip-extended-insert drops NULL from inserts
# #
CREATE TABLE t1 (a VARCHAR(255)) DEFAULT CHARSET koi8r; CREATE TABLE t1 (a VARCHAR(255)) DEFAULT CHARSET koi8r;
INSERT INTO t1 VALUES (_koi8r x'C1C2C3C4C5'), (NULL); INSERT INTO t1 VALUES (_koi8r x'C1C2C3C4C5'), (NULL);
...@@ -234,7 +234,7 @@ UNLOCK TABLES; ...@@ -234,7 +234,7 @@ UNLOCK TABLES;
DROP TABLE t1; DROP TABLE t1;
# #
# Bug #2634 # Bug#2634 mysqldump in --compatible=mysql4
# #
CREATE TABLE t1 (a int) ENGINE=MYISAM; CREATE TABLE t1 (a int) ENGINE=MYISAM;
INSERT INTO t1 VALUES (1), (2); INSERT INTO t1 VALUES (1), (2);
...@@ -292,7 +292,7 @@ UNLOCK TABLES; ...@@ -292,7 +292,7 @@ UNLOCK TABLES;
DROP TABLE t1; DROP TABLE t1;
# #
# Bug #2592 'mysqldump doesn't quote "tricky" names correctly' # Bug#2592 mysqldump doesn't quote "tricky" names correctly
# #
create table ```a` (i int); create table ```a` (i int);
SET @saved_cs_client = @@character_set_client; SET @saved_cs_client = @@character_set_client;
...@@ -303,7 +303,7 @@ CREATE TABLE ```a` ( ...@@ -303,7 +303,7 @@ CREATE TABLE ```a` (
SET character_set_client = @saved_cs_client; SET character_set_client = @saved_cs_client;
drop table ```a`; drop table ```a`;
# #
# Bug #2591 "mysqldump quotes names inconsistently" # Bug#2591 mysqldump quotes names inconsistently
# #
create table t1(a int); create table t1(a int);
...@@ -426,7 +426,7 @@ UNLOCK TABLES; ...@@ -426,7 +426,7 @@ UNLOCK TABLES;
set global sql_mode=''; set global sql_mode='';
drop table t1; drop table t1;
# #
# Bug #2705 'mysqldump --tab extra output' # Bug#2705 mysqldump --tab extra output
# #
create table t1(a int); create table t1(a int);
insert into t1 values (1),(2),(3); insert into t1 values (1),(2),(3);
...@@ -460,7 +460,7 @@ SET character_set_client = @saved_cs_client; ...@@ -460,7 +460,7 @@ SET character_set_client = @saved_cs_client;
3 3
drop table t1; drop table t1;
# #
# Bug #6101: create database problem # Bug#6101 create database problem
# #
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
...@@ -515,7 +515,7 @@ USE `mysqldump_test_db`; ...@@ -515,7 +515,7 @@ USE `mysqldump_test_db`;
drop database mysqldump_test_db; drop database mysqldump_test_db;
# #
# Bug #7020 # Bug#7020 mysqldump --compatible=mysql40 should set --skip-set-charset --default-char...
# Check that we don't dump in UTF8 in compatible mode by default, # Check that we don't dump in UTF8 in compatible mode by default,
# but use the default compiled values, or the values given in # but use the default compiled values, or the values given in
# --default-character-set=xxx. However, we should dump in UTF8 # --default-character-set=xxx. However, we should dump in UTF8
...@@ -557,8 +557,8 @@ UNLOCK TABLES; ...@@ -557,8 +557,8 @@ UNLOCK TABLES;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
# #
# Bug#8063: make test mysqldump [ fail ] # Bug#8063 make test mysqldump [ fail ]
# We cannot tes this command because its output depends # We cannot test this command because its output depends
# on --default-character-set incompiled into "mysqldump" program. # on --default-character-set incompiled into "mysqldump" program.
# If the future we can move this command into a separate test with # If the future we can move this command into a separate test with
# checking that "mysqldump" is compiled with "latin1" # checking that "mysqldump" is compiled with "latin1"
...@@ -643,7 +643,7 @@ UNLOCK TABLES; ...@@ -643,7 +643,7 @@ UNLOCK TABLES;
DROP TABLE t1; DROP TABLE t1;
# #
# WL #2319: Exclude Tables from dump # WL#2319 Exclude Tables from dump
# #
CREATE TABLE t1 (a int); CREATE TABLE t1 (a int);
CREATE TABLE t2 (a int); CREATE TABLE t2 (a int);
...@@ -686,7 +686,7 @@ UNLOCK TABLES; ...@@ -686,7 +686,7 @@ UNLOCK TABLES;
DROP TABLE t1; DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;
# #
# Bug #8830 # Bug#8830 mysqldump --skip-extended-insert causes --hex-blob to dump wrong values
# #
CREATE TABLE t1 (`b` blob); CREATE TABLE t1 (`b` blob);
INSERT INTO `t1` VALUES (0x602010000280100005E71A); INSERT INTO `t1` VALUES (0x602010000280100005E71A);
...@@ -728,7 +728,7 @@ DROP TABLE t1; ...@@ -728,7 +728,7 @@ DROP TABLE t1;
# #
# Test for --insert-ignore # Test for --insert-ignore
# #
CREATE TABLE t1 (a int); CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES (1),(2),(3); INSERT INTO t1 VALUES (1),(2),(3);
INSERT INTO t1 VALUES (4),(5),(6); INSERT INTO t1 VALUES (4),(5),(6);
...@@ -799,9 +799,9 @@ INSERT DELAYED IGNORE INTO `t1` VALUES (1),(2),(3),(4),(5),(6); ...@@ -799,9 +799,9 @@ INSERT DELAYED IGNORE INTO `t1` VALUES (1),(2),(3),(4),(5),(6);
DROP TABLE t1; DROP TABLE t1;
# #
# Bug #10286: mysqldump -c crashes on table that has many fields with long # Bug#10286 mysqldump -c crashes on table that has many fields with long
# names # names
# #
create table t1 ( create table t1 (
F_c4ca4238a0b923820dcc509a6f75849b int, F_c4ca4238a0b923820dcc509a6f75849b int,
F_c81e728d9d4c2f636f067f89cc14862c int, F_c81e728d9d4c2f636f067f89cc14862c int,
...@@ -1545,7 +1545,7 @@ UNLOCK TABLES; ...@@ -1545,7 +1545,7 @@ UNLOCK TABLES;
DROP TABLE t1; DROP TABLE t1;
# #
# Bug #9558 mysqldump --no-data db t1 t2 format still dumps data # Bug#9558 mysqldump --no-data db t1 t2 format still dumps data
# #
CREATE DATABASE mysqldump_test_db; CREATE DATABASE mysqldump_test_db;
USE mysqldump_test_db; USE mysqldump_test_db;
...@@ -1650,7 +1650,7 @@ DROP DATABASE mysqldump_test_db; ...@@ -1650,7 +1650,7 @@ DROP DATABASE mysqldump_test_db;
# #
# Testing with tables and databases that don't exists # Testing with tables and databases that don't exists
# or contains illegal characters # or contains illegal characters
# (Bug #9358 mysqldump crashes if tablename starts with \) # (Bug#9358 mysqldump crashes if tablename starts with \)
# #
create database mysqldump_test_db; create database mysqldump_test_db;
use mysqldump_test_db; use mysqldump_test_db;
...@@ -1679,7 +1679,7 @@ drop table t1, t2, t3; ...@@ -1679,7 +1679,7 @@ drop table t1, t2, t3;
drop database mysqldump_test_db; drop database mysqldump_test_db;
use test; use test;
# #
# Bug #9657 mysqldump xml ( -x ) does not format NULL fields correctly # Bug#9657 mysqldump xml ( -x ) does not format NULL fields correctly
# #
create table t1 (a int(10)); create table t1 (a int(10));
create table t2 (pk int primary key auto_increment, create table t2 (pk int primary key auto_increment,
...@@ -1738,7 +1738,7 @@ insert into t2 (a, b) values (NULL, NULL),(10, NULL),(NULL, "twenty"),(30, "thir ...@@ -1738,7 +1738,7 @@ insert into t2 (a, b) values (NULL, NULL),(10, NULL),(NULL, "twenty"),(30, "thir
</mysqldump> </mysqldump>
drop table t1, t2; drop table t1, t2;
# #
# BUG #12123 # Bug#12123 mysqldump --tab results in text file which can't be imported
# #
create table t1 (a text character set utf8, b text character set latin1); create table t1 (a text character set utf8, b text character set latin1);
insert t1 values (0x4F736E616272C3BC636B, 0x4BF66C6E); insert t1 values (0x4F736E616272C3BC636B, 0x4BF66C6E);
...@@ -1751,11 +1751,11 @@ a b ...@@ -1751,11 +1751,11 @@ a b
Osnabrck Kln Osnabrck Kln
drop table t1; drop table t1;
# #
# BUG#15328 Segmentation fault occured if my.cnf is invalid for escape sequence # Bug#15328 Segmentation fault occured if my.cnf is invalid for escape sequence
# #
--fields-optionally-enclosed-by=" --fields-optionally-enclosed-by="
# #
# BUG #19025 mysqldump doesn't correctly dump "auto_increment = [int]" # Bug#19025 mysqldump doesn't correctly dump "auto_increment = [int]"
# #
create table `t1` ( create table `t1` (
t1_name varchar(255) default null, t1_name varchar(255) default null,
...@@ -1795,7 +1795,7 @@ t1 CREATE TABLE `t1` ( ...@@ -1795,7 +1795,7 @@ t1 CREATE TABLE `t1` (
) ENGINE=MyISAM AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1 ) ENGINE=MyISAM AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1
drop table `t1`; drop table `t1`;
# #
# Bug #18536: wrong table order # Bug#18536 wrong table order
# #
create table t1(a int); create table t1(a int);
create table t2(a int); create table t2(a int);
...@@ -1844,7 +1844,7 @@ SET character_set_client = @saved_cs_client; ...@@ -1844,7 +1844,7 @@ SET character_set_client = @saved_cs_client;
drop table t1, t2, t3; drop table t1, t2, t3;
# #
# Bug #21288: mysqldump segmentation fault when using --where # Bug#21288 mysqldump segmentation fault when using --where
# #
create table t1 (a int); create table t1 (a int);
mysqldump: Couldn't execute 'SELECT /*!40001 SQL_NO_CACHE */ * FROM `t1` WHERE xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx': You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 (1064) mysqldump: Couldn't execute 'SELECT /*!40001 SQL_NO_CACHE */ * FROM `t1` WHERE xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx': You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 (1064)
...@@ -1880,7 +1880,7 @@ SET character_set_client = @saved_cs_client; ...@@ -1880,7 +1880,7 @@ SET character_set_client = @saved_cs_client;
drop table t1; drop table t1;
# #
# BUG#13926: --order-by-primary fails if PKEY contains quote character # Bug#13926 --order-by-primary fails if PKEY contains quote character
# #
DROP TABLE IF EXISTS `t1`; DROP TABLE IF EXISTS `t1`;
CREATE TABLE `t1` ( CREATE TABLE `t1` (
...@@ -1959,7 +1959,7 @@ UNLOCK TABLES; ...@@ -1959,7 +1959,7 @@ UNLOCK TABLES;
DROP TABLE `t1`; DROP TABLE `t1`;
End of 4.1 tests End of 4.1 tests
# #
# Bug #10213 mysqldump crashes when dumping VIEWs(on MacOS X) # Bug#10213 mysqldump crashes when dumping VIEWs(on MacOS X)
# #
create database db1; create database db1;
use db1; use db1;
...@@ -2036,7 +2036,7 @@ drop view v2; ...@@ -2036,7 +2036,7 @@ drop view v2;
drop database db1; drop database db1;
use test; use test;
# #
# Bug 10713 mysqldump includes database in create view and referenced tables # Bug#10713 mysqldump includes database in create view and referenced tables
# #
create database db2; create database db2;
use db2; use db2;
...@@ -2067,9 +2067,6 @@ a b ...@@ -2067,9 +2067,6 @@ a b
drop table t1, t2; drop table t1, t2;
drop database db1; drop database db1;
use test; use test;
#
# dump of view
#
create table t1(a int); create table t1(a int);
create view v1 as select * from t1; create view v1 as select * from t1;
...@@ -2130,7 +2127,7 @@ SET character_set_client = @saved_cs_client; ...@@ -2130,7 +2127,7 @@ SET character_set_client = @saved_cs_client;
drop view v1; drop view v1;
drop table t1; drop table t1;
# #
# Bug #10213 mysqldump crashes when dumping VIEWs(on MacOS X) # Bug#10213 mysqldump crashes when dumping VIEWs(on MacOS X)
# #
create database mysqldump_test_db; create database mysqldump_test_db;
use mysqldump_test_db; use mysqldump_test_db;
...@@ -2207,7 +2204,7 @@ drop view v2; ...@@ -2207,7 +2204,7 @@ drop view v2;
drop database mysqldump_test_db; drop database mysqldump_test_db;
use test; use test;
# #
# Bug #9756 # Bug#9756 mysql client failing on dumps containing certain \ sequences
# #
CREATE TABLE t1 (a char(10)); CREATE TABLE t1 (a char(10));
INSERT INTO t1 VALUES ('\''); INSERT INTO t1 VALUES ('\'');
...@@ -2247,7 +2244,7 @@ UNLOCK TABLES; ...@@ -2247,7 +2244,7 @@ UNLOCK TABLES;
DROP TABLE t1; DROP TABLE t1;
# #
# Bug #10927 mysqldump: Can't reload dump with view that consist of other view # Bug#10927 mysqldump: Can't reload dump with view that consist of other view
# #
create table t1(a int, b int, c varchar(30)); create table t1(a int, b int, c varchar(30));
insert into t1 values(1, 2, "one"), (2, 4, "two"), (3, 6, "three"); insert into t1 values(1, 2, "one"), (2, 4, "two"), (3, 6, "three");
...@@ -2620,12 +2617,14 @@ end if; ...@@ -2620,12 +2617,14 @@ end if;
end BEFORE # STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER root@localhost latin1 latin1_swedish_ci latin1_swedish_ci end BEFORE # STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER root@localhost latin1 latin1_swedish_ci latin1_swedish_ci
DROP TABLE t1, t2; DROP TABLE t1, t2;
# #
# Bugs #9136, #12917: problems with --defaults-extra-file option # Bug#9136 my_print_defaults changed behaviour between 4.1.7 and 4.1.10a
# Bug#12917 The --defaults-extra-file option is ignored by the 5.0 client binaries
# (Problems with --defaults-extra-file option)
# #
--port=1234 --port=1234
--port=1234 --port=1234
# #
# Test of fix to BUG 12597 # Test of fix to Bug#12597 mysqldump dumps triggers wrongly
# #
DROP TABLE IF EXISTS `test1`; DROP TABLE IF EXISTS `test1`;
Warnings: Warnings:
...@@ -2659,7 +2658,7 @@ DROP TRIGGER testref; ...@@ -2659,7 +2658,7 @@ DROP TRIGGER testref;
DROP TABLE test1; DROP TABLE test1;
DROP TABLE test2; DROP TABLE test2;
# #
# BUG#9056 - mysqldump does not dump routines # Bug#9056 mysqldump does not dump routines
# #
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
DROP FUNCTION IF EXISTS bug9056_func1; DROP FUNCTION IF EXISTS bug9056_func1;
...@@ -2677,9 +2676,9 @@ begin ...@@ -2677,9 +2676,9 @@ begin
set f1= concat( 'hello', f1 ); set f1= concat( 'hello', f1 );
return f1; return f1;
end // end //
CREATE PROCEDURE bug9056_proc2(OUT a INT) CREATE PROCEDURE bug9056_proc2(OUT a INT)
BEGIN BEGIN
select sum(id) from t1 into a; select sum(id) from t1 into a;
END // END //
set sql_mode='ansi'; set sql_mode='ansi';
create procedure `a'b` () select 1; create procedure `a'b` () select 1;
...@@ -2794,8 +2793,8 @@ DELIMITER ; ...@@ -2794,8 +2793,8 @@ DELIMITER ;
/*!50003 SET sql_mode = '' */ ; /*!50003 SET sql_mode = '' */ ;
DELIMITER ;; DELIMITER ;;
/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `bug9056_proc2`(OUT a INT) /*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `bug9056_proc2`(OUT a INT)
BEGIN BEGIN
select sum(id) from t1 into a; select sum(id) from t1 into a;
END */;; END */;;
DELIMITER ; DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ; /*!50003 SET sql_mode = @saved_sql_mode */ ;
...@@ -2819,7 +2818,7 @@ DROP PROCEDURE bug9056_proc2; ...@@ -2819,7 +2818,7 @@ DROP PROCEDURE bug9056_proc2;
DROP PROCEDURE `a'b`; DROP PROCEDURE `a'b`;
drop table t1; drop table t1;
# #
# BUG# 13052 - mysqldump timestamp reloads broken # Bug#13052 mysqldump timestamp reloads broken
# #
drop table if exists t1; drop table if exists t1;
create table t1 (`d` timestamp, unique (`d`)); create table t1 (`d` timestamp, unique (`d`));
...@@ -2914,7 +2913,7 @@ drop table t1; ...@@ -2914,7 +2913,7 @@ drop table t1;
set global time_zone=default; set global time_zone=default;
set time_zone=default; set time_zone=default;
# #
# Test of fix to BUG 13146 - ansi quotes break loading of triggers # Test of fix to Bug#13146 ansi quotes break loading of triggers
# #
DROP TABLE IF EXISTS `t1 test`; DROP TABLE IF EXISTS `t1 test`;
DROP TABLE IF EXISTS `t2 test`; DROP TABLE IF EXISTS `t2 test`;
...@@ -2993,7 +2992,7 @@ DROP TRIGGER `test trig`; ...@@ -2993,7 +2992,7 @@ DROP TRIGGER `test trig`;
DROP TABLE `t1 test`; DROP TABLE `t1 test`;
DROP TABLE `t2 test`; DROP TABLE `t2 test`;
# #
# BUG# 12838 mysqldump -x with views exits with error # Bug#12838 mysqldump -x with views exits with error
# #
drop table if exists t1; drop table if exists t1;
create table t1 (a int, b varchar(32), c varchar(32)); create table t1 (a int, b varchar(32), c varchar(32));
...@@ -3127,7 +3126,7 @@ drop view v0; ...@@ -3127,7 +3126,7 @@ drop view v0;
drop view v1; drop view v1;
drop table t1; drop table t1;
# #
# BUG#14554 - mysqldump does not separate words "ROW" and "BEGIN" # Bug#14554 mysqldump does not separate words "ROW" and "BEGIN"
# for tables with trigger created in the IGNORE_SPACE sql mode. # for tables with trigger created in the IGNORE_SPACE sql mode.
# #
SET @old_sql_mode = @@SQL_MODE; SET @old_sql_mode = @@SQL_MODE;
...@@ -3198,8 +3197,8 @@ DELIMITER ; ...@@ -3198,8 +3197,8 @@ DELIMITER ;
DROP TRIGGER tr1; DROP TRIGGER tr1;
DROP TABLE t1; DROP TABLE t1;
# #
# Bug #13318: Bad result with empty field and --hex-blob # Bug#13318 Bad result with empty field and --hex-blob
# #
create table t1 (a binary(1), b blob); create table t1 (a binary(1), b blob);
insert into t1 values ('',''); insert into t1 values ('','');
...@@ -3274,7 +3273,7 @@ UNLOCK TABLES; ...@@ -3274,7 +3273,7 @@ UNLOCK TABLES;
drop table t1; drop table t1;
# #
# Bug 14871 Invalid view dump output # Bug#14871 Invalid view dump output
# #
create table t1 (a int); create table t1 (a int);
insert into t1 values (289), (298), (234), (456), (789); insert into t1 values (289), (298), (234), (456), (789);
...@@ -3303,7 +3302,7 @@ a ...@@ -3303,7 +3302,7 @@ a
drop table t1; drop table t1;
drop view v1, v2, v3, v4, v5; drop view v1, v2, v3, v4, v5;
# #
# Bug #16878 dump of trigger # Bug#16878 dump of trigger
# #
create table t1 (a int, created datetime); create table t1 (a int, created datetime);
create table t2 (b int, created datetime); create table t2 (b int, created datetime);
...@@ -3371,7 +3370,7 @@ drop view v2; ...@@ -3371,7 +3370,7 @@ drop view v2;
drop table t; drop table t;
# #
# Bug#14857 Reading dump files with single statement stored routines fails. # Bug#14857 Reading dump files with single statement stored routines fails.
# fixed by patch for bug#16878 # fixed by patch for Bug#16878
# #
/*!50003 CREATE FUNCTION `f`() RETURNS bigint(20) /*!50003 CREATE FUNCTION `f`() RETURNS bigint(20)
return 42 */| return 42 */|
...@@ -3388,7 +3387,7 @@ select 42 latin1 latin1_swedish_ci latin1_swedish_ci ...@@ -3388,7 +3387,7 @@ select 42 latin1 latin1_swedish_ci latin1_swedish_ci
drop function f; drop function f;
drop procedure p; drop procedure p;
# #
# Bug #17371 Unable to dump a schema with invalid views # Bug#17371 Unable to dump a schema with invalid views
# #
create table t1 ( id serial ); create table t1 ( id serial );
create view v1 as select * from t1; create view v1 as select * from t1;
...@@ -3399,7 +3398,7 @@ mysqldump { ...@@ -3399,7 +3398,7 @@ mysqldump {
} mysqldump } mysqldump
drop view v1; drop view v1;
# BUG#17201 Spurious 'DROP DATABASE' in output, # Bug#17201 Spurious 'DROP DATABASE' in output,
# also confusion between tables and views. # also confusion between tables and views.
# Example code from Markus Popp # Example code from Markus Popp
create database mysqldump_test_db; create database mysqldump_test_db;
...@@ -3478,7 +3477,7 @@ drop view v1; ...@@ -3478,7 +3477,7 @@ drop view v1;
drop table t1; drop table t1;
drop database mysqldump_test_db; drop database mysqldump_test_db;
# #
# Bug21014 Segmentation fault of mysqldump on view # Bug#21014 Segmentation fault of mysqldump on view
# #
create database mysqldump_tables; create database mysqldump_tables;
use mysqldump_tables; use mysqldump_tables;
...@@ -3530,7 +3529,7 @@ drop database mysqldump_views; ...@@ -3530,7 +3529,7 @@ drop database mysqldump_views;
drop table mysqldump_tables.basetable; drop table mysqldump_tables.basetable;
drop database mysqldump_tables; drop database mysqldump_tables;
# #
# Bug20221 Dumping of multiple databases containing view(s) yields maleformed dumps # Bug#20221 Dumping of multiple databases containing view(s) yields maleformed dumps
# #
create database mysqldump_dba; create database mysqldump_dba;
use mysqldump_dba; use mysqldump_dba;
...@@ -3579,10 +3578,10 @@ grant REPLICATION CLIENT on *.* to mysqltest_1@localhost; ...@@ -3579,10 +3578,10 @@ grant REPLICATION CLIENT on *.* to mysqltest_1@localhost;
drop table t1; drop table t1;
drop user mysqltest_1@localhost; drop user mysqltest_1@localhost;
# #
# Bug #21527 mysqldump incorrectly tries to LOCK TABLES on the # Bug#21527 mysqldump incorrectly tries to LOCK TABLES on the
# information_schema database. # information_schema database.
# #
# Bug #21424 mysqldump failing to export/import views # Bug#21424 mysqldump failing to export/import views
# #
create database mysqldump_myDB; create database mysqldump_myDB;
use mysqldump_myDB; use mysqldump_myDB;
...@@ -3602,8 +3601,8 @@ revoke all privileges on mysqldump_myDB.* from myDB_User@localhost; ...@@ -3602,8 +3601,8 @@ revoke all privileges on mysqldump_myDB.* from myDB_User@localhost;
drop user myDB_User@localhost; drop user myDB_User@localhost;
drop database mysqldump_myDB; drop database mysqldump_myDB;
flush privileges; flush privileges;
# Bug #21424 continues from here. # Bug#21424 continues from here.
# Restore. Flush Privileges test ends. # Restore. Flush Privileges test ends.
# #
use mysqldump_myDB; use mysqldump_myDB;
select * from mysqldump_myDB.v1; select * from mysqldump_myDB.v1;
...@@ -3621,7 +3620,7 @@ drop user myDB_User@localhost; ...@@ -3621,7 +3620,7 @@ drop user myDB_User@localhost;
drop database mysqldump_myDB; drop database mysqldump_myDB;
use test; use test;
# #
# Bug #19745: mysqldump --xml produces invalid xml # Bug#19745 mysqldump --xml produces invalid xml
# #
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (f1 int(10), data MEDIUMBLOB); CREATE TABLE t1 (f1 int(10), data MEDIUMBLOB);
...@@ -3643,15 +3642,15 @@ INSERT INTO t1 VALUES(1,0xff00fef0); ...@@ -3643,15 +3642,15 @@ INSERT INTO t1 VALUES(1,0xff00fef0);
</mysqldump> </mysqldump>
DROP TABLE t1; DROP TABLE t1;
# #
# Bug#26346: stack + buffer overrun in mysqldump # Bug#26346 stack + buffer overrun in mysqldump
# #
CREATE TABLE t1(a int); CREATE TABLE t1(a int);
INSERT INTO t1 VALUES (1), (2); INSERT INTO t1 VALUES (1), (2);
mysqldump: Input filename too long: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa mysqldump: Input filename too long: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t2 (a int); CREATE TABLE t2 (a INT);
CREATE TABLE t3 (a int); CREATE TABLE t3 (a INT);
CREATE TABLE t1 (a int) ENGINE=merge UNION=(t2, t3); CREATE TABLE t1 (a INT) ENGINE=merge UNION=(t2, t3);
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
...@@ -3706,7 +3705,7 @@ UNLOCK TABLES; ...@@ -3706,7 +3705,7 @@ UNLOCK TABLES;
DROP TABLE t1, t2, t3; DROP TABLE t1, t2, t3;
# #
# Bug #23491: MySQLDump prefix function call in a view by database name # Bug#23491 MySQLDump prefix function call in a view by database name
# #
create database bug23491_original; create database bug23491_original;
create database bug23491_restore; create database bug23491_restore;
...@@ -3728,12 +3727,12 @@ v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI ...@@ -3728,12 +3727,12 @@ v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
drop database bug23491_original; drop database bug23491_original;
drop database bug23491_restore; drop database bug23491_restore;
use test; use test;
#
# Bug 27293: mysqldump crashes when dumping routines
# defined by a different user
# #
# Bug #22761: mysqldump reports no errors when using # Bug#27293 mysqldump crashes when dumping routines
# --routines without mysql.proc privileges # defined by a different user
#
# Bug#22761 mysqldump reports no errors when using
# --routines without mysql.proc privileges
# #
create database mysqldump_test_db; create database mysqldump_test_db;
grant all privileges on mysqldump_test_db.* to user1; grant all privileges on mysqldump_test_db.* to user1;
...@@ -3764,7 +3763,7 @@ drop user user1; ...@@ -3764,7 +3763,7 @@ drop user user1;
drop user user2; drop user user2;
drop database mysqldump_test_db; drop database mysqldump_test_db;
# #
# Bug #28522: buffer overrun by '\0' byte using --hex-blob. # Bug#28522 buffer overrun by '\0' byte using --hex-blob.
# #
CREATE TABLE t1 (c1 INT, c2 LONGBLOB); CREATE TABLE t1 (c1 INT, c2 LONGBLOB);
INSERT INTO t1 SET c1=11, c2=REPEAT('q',509); INSERT INTO t1 SET c1=11, c2=REPEAT('q',509);
...@@ -3778,8 +3777,8 @@ SET character_set_client = @saved_cs_client; ...@@ -3778,8 +3777,8 @@ SET character_set_client = @saved_cs_client;
INSERT INTO `t1` VALUES (11,0x7171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171); INSERT INTO `t1` VALUES (11,0x7171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171);
DROP TABLE t1; DROP TABLE t1;
# #
# Bug #28524: mysqldump --skip-add-drop-table is not # Bug#28524 mysqldump --skip-add-drop-table is not
# compatible with views # compatible with views
# #
CREATE VIEW v1 AS SELECT 1; CREATE VIEW v1 AS SELECT 1;
DROP VIEW v1; DROP VIEW v1;
...@@ -3788,8 +3787,8 @@ SELECT * FROM v1; ...@@ -3788,8 +3787,8 @@ SELECT * FROM v1;
1 1
DROP VIEW v1; DROP VIEW v1;
# #
# Bug #29788: mysqldump discards the NO_AUTO_VALUE_ON_ZERO value of # Bug#29788 mysqldump discards the NO_AUTO_VALUE_ON_ZERO value of
# the SQL_MODE variable after the dumping of triggers. # the SQL_MODE variable after the dumping of triggers.
# #
CREATE TABLE t1 (c1 INT); CREATE TABLE t1 (c1 INT);
CREATE TRIGGER t1bd BEFORE DELETE ON t1 FOR EACH ROW BEGIN END; CREATE TRIGGER t1bd BEFORE DELETE ON t1 FOR EACH ROW BEGIN END;
...@@ -3810,8 +3809,8 @@ c1 ...@@ -3810,8 +3809,8 @@ c1
2 2
DROP TABLE t1,t2; DROP TABLE t1,t2;
# #
# Bug#29815: new option for suppressing last line of mysqldump: # Bug#29815 new option for suppressing last line of mysqldump:
# "Dump completed on" # "Dump completed on"
# #
# --skip-dump-date: # --skip-dump-date:
-- --
...@@ -3876,7 +3875,7 @@ UNLOCK TABLES; ...@@ -3876,7 +3875,7 @@ UNLOCK TABLES;
DROP TABLE t1; DROP TABLE t1;
# #
# BUG# 16853: mysqldump doesn't show events # Bug#16853 mysqldump doesn't show events
# #
create database first; create database first;
use first; use first;
...@@ -3916,7 +3915,7 @@ drop database third; ...@@ -3916,7 +3915,7 @@ drop database third;
set time_zone = 'SYSTEM'; set time_zone = 'SYSTEM';
use test; use test;
# #
# BUG#17201 Spurious 'DROP DATABASE' in output, # Bug#17201 Spurious 'DROP DATABASE' in output,
# also confusion between tables and views. # also confusion between tables and views.
# Example code from Markus Popp # Example code from Markus Popp
# #
...@@ -3996,8 +3995,8 @@ drop view v1; ...@@ -3996,8 +3995,8 @@ drop view v1;
drop table t1; drop table t1;
drop database mysqldump_test_db; drop database mysqldump_test_db;
# #
# Bug #30027: mysqldump does not dump views properly. # Bug#30027 mysqldump does not dump views properly.
# #
# Cleanup. # Cleanup.
DROP DATABASE IF EXISTS mysqldump_test_db; DROP DATABASE IF EXISTS mysqldump_test_db;
...@@ -4029,8 +4028,8 @@ set names latin1; ...@@ -4029,8 +4028,8 @@ set names latin1;
# Cleanup. # Cleanup.
DROP DATABASE mysqldump_test_db; DROP DATABASE mysqldump_test_db;
# #
# BUG#29938: wrong behavior of mysqldump --skip-events # Bug#29938 wrong behavior of mysqldump --skip-events
# with --all-databases # with --all-databases
# #
TRUNCATE mysql.event; TRUNCATE mysql.event;
USE test; USE test;
...@@ -4062,7 +4061,7 @@ drop database `test-database`; ...@@ -4062,7 +4061,7 @@ drop database `test-database`;
use test; use test;
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# -- Bug#30217: Views: changes in metadata behaviour between 5.0 and 5.1. # -- Bug#30217 Views: changes in metadata behaviour between 5.0 and 5.1.
# ----------------------------------------------------------------- # -----------------------------------------------------------------
DROP DATABASE IF EXISTS mysqldump_test_db; DROP DATABASE IF EXISTS mysqldump_test_db;
......
mysql-test/t/grant2.test
View file @ 99685a0b
# Grant tests not performed with embedded server # Grant tests not performed with embedded server
-- source include/not_embedded.inc -- source include/not_embedded.inc
# Save the initial number of concurrent sessions
--source include/count_sessions.inc
SET NAMES binary; SET NAMES binary;
# #
...@@ -27,7 +31,7 @@ create user mysqltest_2@localhost; ...@@ -27,7 +31,7 @@ create user mysqltest_2@localhost;
connect (user_a,localhost,mysqltest_1,,); connect (user_a,localhost,mysqltest_1,,);
connection user_a; connection user_a;
grant select on `my\_1`.* to mysqltest_2@localhost; grant select on `my\_1`.* to mysqltest_2@localhost;
--error 1132 --error ER_PASSWORD_NOT_ALLOWED
grant select on `my\_1`.* to mysqltest_2@localhost identified by 'pass'; grant select on `my\_1`.* to mysqltest_2@localhost identified by 'pass';
disconnect user_a; disconnect user_a;
connection default; connection default;
...@@ -61,7 +65,7 @@ connect (user1,localhost,mysqltest_1,,); ...@@ -61,7 +65,7 @@ connect (user1,localhost,mysqltest_1,,);
connection user1; connection user1;
select current_user(); select current_user();
grant all privileges on `my\_1`.* to mysqltest_2@localhost with grant option; grant all privileges on `my\_1`.* to mysqltest_2@localhost with grant option;
--error 1044 --error ER_DBACCESS_DENIED_ERROR
grant all privileges on `my_%`.* to mysqltest_3@localhost with grant option; grant all privileges on `my_%`.* to mysqltest_3@localhost with grant option;
# #
...@@ -72,7 +76,7 @@ select @@sql_mode; ...@@ -72,7 +76,7 @@ select @@sql_mode;
# #
# GRANT without IDENTIFIED BY does not create new users # GRANT without IDENTIFIED BY does not create new users
# #
--error 1133 --error ER_PASSWORD_NO_MATCH
grant select on `my\_1`.* to mysqltest_4@localhost with grant option; grant select on `my\_1`.* to mysqltest_4@localhost with grant option;
grant select on `my\_1`.* to mysqltest_4@localhost identified by 'mypass' grant select on `my\_1`.* to mysqltest_4@localhost identified by 'mypass'
with grant option; with grant option;
...@@ -80,7 +84,7 @@ disconnect user1; ...@@ -80,7 +84,7 @@ disconnect user1;
connection default; connection default;
show grants for mysqltest_1@localhost; show grants for mysqltest_1@localhost;
show grants for mysqltest_2@localhost; show grants for mysqltest_2@localhost;
--error 1141 --error ER_NONEXISTING_GRANT
show grants for mysqltest_3@localhost; show grants for mysqltest_3@localhost;
delete from mysql.user where user like 'mysqltest\_%'; delete from mysql.user where user like 'mysqltest\_%';
delete from mysql.db where user like 'mysqltest\_%'; delete from mysql.db where user like 'mysqltest\_%';
...@@ -95,7 +99,7 @@ connect (user2,localhost,mysqltest_1,,); ...@@ -95,7 +99,7 @@ connect (user2,localhost,mysqltest_1,,);
connection user2; connection user2;
select current_user(); select current_user();
show databases; show databases;
--error 1044 --error ER_DBACCESS_DENIED_ERROR
grant all privileges on `mysqltest_1`.* to mysqltest_1@localhost with grant option; grant all privileges on `mysqltest_1`.* to mysqltest_1@localhost with grant option;
disconnect user2; disconnect user2;
connection default; connection default;
...@@ -106,8 +110,8 @@ drop database mysqltest_1; ...@@ -106,8 +110,8 @@ drop database mysqltest_1;
flush privileges; flush privileges;
# #
# Bug #6173: One can circumvent missing UPDATE privilege if he has SELECT # Bug#6173 One can circumvent missing UPDATE privilege if he has SELECT and
# and INSERT privilege for table with primary key # INSERT privilege for table with primary key
# #
create database mysqltest; create database mysqltest;
grant INSERT, SELECT on mysqltest.* to mysqltest_1@localhost; grant INSERT, SELECT on mysqltest.* to mysqltest_1@localhost;
...@@ -119,10 +123,10 @@ connect (mrbad, localhost, mysqltest_1,,mysqltest); ...@@ -119,10 +123,10 @@ connect (mrbad, localhost, mysqltest_1,,mysqltest);
connection mrbad; connection mrbad;
show grants for current_user(); show grants for current_user();
insert into t1 values (1, 'I can''t change it!'); insert into t1 values (1, 'I can''t change it!');
--error 1142 --error ER_TABLEACCESS_DENIED_ERROR
update t1 set data='I can change it!' where id = 1; update t1 set data='I can change it!' where id = 1;
# This should not be allowed since it too require UPDATE privilege. # This should not be allowed since it too require UPDATE privilege.
--error 1142 --error ER_TABLEACCESS_DENIED_ERROR
insert into t1 values (1, 'XXX') on duplicate key update data= 'I can change it!'; insert into t1 values (1, 'XXX') on duplicate key update data= 'I can change it!';
select * from t1; select * from t1;
disconnect mrbad; disconnect mrbad;
...@@ -138,9 +142,9 @@ create table t1 (a int, b int); ...@@ -138,9 +142,9 @@ create table t1 (a int, b int);
grant select (a) on t1 to mysqltest_1@localhost with grant option; grant select (a) on t1 to mysqltest_1@localhost with grant option;
connect (mrugly, localhost, mysqltest_1,,mysqltest); connect (mrugly, localhost, mysqltest_1,,mysqltest);
connection mrugly; connection mrugly;
--error 1143 --error ER_COLUMNACCESS_DENIED_ERROR
grant select (a,b) on t1 to mysqltest_2@localhost; grant select (a,b) on t1 to mysqltest_2@localhost;
--error 1142 --error ER_TABLEACCESS_DENIED_ERROR
grant select on t1 to mysqltest_3@localhost; grant select on t1 to mysqltest_3@localhost;
disconnect mrugly; disconnect mrugly;
...@@ -157,7 +161,7 @@ use test; ...@@ -157,7 +161,7 @@ use test;
# #
# Bug #15775: "drop user" command does not refresh acl_check_hosts # Bug#15775 "drop user" command does not refresh acl_check_hosts
# #
# Create some test users # Create some test users
...@@ -188,15 +192,15 @@ disconnect con9; ...@@ -188,15 +192,15 @@ disconnect con9;
connection default; connection default;
# #
# Bug# 16180 - Setting SQL_LOG_OFF without SUPER privilege is silently ignored # Bug#16180 Setting SQL_LOG_OFF without SUPER privilege is silently ignored
# #
create database mysqltest_1; create database mysqltest_1;
grant select, insert, update on `mysqltest\_1`.* to mysqltest_1@localhost; grant select, insert, update on `mysqltest\_1`.* to mysqltest_1@localhost;
connect (con10,localhost,mysqltest_1,,); connect (con10,localhost,mysqltest_1,,);
connection con10; connection con10;
--error 1227 --error ER_SPECIFIC_ACCESS_DENIED_ERROR
set sql_log_off = 1; set sql_log_off = 1;
--error 1227 --error ER_SPECIFIC_ACCESS_DENIED_ERROR
set sql_log_bin = 0; set sql_log_bin = 0;
disconnect con10; disconnect con10;
connection default; connection default;
...@@ -217,7 +221,7 @@ create table t2(c1 int, c2 int); ...@@ -217,7 +221,7 @@ create table t2(c1 int, c2 int);
# #
# Three forms of CREATE USER # Three forms of CREATE USER
create user 'mysqltest_1'; create user 'mysqltest_1';
--error 1396 --error ER_CANNOT_USER
create user 'mysqltest_1'; create user 'mysqltest_1';
create user 'mysqltest_2' identified by 'Mysqltest-2'; create user 'mysqltest_2' identified by 'Mysqltest-2';
create user 'mysqltest_3' identified by password 'fffffffffffffffffffffffffffffffffffffffff'; create user 'mysqltest_3' identified by password 'fffffffffffffffffffffffffffffffffffffffff';
...@@ -238,7 +242,7 @@ select host,user,password from mysql.user where user like 'mysqltest_%' order by ...@@ -238,7 +242,7 @@ select host,user,password from mysql.user where user like 'mysqltest_%' order by
select host,db,user from mysql.db where user like 'mysqltest_%' order by host,db,user; select host,db,user from mysql.db where user like 'mysqltest_%' order by host,db,user;
select host,db,user,table_name from mysql.tables_priv where user like 'mysqltest_%' order by host,db,user,table_name; select host,db,user,table_name from mysql.tables_priv where user like 'mysqltest_%' order by host,db,user,table_name;
select host,db,user,table_name,column_name from mysql.columns_priv where user like 'mysqltest_%' order by host,db,user,table_name,column_name; select host,db,user,table_name,column_name from mysql.columns_priv where user like 'mysqltest_%' order by host,db,user,table_name,column_name;
--error 1141 --error ER_NONEXISTING_GRANT
show grants for 'mysqltest_1'; show grants for 'mysqltest_1';
# #
# Rename # Rename
...@@ -249,7 +253,7 @@ select host,db,user,table_name from mysql.tables_priv where user like 'mysqltest ...@@ -249,7 +253,7 @@ select host,db,user,table_name from mysql.tables_priv where user like 'mysqltest
select host,db,user,table_name,column_name from mysql.columns_priv where user like 'mysqltest_%' order by host,db,user,table_name,column_name; select host,db,user,table_name,column_name from mysql.columns_priv where user like 'mysqltest_%' order by host,db,user,table_name,column_name;
show grants for 'mysqltest_1'; show grants for 'mysqltest_1';
drop user 'mysqltest_1', 'mysqltest_3'; drop user 'mysqltest_1', 'mysqltest_3';
--error 1396 --error ER_CANNOT_USER
drop user 'mysqltest_1'; drop user 'mysqltest_1';
# #
# Cleanup # Cleanup
...@@ -258,9 +262,9 @@ drop table t1, t2; ...@@ -258,9 +262,9 @@ drop table t1, t2;
# Add a stray record # Add a stray record
insert into mysql.db set user='mysqltest_1', db='%', host='%'; insert into mysql.db set user='mysqltest_1', db='%', host='%';
flush privileges; flush privileges;
--error 1141 --error ER_NONEXISTING_GRANT
show grants for 'mysqltest_1'; show grants for 'mysqltest_1';
--error 1269 --error ER_REVOKE_GRANTS
revoke all privileges, grant option from 'mysqltest_1'; revoke all privileges, grant option from 'mysqltest_1';
drop user 'mysqltest_1'; drop user 'mysqltest_1';
select host,db,user from mysql.db where user = 'mysqltest_1' order by host,db,user; select host,db,user from mysql.db where user = 'mysqltest_1' order by host,db,user;
...@@ -268,7 +272,7 @@ select host,db,user from mysql.db where user = 'mysqltest_1' order by host,db,us ...@@ -268,7 +272,7 @@ select host,db,user from mysql.db where user = 'mysqltest_1' order by host,db,us
# Add a stray record # Add a stray record
insert into mysql.tables_priv set host='%', db='test', user='mysqltest_1', table_name='t1'; insert into mysql.tables_priv set host='%', db='test', user='mysqltest_1', table_name='t1';
flush privileges; flush privileges;
--error 1141 --error ER_NONEXISTING_GRANT
show grants for 'mysqltest_1'; show grants for 'mysqltest_1';
drop user 'mysqltest_1'; drop user 'mysqltest_1';
select host,db,user,table_name from mysql.tables_priv where user = 'mysqltest_1' order by host,db,user,table_name; select host,db,user,table_name from mysql.tables_priv where user = 'mysqltest_1' order by host,db,user,table_name;
...@@ -276,7 +280,7 @@ select host,db,user,table_name from mysql.tables_priv where user = 'mysqltest_1' ...@@ -276,7 +280,7 @@ select host,db,user,table_name from mysql.tables_priv where user = 'mysqltest_1'
# Add a stray record # Add a stray record
insert into mysql.columns_priv set host='%', db='test', user='mysqltest_1', table_name='t1', column_name='c1'; insert into mysql.columns_priv set host='%', db='test', user='mysqltest_1', table_name='t1', column_name='c1';
flush privileges; flush privileges;
--error 1141 --error ER_NONEXISTING_GRANT
show grants for 'mysqltest_1'; show grants for 'mysqltest_1';
drop user 'mysqltest_1'; drop user 'mysqltest_1';
select host,db,user,table_name,column_name from mysql.columns_priv where user = 'mysqltest_1' order by host,db,user,table_name,column_name; select host,db,user,table_name,column_name from mysql.columns_priv where user = 'mysqltest_1' order by host,db,user,table_name,column_name;
...@@ -286,23 +290,23 @@ create user 'mysqltest_1', 'mysqltest_2', 'mysqltest_3'; ...@@ -286,23 +290,23 @@ create user 'mysqltest_1', 'mysqltest_2', 'mysqltest_3';
drop user 'mysqltest_1', 'mysqltest_2', 'mysqltest_3'; drop user 'mysqltest_1', 'mysqltest_2', 'mysqltest_3';
create user 'mysqltest_1', 'mysqltest_2' identified by 'Mysqltest-2', 'mysqltest_3' identified by password 'fffffffffffffffffffffffffffffffffffffffff'; create user 'mysqltest_1', 'mysqltest_2' identified by 'Mysqltest-2', 'mysqltest_3' identified by password 'fffffffffffffffffffffffffffffffffffffffff';
rename user 'mysqltest_1' to 'mysqltest_1a', 'mysqltest_2' TO 'mysqltest_2a', 'mysqltest_3' TO 'mysqltest_3a'; rename user 'mysqltest_1' to 'mysqltest_1a', 'mysqltest_2' TO 'mysqltest_2a', 'mysqltest_3' TO 'mysqltest_3a';
--error 1396 --error ER_CANNOT_USER
drop user 'mysqltest_1', 'mysqltest_2', 'mysqltest_3'; drop user 'mysqltest_1', 'mysqltest_2', 'mysqltest_3';
drop user 'mysqltest_1a', 'mysqltest_2a', 'mysqltest_3a'; drop user 'mysqltest_1a', 'mysqltest_2a', 'mysqltest_3a';
# #
# Let one of multiple users fail # Let one of multiple users fail
create user 'mysqltest_1', 'mysqltest_2', 'mysqltest_3'; create user 'mysqltest_1', 'mysqltest_2', 'mysqltest_3';
--error 1396 --error ER_CANNOT_USER
create user 'mysqltest_1a', 'mysqltest_2', 'mysqltest_3a'; create user 'mysqltest_1a', 'mysqltest_2', 'mysqltest_3a';
--error 1396 --error ER_CANNOT_USER
rename user 'mysqltest_1a' to 'mysqltest_1b', 'mysqltest_2a' TO 'mysqltest_2b', 'mysqltest_3a' TO 'mysqltest_3b'; rename user 'mysqltest_1a' to 'mysqltest_1b', 'mysqltest_2a' TO 'mysqltest_2b', 'mysqltest_3a' TO 'mysqltest_3b';
drop user 'mysqltest_1', 'mysqltest_2', 'mysqltest_3'; drop user 'mysqltest_1', 'mysqltest_2', 'mysqltest_3';
--error 1396 --error ER_CANNOT_USER
drop user 'mysqltest_1b', 'mysqltest_2b', 'mysqltest_3b'; drop user 'mysqltest_1b', 'mysqltest_2b', 'mysqltest_3b';
# #
# Obsolete syntax has been dropped # Obsolete syntax has been dropped
create user 'mysqltest_2' identified by 'Mysqltest-2'; create user 'mysqltest_2' identified by 'Mysqltest-2';
--error 1064 --error ER_PARSE_ERROR
drop user 'mysqltest_2' identified by 'Mysqltest-2'; drop user 'mysqltest_2' identified by 'Mysqltest-2';
drop user 'mysqltest_2'; drop user 'mysqltest_2';
# #
...@@ -312,7 +316,7 @@ show grants for '%@b'@'b'; ...@@ -312,7 +316,7 @@ show grants for '%@b'@'b';
grant select on mysql.* to '%@b'@'b'; grant select on mysql.* to '%@b'@'b';
show grants for '%@b'@'b'; show grants for '%@b'@'b';
rename user '%@b'@'b' to '%@a'@'a'; rename user '%@b'@'b' to '%@a'@'a';
--error 1141 --error ER_NONEXISTING_GRANT
show grants for '%@b'@'b'; show grants for '%@b'@'b';
show grants for '%@a'@'a'; show grants for '%@a'@'a';
drop user '%@a'@'a'; drop user '%@a'@'a';
...@@ -323,7 +327,7 @@ create user mysqltest_2@localhost; ...@@ -323,7 +327,7 @@ create user mysqltest_2@localhost;
grant create user on *.* to mysqltest_2@localhost; grant create user on *.* to mysqltest_2@localhost;
connect (user3,localhost,mysqltest_2,,); connect (user3,localhost,mysqltest_2,,);
connection user3; connection user3;
--error 1142 --error ER_TABLEACCESS_DENIED_ERROR
select host,user,password from mysql.user where user like 'mysqltest_%' order by host,user,password; select host,user,password from mysql.user where user like 'mysqltest_%' order by host,user,password;
create user mysqltest_A@'%'; create user mysqltest_A@'%';
rename user mysqltest_A@'%' to mysqltest_B@'%'; rename user mysqltest_A@'%' to mysqltest_B@'%';
...@@ -338,7 +342,7 @@ grant INSERT,DELETE,UPDATE on mysql.* to mysqltest_3@localhost; ...@@ -338,7 +342,7 @@ grant INSERT,DELETE,UPDATE on mysql.* to mysqltest_3@localhost;
connect (user4,localhost,mysqltest_3,,); connect (user4,localhost,mysqltest_3,,);
connection user4; connection user4;
show grants; show grants;
--error 1142 --error ER_TABLEACCESS_DENIED_ERROR
select host,user,password from mysql.user where user like 'mysqltest_%' order by host,user,password; select host,user,password from mysql.user where user like 'mysqltest_%' order by host,user,password;
insert into mysql.user set host='%', user='mysqltest_B'; insert into mysql.user set host='%', user='mysqltest_B';
create user mysqltest_A@'%'; create user mysqltest_A@'%';
...@@ -349,7 +353,7 @@ disconnect user4; ...@@ -349,7 +353,7 @@ disconnect user4;
connection default; connection default;
drop user mysqltest_3@localhost; drop user mysqltest_3@localhost;
# #
# Bug #3309: Test IP addresses with netmask # Bug#3309 Test IP addresses with netmask
set @@sql_mode=''; set @@sql_mode='';
create database mysqltest_1; create database mysqltest_1;
create table mysqltest_1.t1 (i int); create table mysqltest_1.t1 (i int);
...@@ -367,7 +371,8 @@ flush privileges; ...@@ -367,7 +371,8 @@ flush privileges;
drop table mysqltest_1.t1; drop table mysqltest_1.t1;
# #
# Bug #12302: 'SET PASSWORD = ...' didn't work if connecting hostname != # Bug#12302 Hostname resolution preventing password changes
# 'SET PASSWORD = ...' didn't work if connecting hostname !=
# hostname the current user is authenticated as. Note that a test for this # hostname the current user is authenticated as. Note that a test for this
# was also added to the test above. # was also added to the test above.
# #
...@@ -400,7 +405,7 @@ drop database mysqltest_1; ...@@ -400,7 +405,7 @@ drop database mysqltest_1;
# But anonymous users can't change their password # But anonymous users can't change their password
connect (n5,localhost,test,,test,$MASTER_MYPORT,$MASTER_MYSOCK); connect (n5,localhost,test,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
connection n5; connection n5;
--error 1044 --error ER_DBACCESS_DENIED_ERROR
set password = password("changed"); set password = password("changed");
disconnect n5; disconnect n5;
connection default; connection default;
...@@ -408,7 +413,7 @@ connection default; ...@@ -408,7 +413,7 @@ connection default;
--source include/delete_anonymous_users.inc --source include/delete_anonymous_users.inc
# Bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in # Bug#12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in
# multi-threaded environment". We should be able to execute FLUSH # multi-threaded environment". We should be able to execute FLUSH
# PRIVILEGES and SET PASSWORD simultaneously with other account # PRIVILEGES and SET PASSWORD simultaneously with other account
# management commands (such as GRANT and REVOKE) without causing # management commands (such as GRANT and REVOKE) without causing
...@@ -471,12 +476,13 @@ connect (con1,localhost,mysqltest_1,password,TESTDB); ...@@ -471,12 +476,13 @@ connect (con1,localhost,mysqltest_1,password,TESTDB);
# The user mysqltest_1 should only be allowed access to # The user mysqltest_1 should only be allowed access to
# database TESTDB, not TEStdb # database TESTDB, not TEStdb
# On system with "lowercase names" we get error "1007: Can't create db..." # On system with "lowercase names" we get error "ER_DB_CREATE_EXISTS: Can't create db..."
--error 1044, 1007 --error ER_DBACCESS_DENIED_ERROR, ER_DB_CREATE_EXISTS
create database TEStdb; create database TEStdb;
# Clean-up # Clean-up
connection default; connection default;
disconnect con1;
delete from mysql.user; delete from mysql.user;
delete from mysql.db where host='%' and user='mysqltest_1' and db='TESTDB'; delete from mysql.db where host='%' and user='mysqltest_1' and db='TESTDB';
insert into mysql.user select * from t1; insert into mysql.user select * from t1;
...@@ -485,39 +491,39 @@ drop database TESTDB; ...@@ -485,39 +491,39 @@ drop database TESTDB;
flush privileges; flush privileges;
# #
# BUG#13310 incorrect user parsing by SP # Bug#13310 incorrect user parsing by SP
# #
SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators;
SET GLOBAL log_bin_trust_function_creators = 1; SET GLOBAL log_bin_trust_function_creators = 1;
grant all privileges on test.* to `a@`@localhost; GRANT ALL PRIVILEGES ON test.* TO `a@`@localhost;
grant execute on * to `a@`@localhost; GRANT EXECUTE ON * TO `a@`@localhost;
connect (bug13310,localhost,'a@',,test); connect (bug13310,localhost,'a@',,test);
connection bug13310; connection bug13310;
create table t2 (s1 int); CREATE TABLE t2 (s1 INT);
insert into t2 values (1); INSERT INTO t2 VALUES (1);
--disable_warnings --disable_warnings
drop function if exists f2; DROP FUNCTION IF EXISTS f2;
--enable_warnings --enable_warnings
delimiter //; delimiter //;
create function f2 () returns int CREATE FUNCTION f2 () RETURNS INT
begin declare v int; select s1 from t2 into v; return v; end// BEGIN DECLARE v INT; SELECT s1 FROM t2 INTO v; RETURN v; END//
delimiter ;// delimiter ;//
select f2(); SELECT f2();
drop function f2;
drop table t2;
disconnect bug13310;
DROP FUNCTION f2;
DROP TABLE t2;
disconnect bug13310;
connection default; connection default;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM `a@`@localhost; REVOKE ALL PRIVILEGES, GRANT OPTION FROM `a@`@localhost;
drop user `a@`@localhost; DROP USER `a@`@localhost;
SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators;
# #
# Bug#25578 "CREATE TABLE LIKE does not require any privileges on source table" # Bug#25578 CREATE TABLE LIKE does not require any privileges on source table
# #
--disable_warnings --disable_warnings
drop database if exists mysqltest_1; drop database if exists mysqltest_1;
...@@ -536,7 +542,7 @@ create table t1 (i int); ...@@ -536,7 +542,7 @@ create table t1 (i int);
connect (user1,localhost,mysqltest_u1,,mysqltest_1); connect (user1,localhost,mysqltest_u1,,mysqltest_1);
connection user1; connection user1;
# As expected error is emitted # As expected error is emitted
--error ER_TABLEACCESS_DENIED_ERROR --error ER_TABLEACCESS_DENIED_ERROR
show create table mysqltest_2.t1; show create table mysqltest_2.t1;
# This should emit error as well # This should emit error as well
--error ER_TABLEACCESS_DENIED_ERROR --error ER_TABLEACCESS_DENIED_ERROR
...@@ -551,14 +557,16 @@ create table t1 like mysqltest_2.t1; ...@@ -551,14 +557,16 @@ create table t1 like mysqltest_2.t1;
# Clean-up # Clean-up
connection default; connection default;
disconnect user1;
use test; use test;
drop database mysqltest_1; drop database mysqltest_1;
drop database mysqltest_2; drop database mysqltest_2;
drop user mysqltest_u1@localhost; drop user mysqltest_u1@localhost;
# #
# Bug#18660 Can't grant any privileges on single table in database # Bug#18660 Can't grant any privileges on single table in database
# with underscore char # with underscore char
# #
grant all on `mysqltest\_%`.* to mysqltest_1@localhost with grant option; grant all on `mysqltest\_%`.* to mysqltest_1@localhost with grant option;
grant usage on *.* to mysqltest_2@localhost; grant usage on *.* to mysqltest_2@localhost;
...@@ -572,7 +580,7 @@ grant create on `mysqltest\_1`.* to mysqltest_2@localhost; ...@@ -572,7 +580,7 @@ grant create on `mysqltest\_1`.* to mysqltest_2@localhost;
grant select on mysqltest_1.t1 to mysqltest_2@localhost; grant select on mysqltest_1.t1 to mysqltest_2@localhost;
connect (con3,localhost,mysqltest_2,,); connect (con3,localhost,mysqltest_2,,);
connection con3; connection con3;
--error 1044 --error ER_DBACCESS_DENIED_ERROR
create database mysqltest_3; create database mysqltest_3;
use mysqltest_1; use mysqltest_1;
create table t2(f1 int); create table t2(f1 int);
...@@ -580,6 +588,9 @@ select * from t1; ...@@ -580,6 +588,9 @@ select * from t1;
connection default; connection default;
drop database mysqltest_1; drop database mysqltest_1;
connection default;
disconnect con3;
disconnect con18600_1;
revoke all privileges, grant option from mysqltest_1@localhost; revoke all privileges, grant option from mysqltest_1@localhost;
revoke all privileges, grant option from mysqltest_2@localhost; revoke all privileges, grant option from mysqltest_2@localhost;
drop user mysqltest_1@localhost; drop user mysqltest_1@localhost;
...@@ -587,7 +598,7 @@ drop user mysqltest_2@localhost; ...@@ -587,7 +598,7 @@ drop user mysqltest_2@localhost;
# #
# Bug #30468: column level privileges not respected when joining tables # Bug#30468 column level privileges not respected when joining tables
# #
CREATE DATABASE db1; CREATE DATABASE db1;
...@@ -598,7 +609,7 @@ INSERT INTO t1 VALUES (1,1),(2,2); ...@@ -598,7 +609,7 @@ INSERT INTO t1 VALUES (1,1),(2,2);
CREATE TABLE t2 (b INT, c INT); CREATE TABLE t2 (b INT, c INT);
INSERT INTO t2 VALUES (1,100),(2,200); INSERT INTO t2 VALUES (1,100),(2,200);
GRANT SELECT ON t1 TO mysqltest1@localhost; GRANT SELECT ON t1 TO mysqltest1@localhost;
GRANT SELECT (b) ON t2 TO mysqltest1@localhost; GRANT SELECT (b) ON t2 TO mysqltest1@localhost;
connect (conn1,localhost,mysqltest1,,); connect (conn1,localhost,mysqltest1,,);
...@@ -613,6 +624,7 @@ SELECT * FROM t1 JOIN t2 USING (b); ...@@ -613,6 +624,7 @@ SELECT * FROM t1 JOIN t2 USING (b);
connection default; connection default;
disconnect conn1; disconnect conn1;
USE test;
DROP TABLE db1.t1, db1.t2; DROP TABLE db1.t1, db1.t2;
DROP USER mysqltest1@localhost; DROP USER mysqltest1@localhost;
DROP DATABASE db1; DROP DATABASE db1;
...@@ -620,3 +632,5 @@ DROP DATABASE db1; ...@@ -620,3 +632,5 @@ DROP DATABASE db1;
--echo End of 5.0 tests --echo End of 5.0 tests
# Wait till we reached the initial number of concurrent sessions
--source include/wait_until_count_sessions.inc
mysql-test/t/grant3.test
View file @ 99685a0b
# Can't run with embedded server # Can't run with embedded server because we use GRANT
-- source include/not_embedded.inc -- source include/not_embedded.inc
# Save the initial number of concurrent sessions
--source include/count_sessions.inc
# Test of GRANT commands # Test of GRANT commands
SET NAMES binary; SET NAMES binary;
...@@ -23,10 +27,11 @@ grant create user on *.* to mysqltest_1@localhost; ...@@ -23,10 +27,11 @@ grant create user on *.* to mysqltest_1@localhost;
grant select on `my\_1`.* to mysqltest_1@localhost with grant option; grant select on `my\_1`.* to mysqltest_1@localhost with grant option;
connect (user_a,localhost,mysqltest_1,,); connect (user_a,localhost,mysqltest_1,,);
connection user_a; connection user_a;
--error 1410 --error ER_CANT_CREATE_USER_WITH_GRANT
grant select on `my\_1`.* to mysqltest_2@localhost; grant select on `my\_1`.* to mysqltest_2@localhost;
create user mysqltest_2@localhost; create user mysqltest_2@localhost;
disconnect user_a; disconnect user_a;
disconnect master;
connection default; connection default;
delete from mysql.user where user like 'mysqltest\_%'; delete from mysql.user where user like 'mysqltest\_%';
...@@ -36,7 +41,7 @@ delete from mysql.columns_priv where user like 'mysqltest\_%'; ...@@ -36,7 +41,7 @@ delete from mysql.columns_priv where user like 'mysqltest\_%';
flush privileges; flush privileges;
# #
# Bug: #19828 Case sensitivity in Grant/Revoke # Bug#19828 Case sensitivity in Grant/Revoke
# #
grant select on test.* to CUser@localhost; grant select on test.* to CUser@localhost;
...@@ -137,7 +142,7 @@ DROP USER CUser2@LOCALHOST; ...@@ -137,7 +142,7 @@ DROP USER CUser2@LOCALHOST;
# #
# Bug#31194: Privilege ordering does not order properly for wildcard values # Bug#31194 Privilege ordering does not order properly for wildcard values
# #
CREATE DATABASE mysqltest_1; CREATE DATABASE mysqltest_1;
...@@ -160,3 +165,6 @@ DROP DATABASE mysqltest_1; ...@@ -160,3 +165,6 @@ DROP DATABASE mysqltest_1;
--echo End of 5.0 tests --echo End of 5.0 tests
# Wait till we reached the initial number of concurrent sessions
--source include/wait_until_count_sessions.inc
mysql-test/t/lock_tables_lost_commit.test
View file @ 99685a0b
# This is a test for bug 578 # Test for Bug#578 mysqlimport -l silently fails when binlog-ignore-db is set
-- source include/have_innodb.inc --source include/have_innodb.inc
# Save the initial number of concurrent sessions
--source include/count_sessions.inc
connect (con1,localhost,root,,); connect (con1,localhost,root,,);
connect (con2,localhost,root,,); connect (con2,localhost,root,,);
connection con1; connection con1;
--disable_warnings --disable_warnings
drop table if exists t1; DROP TABLE IF EXISTS t1;
create table t1(a int) engine=innodb; CREATE TABLE t1(a INT) ENGINE=innodb;
--enable_warnings --enable_warnings
lock tables t1 write; LOCK TABLES t1 WRITE;
insert into t1 values(10); INSERT INTO t1 VALUES(10);
disconnect con1; disconnect con1;
connection con2; connection con2;
# The bug was that, because of the LOCK TABLES, the handler "forgot" to commit, # The bug was that, because of the LOCK TABLES, the handler "forgot" to commit,
# and the other commit when we write to the binlog was not done because of # and the other commit when we write to the binlog was not done because of
# binlog-ignore-db # binlog-ignore-db
select * from t1; SELECT * FROM t1;
drop table t1; DROP TABLE t1;
connection default;
disconnect con2;
# End of 4.1 tests # End of 4.1 tests
# Wait till we reached the initial number of concurrent sessions
--source include/wait_until_count_sessions.inc
mysql-test/t/mysqldump.test
View file @ 99685a0b
...@@ -5,10 +5,13 @@ ...@@ -5,10 +5,13 @@
# Binlog is required # Binlog is required
--source include/have_log_bin.inc --source include/have_log_bin.inc
# Save the initial number of concurrent sessions
--source include/count_sessions.inc
--echo Bug#37938 - Test "mysqldump" lacks various insert statements
--echo Turn off concurrent inserts to avoid random errors --echo # Bug#37938 Test "mysqldump" lacks various insert statements
--echo NOTE: We reset the variable back to saved value at the end of test --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 @OLD_CONCURRENT_INSERT = @@GLOBAL.CONCURRENT_INSERT;
SET @@GLOBAL.CONCURRENT_INSERT = 0; SET @@GLOBAL.CONCURRENT_INSERT = 0;
...@@ -23,13 +26,13 @@ drop view if exists v1, v2, v3; ...@@ -23,13 +26,13 @@ drop view if exists v1, v2, v3;
# XML output # XML output
CREATE TABLE t1(a int, key (a)) key_block_size=1024; CREATE TABLE t1(a INT, KEY (a)) KEY_BLOCK_SIZE=1024;
INSERT INTO t1 VALUES (1), (2); INSERT INTO t1 VALUES (1), (2);
--exec $MYSQL_DUMP --skip-create --skip-comments -X test t1 --exec $MYSQL_DUMP --skip-create --skip-comments -X test t1
DROP TABLE t1; DROP TABLE t1;
--echo # --echo #
--echo # Bug #2005 --echo # Bug#2005 Long decimal comparison bug.
--echo # --echo #
CREATE TABLE t1 (a decimal(64, 20)); CREATE TABLE t1 (a decimal(64, 20));
...@@ -39,7 +42,7 @@ INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"), ...@@ -39,7 +42,7 @@ INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"),
DROP TABLE t1; DROP TABLE t1;
--echo # --echo #
--echo # Bug #2055 --echo # Bug#2055 mysqldump should replace "-inf" numeric field values with "NULL"
--echo # --echo #
CREATE TABLE t1 (a double); CREATE TABLE t1 (a double);
...@@ -51,7 +54,7 @@ INSERT INTO t1 VALUES ('-9e999999'); ...@@ -51,7 +54,7 @@ INSERT INTO t1 VALUES ('-9e999999');
DROP TABLE t1; DROP TABLE t1;
--echo # --echo #
--echo # Bug #3361 mysqldump quotes DECIMAL values inconsistently --echo # Bug#3361 mysqldump quotes DECIMAL values inconsistently
--echo # --echo #
CREATE TABLE t1 (a DECIMAL(10,5), b FLOAT); CREATE TABLE t1 (a DECIMAL(10,5), b FLOAT);
...@@ -65,7 +68,7 @@ INSERT INTO t1 VALUES ("1.2345", 2.3456); ...@@ -65,7 +68,7 @@ INSERT INTO t1 VALUES ("1.2345", 2.3456);
SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='ANSI_QUOTES'; SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='ANSI_QUOTES';
INSERT INTO t1 VALUES (1.2345, 2.3456); INSERT INTO t1 VALUES (1.2345, 2.3456);
INSERT INTO t1 VALUES ('1.2345', 2.3456); INSERT INTO t1 VALUES ('1.2345', 2.3456);
--error 1054 --error ER_BAD_FIELD_ERROR
INSERT INTO t1 VALUES ("1.2345", 2.3456); INSERT INTO t1 VALUES ("1.2345", 2.3456);
SET SQL_MODE=@OLD_SQL_MODE; SET SQL_MODE=@OLD_SQL_MODE;
...@@ -82,7 +85,7 @@ INSERT INTO t1 VALUES (1, "test", "tes"), (2, "TEST", "TES"); ...@@ -82,7 +85,7 @@ INSERT INTO t1 VALUES (1, "test", "tes"), (2, "TEST", "TES");
DROP TABLE t1; DROP TABLE t1;
--echo # --echo #
--echo # Bug #1707 --echo # Bug#1707 mysqldump -X does't quote field and table names
--echo # --echo #
CREATE TABLE t1 (`a"b"` char(2)); CREATE TABLE t1 (`a"b"` char(2));
...@@ -91,8 +94,8 @@ INSERT INTO t1 VALUES ("1\""), ("\"2"); ...@@ -91,8 +94,8 @@ INSERT INTO t1 VALUES ("1\""), ("\"2");
DROP TABLE t1; DROP TABLE t1;
--echo # --echo #
--echo # Bug #1994 --echo # Bug#1994 mysqldump does not correctly dump UCS2 data
--echo # Bug #4261 --echo # Bug#4261 mysqldump 10.7 (mysql 4.1.2) --skip-extended-insert drops NULL from inserts
--echo # --echo #
CREATE TABLE t1 (a VARCHAR(255)) DEFAULT CHARSET koi8r; CREATE TABLE t1 (a VARCHAR(255)) DEFAULT CHARSET koi8r;
...@@ -101,7 +104,7 @@ INSERT INTO t1 VALUES (_koi8r x'C1C2C3C4C5'), (NULL); ...@@ -101,7 +104,7 @@ INSERT INTO t1 VALUES (_koi8r x'C1C2C3C4C5'), (NULL);
DROP TABLE t1; DROP TABLE t1;
--echo # --echo #
--echo # Bug #2634 --echo # Bug#2634 mysqldump in --compatible=mysql4
--echo # --echo #
CREATE TABLE t1 (a int) ENGINE=MYISAM; CREATE TABLE t1 (a int) ENGINE=MYISAM;
...@@ -111,7 +114,7 @@ INSERT INTO t1 VALUES (1), (2); ...@@ -111,7 +114,7 @@ INSERT INTO t1 VALUES (1), (2);
DROP TABLE t1; DROP TABLE t1;
--echo # --echo #
--echo # Bug #2592 'mysqldump doesn't quote "tricky" names correctly' --echo # Bug#2592 mysqldump doesn't quote "tricky" names correctly
--echo # --echo #
create table ```a` (i int); create table ```a` (i int);
...@@ -119,7 +122,7 @@ create table ```a` (i int); ...@@ -119,7 +122,7 @@ create table ```a` (i int);
drop table ```a`; drop table ```a`;
--echo # --echo #
--echo # Bug #2591 "mysqldump quotes names inconsistently" --echo # Bug#2591 mysqldump quotes names inconsistently
--echo # --echo #
create table t1(a int); create table t1(a int);
...@@ -132,7 +135,7 @@ set global sql_mode=''; ...@@ -132,7 +135,7 @@ set global sql_mode='';
drop table t1; drop table t1;
--echo # --echo #
--echo # Bug #2705 'mysqldump --tab extra output' --echo # Bug#2705 mysqldump --tab extra output
--echo # --echo #
create table t1(a int); create table t1(a int);
...@@ -148,7 +151,7 @@ insert into t1 values (1),(2),(3); ...@@ -148,7 +151,7 @@ insert into t1 values (1),(2),(3);
drop table t1; drop table t1;
--echo # --echo #
--echo # Bug #6101: create database problem --echo # Bug#6101 create database problem
--echo # --echo #
--exec $MYSQL_DUMP --skip-comments --databases test --exec $MYSQL_DUMP --skip-comments --databases test
...@@ -158,7 +161,7 @@ create database mysqldump_test_db character set latin2 collate latin2_bin; ...@@ -158,7 +161,7 @@ create database mysqldump_test_db character set latin2 collate latin2_bin;
drop database mysqldump_test_db; drop database mysqldump_test_db;
--echo # --echo #
--echo # Bug #7020 --echo # Bug#7020 mysqldump --compatible=mysql40 should set --skip-set-charset --default-char...
--echo # Check that we don't dump in UTF8 in compatible mode by default, --echo # Check that we don't dump in UTF8 in compatible mode by default,
--echo # but use the default compiled values, or the values given in --echo # but use the default compiled values, or the values given in
--echo # --default-character-set=xxx. However, we should dump in UTF8 --echo # --default-character-set=xxx. However, we should dump in UTF8
...@@ -169,8 +172,8 @@ INSERT INTO t1 VALUES (_latin1 ' ...@@ -169,8 +172,8 @@ INSERT INTO t1 VALUES (_latin1 '
--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments test t1 --exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments test t1
--echo # --echo #
--echo # Bug#8063: make test mysqldump [ fail ] --echo # Bug#8063 make test mysqldump [ fail ]
--echo # We cannot tes this command because its output depends --echo # We cannot test this command because its output depends
--echo # on --default-character-set incompiled into "mysqldump" program. --echo # on --default-character-set incompiled into "mysqldump" program.
--echo # If the future we can move this command into a separate test with --echo # If the future we can move this command into a separate test with
--echo # checking that "mysqldump" is compiled with "latin1" --echo # checking that "mysqldump" is compiled with "latin1"
...@@ -183,7 +186,7 @@ INSERT INTO t1 VALUES (_latin1 ' ...@@ -183,7 +186,7 @@ INSERT INTO t1 VALUES (_latin1 '
DROP TABLE t1; DROP TABLE t1;
--echo # --echo #
--echo # WL #2319: Exclude Tables from dump --echo # WL#2319 Exclude Tables from dump
--echo # --echo #
CREATE TABLE t1 (a int); CREATE TABLE t1 (a int);
...@@ -195,7 +198,7 @@ DROP TABLE t1; ...@@ -195,7 +198,7 @@ DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;
--echo # --echo #
--echo # Bug #8830 --echo # Bug#8830 mysqldump --skip-extended-insert causes --hex-blob to dump wrong values
--echo # --echo #
CREATE TABLE t1 (`b` blob); CREATE TABLE t1 (`b` blob);
...@@ -207,7 +210,7 @@ DROP TABLE t1; ...@@ -207,7 +210,7 @@ DROP TABLE t1;
--echo # Test for --insert-ignore --echo # Test for --insert-ignore
--echo # --echo #
CREATE TABLE t1 (a int); CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES (1),(2),(3); INSERT INTO t1 VALUES (1),(2),(3);
INSERT INTO t1 VALUES (4),(5),(6); INSERT INTO t1 VALUES (4),(5),(6);
--exec $MYSQL_DUMP --skip-comments --insert-ignore test t1 --exec $MYSQL_DUMP --skip-comments --insert-ignore test t1
...@@ -215,9 +218,9 @@ INSERT INTO t1 VALUES (4),(5),(6); ...@@ -215,9 +218,9 @@ INSERT INTO t1 VALUES (4),(5),(6);
DROP TABLE t1; DROP TABLE t1;
--echo # --echo #
--echo # Bug #10286: mysqldump -c crashes on table that has many fields with long --echo # Bug#10286 mysqldump -c crashes on table that has many fields with long
--echo # names --echo # names
--echo # --echo #
create table t1 ( create table t1 (
F_c4ca4238a0b923820dcc509a6f75849b int, F_c4ca4238a0b923820dcc509a6f75849b int,
F_c81e728d9d4c2f636f067f89cc14862c int, F_c81e728d9d4c2f636f067f89cc14862c int,
...@@ -563,7 +566,7 @@ INSERT INTO t1 VALUES (1),(2),(3); ...@@ -563,7 +566,7 @@ INSERT INTO t1 VALUES (1),(2),(3);
DROP TABLE t1; DROP TABLE t1;
--echo # --echo #
--echo # Bug #9558 mysqldump --no-data db t1 t2 format still dumps data --echo # Bug#9558 mysqldump --no-data db t1 t2 format still dumps data
--echo # --echo #
CREATE DATABASE mysqldump_test_db; CREATE DATABASE mysqldump_test_db;
...@@ -582,7 +585,7 @@ DROP DATABASE mysqldump_test_db; ...@@ -582,7 +585,7 @@ DROP DATABASE mysqldump_test_db;
--echo # --echo #
--echo # Testing with tables and databases that don't exists --echo # Testing with tables and databases that don't exists
--echo # or contains illegal characters --echo # or contains illegal characters
--echo # (Bug #9358 mysqldump crashes if tablename starts with \) --echo # (Bug#9358 mysqldump crashes if tablename starts with \)
--echo # --echo #
create database mysqldump_test_db; create database mysqldump_test_db;
use mysqldump_test_db; use mysqldump_test_db;
...@@ -601,7 +604,7 @@ select '------ Testing with illegal table names ------' as test_sequence ; ...@@ -601,7 +604,7 @@ select '------ Testing with illegal table names ------' as test_sequence ;
--error 6 --error 6
--exec $MYSQL_DUMP --compact --skip-comments mysqldump_test_db "\\t1" 2>&1 --exec $MYSQL_DUMP --compact --skip-comments mysqldump_test_db "\\t1" 2>&1
--error 6 --error 6
--exec $MYSQL_DUMP --compact --skip-comments mysqldump_test_db "\\\\t1" 2>&1 --exec $MYSQL_DUMP --compact --skip-comments mysqldump_test_db "\\\\t1" 2>&1
...@@ -644,7 +647,7 @@ use test; ...@@ -644,7 +647,7 @@ use test;
--echo # --echo #
--echo # Bug #9657 mysqldump xml ( -x ) does not format NULL fields correctly --echo # Bug#9657 mysqldump xml ( -x ) does not format NULL fields correctly
--echo # --echo #
create table t1 (a int(10)); create table t1 (a int(10));
...@@ -655,8 +658,9 @@ insert into t2 (a, b) values (NULL, NULL),(10, NULL),(NULL, "twenty"),(30, "thir ...@@ -655,8 +658,9 @@ insert into t2 (a, b) values (NULL, NULL),(10, NULL),(NULL, "twenty"),(30, "thir
--exec $MYSQL_DUMP --skip-comments --xml --no-create-info test --exec $MYSQL_DUMP --skip-comments --xml --no-create-info test
drop table t1, t2; drop table t1, t2;
--echo # --echo #
--echo # BUG #12123 --echo # Bug#12123 mysqldump --tab results in text file which can't be imported
--echo # --echo #
create table t1 (a text character set utf8, b text character set latin1); create table t1 (a text character set utf8, b text character set latin1);
...@@ -669,14 +673,15 @@ select * from t1; ...@@ -669,14 +673,15 @@ select * from t1;
drop table t1; drop table t1;
--echo # --echo #
--echo # BUG#15328 Segmentation fault occured if my.cnf is invalid for escape sequence --echo # Bug#15328 Segmentation fault occured if my.cnf is invalid for escape sequence
--echo # --echo #
--exec $MYSQL_MY_PRINT_DEFAULTS --config-file=$MYSQL_TEST_DIR/std_data/bug15328.cnf mysqldump --exec $MYSQL_MY_PRINT_DEFAULTS --config-file=$MYSQL_TEST_DIR/std_data/bug15328.cnf mysqldump
--echo # --echo #
--echo # BUG #19025 mysqldump doesn't correctly dump "auto_increment = [int]" --echo # Bug#19025 mysqldump doesn't correctly dump "auto_increment = [int]"
--echo # --echo #
create table `t1` ( create table `t1` (
...@@ -704,9 +709,11 @@ select * from t1; ...@@ -704,9 +709,11 @@ select * from t1;
show create table `t1`; show create table `t1`;
drop table `t1`; drop table `t1`;
--remove_file $MYSQLTEST_VARDIR/tmp/bug19025.sql
--echo # --echo #
--echo # Bug #18536: wrong table order --echo # Bug#18536 wrong table order
--echo # --echo #
create table t1(a int); create table t1(a int);
...@@ -716,8 +723,9 @@ create table t3(a int); ...@@ -716,8 +723,9 @@ create table t3(a int);
--exec $MYSQL_DUMP --skip-comments --force --no-data test t3 t1 non_existing t2 --exec $MYSQL_DUMP --skip-comments --force --no-data test t3 t1 non_existing t2
drop table t1, t2, t3; drop table t1, t2, t3;
--echo # --echo #
--echo # Bug #21288: mysqldump segmentation fault when using --where --echo # Bug#21288 mysqldump segmentation fault when using --where
--echo # --echo #
create table t1 (a int); create table t1 (a int);
...@@ -725,8 +733,9 @@ create table t1 (a int); ...@@ -725,8 +733,9 @@ create table t1 (a int);
--exec $MYSQL_DUMP --skip-comments --force test t1 --where="xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 2>&1 --exec $MYSQL_DUMP --skip-comments --force test t1 --where="xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 2>&1
drop table t1; drop table t1;
--echo # --echo #
--echo # BUG#13926: --order-by-primary fails if PKEY contains quote character --echo # Bug#13926 --order-by-primary fails if PKEY contains quote character
--echo # --echo #
--disable_warnings --disable_warnings
...@@ -746,8 +755,9 @@ DROP TABLE `t1`; ...@@ -746,8 +755,9 @@ DROP TABLE `t1`;
--echo End of 4.1 tests --echo End of 4.1 tests
--echo # --echo #
--echo # Bug #10213 mysqldump crashes when dumping VIEWs(on MacOS X) --echo # Bug#10213 mysqldump crashes when dumping VIEWs(on MacOS X)
--echo # --echo #
create database db1; create database db1;
...@@ -770,8 +780,9 @@ drop view v2; ...@@ -770,8 +780,9 @@ drop view v2;
drop database db1; drop database db1;
use test; use test;
--echo # --echo #
--echo # Bug 10713 mysqldump includes database in create view and referenced tables --echo # Bug#10713 mysqldump includes database in create view and referenced tables
--echo # --echo #
# create table and views in db2 # create table and views in db2
...@@ -805,10 +816,11 @@ select * from t2 order by a; ...@@ -805,10 +816,11 @@ select * from t2 order by a;
drop table t1, t2; drop table t1, t2;
drop database db1; drop database db1;
use test; use test;
--remove_file $MYSQLTEST_VARDIR/tmp/bug10713.sql
--echo # #
--echo # dump of view # dump of view
--echo # #
create table t1(a int); create table t1(a int);
create view v1 as select * from t1; create view v1 as select * from t1;
...@@ -816,8 +828,9 @@ create view v1 as select * from t1; ...@@ -816,8 +828,9 @@ create view v1 as select * from t1;
drop view v1; drop view v1;
drop table t1; drop table t1;
--echo # --echo #
--echo # Bug #10213 mysqldump crashes when dumping VIEWs(on MacOS X) --echo # Bug#10213 mysqldump crashes when dumping VIEWs(on MacOS X)
--echo # --echo #
create database mysqldump_test_db; create database mysqldump_test_db;
...@@ -841,7 +854,7 @@ drop database mysqldump_test_db; ...@@ -841,7 +854,7 @@ drop database mysqldump_test_db;
use test; use test;
--echo # --echo #
--echo # Bug #9756 --echo # Bug#9756 mysql client failing on dumps containing certain \ sequences
--echo # --echo #
CREATE TABLE t1 (a char(10)); CREATE TABLE t1 (a char(10));
...@@ -850,7 +863,7 @@ INSERT INTO t1 VALUES ('\''); ...@@ -850,7 +863,7 @@ INSERT INTO t1 VALUES ('\'');
DROP TABLE t1; DROP TABLE t1;
--echo # --echo #
--echo # Bug #10927 mysqldump: Can't reload dump with view that consist of other view --echo # Bug#10927 mysqldump: Can't reload dump with view that consist of other view
--echo # --echo #
create table t1(a int, b int, c varchar(30)); create table t1(a int, b int, c varchar(30));
...@@ -922,7 +935,9 @@ show triggers; ...@@ -922,7 +935,9 @@ show triggers;
DROP TABLE t1, t2; DROP TABLE t1, t2;
--echo # --echo #
--echo # Bugs #9136, #12917: problems with --defaults-extra-file option --echo # Bug#9136 my_print_defaults changed behaviour between 4.1.7 and 4.1.10a
--echo # Bug#12917 The --defaults-extra-file option is ignored by the 5.0 client binaries
--echo # (Problems with --defaults-extra-file option)
--echo # --echo #
--write_file $MYSQLTEST_VARDIR/tmp/tmp.cnf --write_file $MYSQLTEST_VARDIR/tmp/tmp.cnf
...@@ -934,7 +949,7 @@ EOF ...@@ -934,7 +949,7 @@ EOF
--remove_file $MYSQLTEST_VARDIR/tmp/tmp.cnf --remove_file $MYSQLTEST_VARDIR/tmp/tmp.cnf
--echo # --echo #
--echo # Test of fix to BUG 12597 --echo # Test of fix to Bug#12597 mysqldump dumps triggers wrongly
--echo # --echo #
DROP TABLE IF EXISTS `test1`; DROP TABLE IF EXISTS `test1`;
...@@ -970,9 +985,11 @@ SELECT * FROM `test2`; ...@@ -970,9 +985,11 @@ SELECT * FROM `test2`;
DROP TRIGGER testref; DROP TRIGGER testref;
DROP TABLE test1; DROP TABLE test1;
DROP TABLE test2; DROP TABLE test2;
--remove_file $MYSQLTEST_VARDIR/tmp/mysqldump.sql
--echo # --echo #
--echo # BUG#9056 - mysqldump does not dump routines --echo # Bug#9056 mysqldump does not dump routines
--echo # --echo #
--disable_warnings --disable_warnings
...@@ -998,9 +1015,9 @@ begin ...@@ -998,9 +1015,9 @@ begin
return f1; return f1;
end // end //
CREATE PROCEDURE bug9056_proc2(OUT a INT) CREATE PROCEDURE bug9056_proc2(OUT a INT)
BEGIN BEGIN
select sum(id) from t1 into a; select sum(id) from t1 into a;
END // END //
DELIMITER ;// DELIMITER ;//
...@@ -1009,7 +1026,7 @@ set sql_mode='ansi'; ...@@ -1009,7 +1026,7 @@ set sql_mode='ansi';
create procedure `a'b` () select 1; # to fix syntax highlighting :') create procedure `a'b` () select 1; # to fix syntax highlighting :')
set sql_mode=''; set sql_mode='';
# Dump the DB and ROUTINES # Dump the DB and ROUTINES
--exec $MYSQL_DUMP --skip-comments --routines --databases test --exec $MYSQL_DUMP --skip-comments --routines --databases test
# ok, now blow it all away # ok, now blow it all away
...@@ -1020,8 +1037,9 @@ DROP PROCEDURE bug9056_proc2; ...@@ -1020,8 +1037,9 @@ DROP PROCEDURE bug9056_proc2;
DROP PROCEDURE `a'b`; DROP PROCEDURE `a'b`;
drop table t1; drop table t1;
--echo # --echo #
--echo # BUG# 13052 - mysqldump timestamp reloads broken --echo # Bug#13052 mysqldump timestamp reloads broken
--echo # --echo #
--disable_warnings --disable_warnings
...@@ -1044,7 +1062,7 @@ set global time_zone=default; ...@@ -1044,7 +1062,7 @@ set global time_zone=default;
set time_zone=default; set time_zone=default;
--echo # --echo #
--echo # Test of fix to BUG 13146 - ansi quotes break loading of triggers --echo # Test of fix to Bug#13146 ansi quotes break loading of triggers
--echo # --echo #
--disable_warnings --disable_warnings
...@@ -1069,7 +1087,7 @@ INSERT INTO `t1 test` VALUES (1); ...@@ -1069,7 +1087,7 @@ INSERT INTO `t1 test` VALUES (1);
INSERT INTO `t1 test` VALUES (2); INSERT INTO `t1 test` VALUES (2);
INSERT INTO `t1 test` VALUES (3); INSERT INTO `t1 test` VALUES (3);
SELECT * FROM `t2 test`; SELECT * FROM `t2 test`;
# dump with compatible=ansi. Everything except triggers should be double # dump with compatible=ansi. Everything except triggers should be double
# quoted # quoted
--exec $MYSQL_DUMP --skip-comments --compatible=ansi --triggers test --exec $MYSQL_DUMP --skip-comments --compatible=ansi --triggers test
...@@ -1078,7 +1096,7 @@ DROP TABLE `t1 test`; ...@@ -1078,7 +1096,7 @@ DROP TABLE `t1 test`;
DROP TABLE `t2 test`; DROP TABLE `t2 test`;
--echo # --echo #
--echo # BUG# 12838 mysqldump -x with views exits with error --echo # Bug#12838 mysqldump -x with views exits with error
--echo # --echo #
--disable_warnings --disable_warnings
...@@ -1095,13 +1113,14 @@ create view v2 as select * from v0; ...@@ -1095,13 +1113,14 @@ create view v2 as select * from v0;
select * from v2; select * from v2;
--exec $MYSQL_DUMP -x --skip-comments --databases test --exec $MYSQL_DUMP -x --skip-comments --databases test
drop view v2; drop view v2;
drop view v0; drop view v0;
drop view v1; drop view v1;
drop table t1; drop table t1;
--echo # --echo #
--echo # BUG#14554 - mysqldump does not separate words "ROW" and "BEGIN" --echo # Bug#14554 mysqldump does not separate words "ROW" and "BEGIN"
--echo # for tables with trigger created in the IGNORE_SPACE sql mode. --echo # for tables with trigger created in the IGNORE_SPACE sql mode.
--echo # --echo #
...@@ -1125,8 +1144,8 @@ DROP TRIGGER tr1; ...@@ -1125,8 +1144,8 @@ DROP TRIGGER tr1;
DROP TABLE t1; DROP TABLE t1;
--echo # --echo #
--echo # Bug #13318: Bad result with empty field and --hex-blob --echo # Bug#13318 Bad result with empty field and --hex-blob
--echo # --echo #
create table t1 (a binary(1), b blob); create table t1 (a binary(1), b blob);
insert into t1 values ('',''); insert into t1 values ('','');
...@@ -1135,7 +1154,7 @@ insert into t1 values ('',''); ...@@ -1135,7 +1154,7 @@ insert into t1 values ('','');
drop table t1; drop table t1;
--echo # --echo #
--echo # Bug 14871 Invalid view dump output --echo # Bug#14871 Invalid view dump output
--echo # --echo #
create table t1 (a int); create table t1 (a int);
...@@ -1162,9 +1181,11 @@ select * from v3 order by a; ...@@ -1162,9 +1181,11 @@ select * from v3 order by a;
drop table t1; drop table t1;
drop view v1, v2, v3, v4, v5; drop view v1, v2, v3, v4, v5;
--remove_file $MYSQLTEST_VARDIR/tmp/bug14871.sql
--echo # --echo #
--echo # Bug #16878 dump of trigger --echo # Bug#16878 dump of trigger
--echo # --echo #
create table t1 (a int, created datetime); create table t1 (a int, created datetime);
...@@ -1192,6 +1213,8 @@ show triggers; ...@@ -1192,6 +1213,8 @@ show triggers;
drop trigger tr1; drop trigger tr1;
drop trigger tr2; drop trigger tr2;
drop table t1, t2; drop table t1, t2;
--remove_file $MYSQLTEST_VARDIR/tmp/bug16878.sql
--echo # --echo #
--echo # Bug#18462 mysqldump does not dump view structures correctly --echo # Bug#18462 mysqldump does not dump view structures correctly
...@@ -1211,11 +1234,15 @@ create view v2 as select qty from v1; ...@@ -1211,11 +1234,15 @@ create view v2 as select qty from v1;
drop view v1; drop view v1;
drop view v2; drop view v2;
drop table t; drop table t;
--remove_file $MYSQLTEST_VARDIR/tmp/v1.sql
--remove_file $MYSQLTEST_VARDIR/tmp/v2.sql
--remove_file $MYSQLTEST_VARDIR/tmp/t.sql
--remove_file $MYSQLTEST_VARDIR/tmp/t.txt
--echo # --echo #
--echo # Bug#14857 Reading dump files with single statement stored routines fails. --echo # Bug#14857 Reading dump files with single statement stored routines fails.
--echo # fixed by patch for bug#16878 --echo # fixed by patch for Bug#16878
--echo # --echo #
DELIMITER |; DELIMITER |;
...@@ -1230,7 +1257,7 @@ drop function f; ...@@ -1230,7 +1257,7 @@ drop function f;
drop procedure p; drop procedure p;
--echo # --echo #
--echo # Bug #17371 Unable to dump a schema with invalid views --echo # Bug#17371 Unable to dump a schema with invalid views
--echo # --echo #
create table t1 ( id serial ); create table t1 ( id serial );
...@@ -1243,7 +1270,8 @@ drop table t1; ...@@ -1243,7 +1270,8 @@ drop table t1;
--echo } mysqldump --echo } mysqldump
drop view v1; drop view v1;
--echo # BUG#17201 Spurious 'DROP DATABASE' in output,
--echo # Bug#17201 Spurious 'DROP DATABASE' in output,
--echo # also confusion between tables and views. --echo # also confusion between tables and views.
--echo # Example code from Markus Popp --echo # Example code from Markus Popp
...@@ -1260,8 +1288,9 @@ drop view v1; ...@@ -1260,8 +1288,9 @@ drop view v1;
drop table t1; drop table t1;
drop database mysqldump_test_db; drop database mysqldump_test_db;
--echo # --echo #
--echo # Bug21014 Segmentation fault of mysqldump on view --echo # Bug#21014 Segmentation fault of mysqldump on view
--echo # --echo #
create database mysqldump_tables; create database mysqldump_tables;
...@@ -1280,7 +1309,7 @@ drop table mysqldump_tables.basetable; ...@@ -1280,7 +1309,7 @@ drop table mysqldump_tables.basetable;
drop database mysqldump_tables; drop database mysqldump_tables;
--echo # --echo #
--echo # Bug20221 Dumping of multiple databases containing view(s) yields maleformed dumps --echo # Bug#20221 Dumping of multiple databases containing view(s) yields maleformed dumps
--echo # --echo #
create database mysqldump_dba; create database mysqldump_dba;
...@@ -1318,6 +1347,7 @@ use mysqldump_dbb; ...@@ -1318,6 +1347,7 @@ use mysqldump_dbb;
drop view v1; drop view v1;
drop table t1; drop table t1;
drop database mysqldump_dbb; drop database mysqldump_dbb;
--remove_file $MYSQLTEST_VARDIR/tmp/bug20221_backup
use test; use test;
--echo # --echo #
...@@ -1364,11 +1394,12 @@ grant REPLICATION CLIENT on *.* to mysqltest_1@localhost; ...@@ -1364,11 +1394,12 @@ grant REPLICATION CLIENT on *.* to mysqltest_1@localhost;
drop table t1; drop table t1;
drop user mysqltest_1@localhost; drop user mysqltest_1@localhost;
--echo # --echo #
--echo # Bug #21527 mysqldump incorrectly tries to LOCK TABLES on the --echo # Bug#21527 mysqldump incorrectly tries to LOCK TABLES on the
--echo # information_schema database. --echo # information_schema database.
--echo # --echo #
--echo # Bug #21424 mysqldump failing to export/import views --echo # Bug#21424 mysqldump failing to export/import views
--echo # --echo #
# Do as root # Do as root
...@@ -1389,7 +1420,7 @@ create table u1 (f1 int); ...@@ -1389,7 +1420,7 @@ create table u1 (f1 int);
insert into u1 values (4); insert into u1 values (4);
create view v1 (c1) as select * from t1; create view v1 (c1) as select * from t1;
# Backup should not fail for Bug #21527. Flush priviliges test begins. # Backup should not fail for Bug#21527. Flush priviliges test begins.
--exec $MYSQL_DUMP --skip-comments --add-drop-table --flush-privileges --ignore-table=mysql.general_log --ignore-table=mysql.slow_log --databases mysqldump_myDB mysql > $MYSQLTEST_VARDIR/tmp/bug21527.sql --exec $MYSQL_DUMP --skip-comments --add-drop-table --flush-privileges --ignore-table=mysql.general_log --ignore-table=mysql.slow_log --databases mysqldump_myDB mysql > $MYSQLTEST_VARDIR/tmp/bug21527.sql
# Clean up # Clean up
...@@ -1403,8 +1434,9 @@ drop user myDB_User@localhost; ...@@ -1403,8 +1434,9 @@ drop user myDB_User@localhost;
drop database mysqldump_myDB; drop database mysqldump_myDB;
flush privileges; flush privileges;
--echo # Bug #21424 continues from here.
--echo # Restore. Flush Privileges test ends. --echo # Bug#21424 continues from here.
--echo # Restore. Flush Privileges test ends.
--echo # --echo #
--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug21527.sql --exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug21527.sql
...@@ -1417,8 +1449,9 @@ use mysqldump_myDB; ...@@ -1417,8 +1449,9 @@ use mysqldump_myDB;
select * from mysqldump_myDB.v1; select * from mysqldump_myDB.v1;
select * from mysqldump_myDB.u1; select * from mysqldump_myDB.u1;
#Final cleanup. # Final cleanup.
connection root; connection root;
disconnect user1;
use mysqldump_myDB; use mysqldump_myDB;
drop view v1; drop view v1;
drop table t1; drop table t1;
...@@ -1426,10 +1459,14 @@ drop table u1; ...@@ -1426,10 +1459,14 @@ drop table u1;
revoke all privileges on mysqldump_myDB.* from myDB_User@localhost; revoke all privileges on mysqldump_myDB.* from myDB_User@localhost;
drop user myDB_User@localhost; drop user myDB_User@localhost;
drop database mysqldump_myDB; drop database mysqldump_myDB;
connection default;
disconnect root;
--remove_file $MYSQLTEST_VARDIR/tmp/bug21527.sql
use test; use test;
--echo # --echo #
--echo # Bug #19745: mysqldump --xml produces invalid xml --echo # Bug#19745 mysqldump --xml produces invalid xml
--echo # --echo #
--disable_warnings --disable_warnings
...@@ -1444,9 +1481,8 @@ INSERT INTO t1 VALUES(1,0xff00fef0); ...@@ -1444,9 +1481,8 @@ INSERT INTO t1 VALUES(1,0xff00fef0);
DROP TABLE t1; DROP TABLE t1;
--echo # --echo #
--echo # Bug#26346: stack + buffer overrun in mysqldump --echo # Bug#26346 stack + buffer overrun in mysqldump
--echo # --echo #
CREATE TABLE t1(a int); CREATE TABLE t1(a int);
...@@ -1467,18 +1503,20 @@ INSERT INTO t1 VALUES (1), (2); ...@@ -1467,18 +1503,20 @@ INSERT INTO t1 VALUES (1), (2);
DROP TABLE t1; DROP TABLE t1;
# #
# Bug #25993: crashe with a merge table and -c # Bug#25993 crashes with a merge table and -c
# #
CREATE TABLE t2 (a int); CREATE TABLE t2 (a INT);
CREATE TABLE t3 (a int); CREATE TABLE t3 (a INT);
CREATE TABLE t1 (a int) ENGINE=merge UNION=(t2, t3); CREATE TABLE t1 (a INT) ENGINE=merge UNION=(t2, t3);
--exec $MYSQL_DUMP --skip-comments -c test --exec $MYSQL_DUMP --skip-comments -c test
DROP TABLE t1, t2, t3; DROP TABLE t1, t2, t3;
--echo # --echo #
--echo # Bug #23491: MySQLDump prefix function call in a view by database name --echo # Bug#23491 MySQLDump prefix function call in a view by database name
--echo # --echo #
# Setup # Setup
...@@ -1508,13 +1546,16 @@ show create view bug23491_restore.v3; ...@@ -1508,13 +1546,16 @@ show create view bug23491_restore.v3;
drop database bug23491_original; drop database bug23491_original;
drop database bug23491_restore; drop database bug23491_restore;
use test; use test;
--remove_file $MYSQLTEST_VARDIR/tmp/bug23491_backup.sql
--echo #
--echo # Bug 27293: mysqldump crashes when dumping routines
--echo # defined by a different user
--echo # --echo #
--echo # Bug #22761: mysqldump reports no errors when using --echo # Bug#27293 mysqldump crashes when dumping routines
--echo # --routines without mysql.proc privileges --echo # defined by a different user
--echo #
--echo # Bug#22761 mysqldump reports no errors when using
--echo # --routines without mysql.proc privileges
--echo # --echo #
create database mysqldump_test_db; create database mysqldump_test_db;
...@@ -1535,13 +1576,14 @@ create procedure mysqldump_test_db.sp1() select 'hello'; ...@@ -1535,13 +1576,14 @@ create procedure mysqldump_test_db.sp1() select 'hello';
drop procedure sp1; drop procedure sp1;
connection default; connection default;
disconnect user27293;
drop user user1; drop user user1;
drop user user2; drop user user2;
drop database mysqldump_test_db; drop database mysqldump_test_db;
--echo # --echo #
--echo # Bug #28522: buffer overrun by '\0' byte using --hex-blob. --echo # Bug#28522 buffer overrun by '\0' byte using --hex-blob.
--echo # --echo #
CREATE TABLE t1 (c1 INT, c2 LONGBLOB); CREATE TABLE t1 (c1 INT, c2 LONGBLOB);
...@@ -1550,8 +1592,8 @@ INSERT INTO t1 SET c1=11, c2=REPEAT('q',509); ...@@ -1550,8 +1592,8 @@ INSERT INTO t1 SET c1=11, c2=REPEAT('q',509);
DROP TABLE t1; DROP TABLE t1;
--echo # --echo #
--echo # Bug #28524: mysqldump --skip-add-drop-table is not --echo # Bug#28524 mysqldump --skip-add-drop-table is not
--echo # compatible with views --echo # compatible with views
--echo # --echo #
CREATE VIEW v1 AS SELECT 1; CREATE VIEW v1 AS SELECT 1;
...@@ -1561,10 +1603,12 @@ DROP VIEW v1; ...@@ -1561,10 +1603,12 @@ DROP VIEW v1;
--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug28524.sql --exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug28524.sql
SELECT * FROM v1; SELECT * FROM v1;
DROP VIEW v1; DROP VIEW v1;
--remove_file $MYSQLTEST_VARDIR/tmp/bug28524.sql
--echo # --echo #
--echo # Bug #29788: mysqldump discards the NO_AUTO_VALUE_ON_ZERO value of --echo # Bug#29788 mysqldump discards the NO_AUTO_VALUE_ON_ZERO value of
--echo # the SQL_MODE variable after the dumping of triggers. --echo # the SQL_MODE variable after the dumping of triggers.
--echo # --echo #
CREATE TABLE t1 (c1 INT); CREATE TABLE t1 (c1 INT);
...@@ -1583,10 +1627,12 @@ SELECT * FROM t2; ...@@ -1583,10 +1627,12 @@ SELECT * FROM t2;
SELECT * FROM t2; SELECT * FROM t2;
DROP TABLE t1,t2; DROP TABLE t1,t2;
--remove_file $MYSQLTEST_VARDIR/tmp/bug29788.sql
--echo # --echo #
--echo # Bug#29815: new option for suppressing last line of mysqldump: --echo # Bug#29815 new option for suppressing last line of mysqldump:
--echo # "Dump completed on" --echo # "Dump completed on"
--echo # --echo #
--echo # --skip-dump-date: --echo # --skip-dump-date:
...@@ -1623,7 +1669,7 @@ DROP TABLE t1; ...@@ -1623,7 +1669,7 @@ DROP TABLE t1;
# Added for use-thread option # Added for use-thread option
# #
# THIS PART OF THE TEST IS DISABLED UNTIL BUG#32991 IS FIXED # THIS PART OF THE TEST IS DISABLED UNTIL Bug#32991 IS FIXED
if ($bug32991_fixed) { if ($bug32991_fixed) {
create table t1 (a text , b text); create table t1 (a text , b text);
...@@ -1666,7 +1712,7 @@ drop table words2; ...@@ -1666,7 +1712,7 @@ drop table words2;
} }
--echo # --echo #
--echo # BUG# 16853: mysqldump doesn't show events --echo # Bug#16853 mysqldump doesn't show events
--echo # --echo #
create database first; create database first;
...@@ -1685,6 +1731,7 @@ use second; ...@@ -1685,6 +1731,7 @@ use second;
--exec $MYSQL second < $MYSQLTEST_VARDIR/tmp/bug16853-1.sql --exec $MYSQL second < $MYSQLTEST_VARDIR/tmp/bug16853-1.sql
show events; show events;
show create event ee1; show create event ee1;
--remove_file $MYSQLTEST_VARDIR/tmp/bug16853-1.sql
## prove three works (with spaces and tabs on the end) ## prove three works (with spaces and tabs on the end)
# start with one from the previous restore # start with one from the previous restore
...@@ -1699,13 +1746,14 @@ use third; ...@@ -1699,13 +1746,14 @@ use third;
--exec $MYSQL third < $MYSQLTEST_VARDIR/tmp/bug16853-2.sql --exec $MYSQL third < $MYSQLTEST_VARDIR/tmp/bug16853-2.sql
show events; show events;
drop database third; drop database third;
--remove_file $MYSQLTEST_VARDIR/tmp/bug16853-2.sql
# revert back to normal settings # revert back to normal settings
set time_zone = 'SYSTEM'; set time_zone = 'SYSTEM';
use test; use test;
--echo # --echo #
--echo # BUG#17201 Spurious 'DROP DATABASE' in output, --echo # Bug#17201 Spurious 'DROP DATABASE' in output,
--echo # also confusion between tables and views. --echo # also confusion between tables and views.
--echo # Example code from Markus Popp --echo # Example code from Markus Popp
--echo # --echo #
...@@ -1724,7 +1772,7 @@ drop table t1; ...@@ -1724,7 +1772,7 @@ drop table t1;
drop database mysqldump_test_db; drop database mysqldump_test_db;
# #
# BUG#26121 mysqldump includes LOCK TABLES general_log WRITE # Bug#26121 mysqldump includes LOCK TABLES general_log WRITE
# #
--exec $MYSQL_DUMP --all-databases > $MYSQLTEST_VARDIR/tmp/bug26121.sql --exec $MYSQL_DUMP --all-databases > $MYSQLTEST_VARDIR/tmp/bug26121.sql
--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug26121.sql --exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug26121.sql
...@@ -1733,8 +1781,8 @@ drop database mysqldump_test_db; ...@@ -1733,8 +1781,8 @@ drop database mysqldump_test_db;
########################################################################### ###########################################################################
--echo # --echo #
--echo # Bug #30027: mysqldump does not dump views properly. --echo # Bug#30027 mysqldump does not dump views properly.
--echo # --echo #
--echo --echo
--echo # Cleanup. --echo # Cleanup.
...@@ -1784,12 +1832,13 @@ set names latin1; ...@@ -1784,12 +1832,13 @@ set names latin1;
--echo # Cleanup. --echo # Cleanup.
DROP DATABASE mysqldump_test_db; DROP DATABASE mysqldump_test_db;
--remove_file $MYSQLTEST_VARDIR/tmp/bug30027.sql
########################################################################### ###########################################################################
--echo # --echo #
--echo # BUG#29938: wrong behavior of mysqldump --skip-events --echo # Bug#29938 wrong behavior of mysqldump --skip-events
--echo # with --all-databases --echo # with --all-databases
--echo # --echo #
TRUNCATE mysql.event; TRUNCATE mysql.event;
...@@ -1802,6 +1851,7 @@ SHOW EVENTS; ...@@ -1802,6 +1851,7 @@ SHOW EVENTS;
TRUNCATE mysql.event; TRUNCATE mysql.event;
--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug29938.sql --exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug29938.sql
SHOW EVENTS; SHOW EVENTS;
--remove_file $MYSQLTEST_VARDIR/tmp/bug29938.sql
--echo # --echo #
...@@ -1818,7 +1868,7 @@ use test; ...@@ -1818,7 +1868,7 @@ use test;
--echo --echo
--echo # ----------------------------------------------------------------- --echo # -----------------------------------------------------------------
--echo # -- Bug#30217: Views: changes in metadata behaviour between 5.0 and 5.1. --echo # -- Bug#30217 Views: changes in metadata behaviour between 5.0 and 5.1.
--echo # ----------------------------------------------------------------- --echo # -----------------------------------------------------------------
--echo --echo
...@@ -1863,6 +1913,7 @@ WHERE table_schema = 'mysqldump_test_db' AND table_name = 'v1'; ...@@ -1863,6 +1913,7 @@ WHERE table_schema = 'mysqldump_test_db' AND table_name = 'v1';
--echo --echo
DROP DATABASE mysqldump_test_db; DROP DATABASE mysqldump_test_db;
--remove_file $MYSQLTEST_VARDIR/tmp/bug30217.sql
--echo --echo
--echo # -- End of test case for Bug#32538. --echo # -- End of test case for Bug#32538.
...@@ -1877,3 +1928,6 @@ SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT; ...@@ -1877,3 +1928,6 @@ SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
--echo # --echo #
--echo # End of 5.1 tests --echo # End of 5.1 tests
--echo # --echo #
# Wait till we reached the initial number of concurrent sessions
--source include/wait_until_count_sessions.inc
mysql-test/t/openssl_1.test
View file @ 99685a0b
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
--source include/have_ssl.inc --source include/have_ssl.inc
# Save the initial number of concurrent sessions
--source include/count_sessions.inc
--disable_warnings --disable_warnings
drop table if exists t1; drop table if exists t1;
--enable_warnings --enable_warnings
...@@ -21,38 +25,42 @@ connect (con2,localhost,ssl_user2,,,,,SSL); ...@@ -21,38 +25,42 @@ connect (con2,localhost,ssl_user2,,,,,SSL);
connect (con3,localhost,ssl_user3,,,,,SSL); connect (con3,localhost,ssl_user3,,,,,SSL);
connect (con4,localhost,ssl_user4,,,,,SSL); connect (con4,localhost,ssl_user4,,,,,SSL);
--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
--error 1045 --error ER_ACCESS_DENIED_ERROR
connect (con5,localhost,ssl_user5,,,,,SSL); connect (con5,localhost,ssl_user5,,,,,SSL);
connection con1; connection con1;
# Check ssl turned on # Check ssl turned on
SHOW STATUS LIKE 'Ssl_cipher'; SHOW STATUS LIKE 'Ssl_cipher';
select * from t1; select * from t1;
--error 1142 --error ER_TABLEACCESS_DENIED_ERROR
delete from t1; delete from t1;
connection con2; connection con2;
# Check ssl turned on # Check ssl turned on
SHOW STATUS LIKE 'Ssl_cipher'; SHOW STATUS LIKE 'Ssl_cipher';
select * from t1; select * from t1;
--error 1142 --error ER_TABLEACCESS_DENIED_ERROR
delete from t1; delete from t1;
connection con3; connection con3;
# Check ssl turned on # Check ssl turned on
SHOW STATUS LIKE 'Ssl_cipher'; SHOW STATUS LIKE 'Ssl_cipher';
select * from t1; select * from t1;
--error 1142 --error ER_TABLEACCESS_DENIED_ERROR
delete from t1; delete from t1;
connection con4; connection con4;
# Check ssl turned on # Check ssl turned on
SHOW STATUS LIKE 'Ssl_cipher'; SHOW STATUS LIKE 'Ssl_cipher';
select * from t1; select * from t1;
--error 1142 --error ER_TABLEACCESS_DENIED_ERROR
delete from t1; delete from t1;
connection default; connection default;
disconnect con1;
disconnect con2;
disconnect con3;
disconnect con4;
drop user ssl_user1@localhost, ssl_user2@localhost, drop user ssl_user1@localhost, ssl_user2@localhost,
ssl_user3@localhost, ssl_user4@localhost, ssl_user5@localhost; ssl_user3@localhost, ssl_user4@localhost, ssl_user5@localhost;
...@@ -97,7 +105,7 @@ drop table t1; ...@@ -97,7 +105,7 @@ drop table t1;
--exec $MYSQL_TEST --ssl-cert= --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1 --exec $MYSQL_TEST --ssl-cert= --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1
# #
# BUG#21611 Slave can't connect when master-ssl-cipher specified # Bug#21611 Slave can't connect when master-ssl-cipher specified
# - Apparently selecting a cipher doesn't work at all # - Apparently selecting a cipher doesn't work at all
# - Usa a cipher that both yaSSL and OpenSSL supports # - Usa a cipher that both yaSSL and OpenSSL supports
# #
...@@ -115,7 +123,7 @@ drop table t1; ...@@ -115,7 +123,7 @@ drop table t1;
--echo End of 5.0 tests --echo End of 5.0 tests
# #
# Bug #26174 Server Crash: INSERT ... SELECT ... FROM I_S.GLOBAL_STATUS in # Bug#26174 Server Crash: INSERT ... SELECT ... FROM I_S.GLOBAL_STATUS in
# Event (see also information_schema.test for the other part of test for # Event (see also information_schema.test for the other part of test for
# this bug). # this bug).
# #
...@@ -171,7 +179,7 @@ SET GLOBAL event_scheduler=0; ...@@ -171,7 +179,7 @@ SET GLOBAL event_scheduler=0;
--exec $MYSQL_TEST --ssl-cipher=UNKNOWN-CIPHER < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1 --exec $MYSQL_TEST --ssl-cipher=UNKNOWN-CIPHER < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1
# #
# Bug #27669 mysqldump: SSL connection error when trying to connect # Bug#27669 mysqldump: SSL connection error when trying to connect
# #
CREATE TABLE t1(a int); CREATE TABLE t1(a int);
...@@ -190,10 +198,11 @@ INSERT INTO t1 VALUES (1), (2); ...@@ -190,10 +198,11 @@ INSERT INTO t1 VALUES (1), (2);
--exec $MYSQL_DUMP --skip-create --skip-comments --ssl --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test 2>&1 --exec $MYSQL_DUMP --skip-create --skip-comments --ssl --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test 2>&1
DROP TABLE t1; DROP TABLE t1;
--remove_file $MYSQLTEST_VARDIR/tmp/test.sql
# #
# Bug#39172: Asking for DH+non-RSA key with server set to use other key caused # Bug#39172 Asking for DH+non-RSA key with server set to use other key caused
# YaSSL to crash the server. # YaSSL to crash the server.
# #
# Common ciphers to openssl and yassl # Common ciphers to openssl and yassl
...@@ -231,3 +240,6 @@ select 'is still running; no cipher request crashed the server' as result from d ...@@ -231,3 +240,6 @@ select 'is still running; no cipher request crashed the server' as result from d
## ##
--echo End of 5.1 tests --echo End of 5.1 tests
# Wait till we reached the initial number of concurrent sessions
--source include/wait_until_count_sessions.inc
mysql-test/t/outfile.test
View file @ 99685a0b
...@@ -5,6 +5,10 @@ eval set @tmpdir="../../tmp"; ...@@ -5,6 +5,10 @@ eval set @tmpdir="../../tmp";
enable_query_log; enable_query_log;
-- source include/have_outfile.inc -- source include/have_outfile.inc
# Save the initial number of concurrent sessions
--source include/count_sessions.inc
# #
# test of into outfile|dumpfile # test of into outfile|dumpfile
# #
...@@ -46,7 +50,7 @@ select load_file(concat(@tmpdir,"/outfile-test.not-exist")); ...@@ -46,7 +50,7 @@ select load_file(concat(@tmpdir,"/outfile-test.not-exist"));
--remove_file $MYSQLTEST_VARDIR/tmp/outfile-test.3 --remove_file $MYSQLTEST_VARDIR/tmp/outfile-test.3
drop table t1; drop table t1;
# Bug#8191 # Bug#8191 SELECT INTO OUTFILE insists on FROM clause
disable_query_log; disable_query_log;
eval select 1 into outfile "../../tmp/outfile-test.4"; eval select 1 into outfile "../../tmp/outfile-test.4";
enable_query_log; enable_query_log;
...@@ -54,11 +58,11 @@ select load_file(concat(@tmpdir,"/outfile-test.4")); ...@@ -54,11 +58,11 @@ select load_file(concat(@tmpdir,"/outfile-test.4"));
--remove_file $MYSQLTEST_VARDIR/tmp/outfile-test.4 --remove_file $MYSQLTEST_VARDIR/tmp/outfile-test.4
# #
# Bug #5382: 'explain select into outfile' crashes the server # Bug#5382 'explain select into outfile' crashes the server
# #
CREATE TABLE t1 (a INT); CREATE TABLE t1 (a INT);
EXPLAIN EXPLAIN
SELECT * SELECT *
INTO OUTFILE '/tmp/t1.txt' INTO OUTFILE '/tmp/t1.txt'
FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"' LINES TERMINATED BY '\r\n' FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"' LINES TERMINATED BY '\r\n'
...@@ -68,7 +72,7 @@ DROP TABLE t1; ...@@ -68,7 +72,7 @@ DROP TABLE t1;
# End of 4.1 tests # End of 4.1 tests
# #
# Bug#13202 SELECT * INTO OUTFILE ... FROM information_schema.schemata now fails # Bug#13202 SELECT * INTO OUTFILE ... FROM information_schema.schemata now fails
# #
disable_query_log; disable_query_log;
eval SELECT * INTO OUTFILE "../../tmp/outfile-test.4" eval SELECT * INTO OUTFILE "../../tmp/outfile-test.4"
...@@ -114,6 +118,7 @@ from information_schema.schemata ...@@ -114,6 +118,7 @@ from information_schema.schemata
where schema_name like 'mysqltest'; where schema_name like 'mysqltest';
connection default; connection default;
disconnect con28181_1;
grant file on *.* to user_1@localhost; grant file on *.* to user_1@localhost;
connect (con28181_2,localhost,user_1,,mysqltest); connect (con28181_2,localhost,user_1,,mysqltest);
...@@ -125,9 +130,12 @@ from information_schema.schemata ...@@ -125,9 +130,12 @@ from information_schema.schemata
where schema_name like 'mysqltest'; where schema_name like 'mysqltest';
connection default; connection default;
disconnect con28181_2;
--remove_file $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;
drop database mysqltest; drop database mysqltest;
# Wait till we reached the initial number of concurrent sessions
--source include/wait_until_count_sessions.inc
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7