Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
75bfb4b8
Commit
75bfb4b8
authored
Sep 20, 2023
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
deprecate SQL_NOTES variable in favor of NOTE_VERBOSITY
as suggested by Monty
parent
22da0de6
Changes
16
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
179 additions
and
430 deletions
+179
-430
client/mysqldump.cc
client/mysqldump.cc
+2
-2
mysql-test/main/mysqldump-compat-102.result
mysql-test/main/mysqldump-compat-102.result
+2
-2
mysql-test/main/mysqldump-max.result
mysql-test/main/mysqldump-max.result
+4
-4
mysql-test/main/mysqldump-system.result
mysql-test/main/mysqldump-system.result
+6
-6
mysql-test/main/mysqldump-timing.result
mysql-test/main/mysqldump-timing.result
+3
-3
mysql-test/main/mysqldump-utf8mb4.result
mysql-test/main/mysqldump-utf8mb4.result
+2
-2
mysql-test/main/mysqldump.result
mysql-test/main/mysqldump.result
+123
-117
mysql-test/main/openssl_1.result
mysql-test/main/openssl_1.result
+6
-6
mysql-test/main/variables.result
mysql-test/main/variables.result
+10
-0
mysql-test/suite/compat/oracle/r/sp-package-mysqldump.result
mysql-test/suite/compat/oracle/r/sp-package-mysqldump.result
+2
-2
mysql-test/suite/optimizer_unfixed_bugs/r/bug42991.result
mysql-test/suite/optimizer_unfixed_bugs/r/bug42991.result
+6
-2
mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test
mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test
+0
-5
mysql-test/suite/sys_vars/r/sql_notes_basic.result
mysql-test/suite/sys_vars/r/sql_notes_basic.result
+0
-107
mysql-test/suite/sys_vars/r/sql_notes_func.result
mysql-test/suite/sys_vars/r/sql_notes_func.result
+10
-0
mysql-test/suite/sys_vars/t/sql_notes_basic.test
mysql-test/suite/sys_vars/t/sql_notes_basic.test
+0
-171
sql/sys_vars.cc
sql/sys_vars.cc
+3
-1
No files found.
client/mysqldump.cc
View file @
75bfb4b8
...
...
@@ -814,7 +814,7 @@ static void write_header(FILE *sql_file, const char *db_name)
}
fprintf
(
sql_file
,
"/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='%s%s%s' */;
\n
"
"/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
\n
"
,
"/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
\n
"
,
path
?
""
:
"NO_AUTO_VALUE_ON_ZERO"
,
compatible_mode_normal_str
[
0
]
==
0
?
""
:
","
,
compatible_mode_normal_str
);
check_io
(
sql_file
);
...
...
@@ -851,7 +851,7 @@ static void write_footer(FILE *sql_file)
"/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
\n
"
"/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
\n
"
);
fprintf
(
sql_file
,
"/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
\n
"
);
"/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
\n
"
);
fputs
(
"
\n
"
,
sql_file
);
if
(
opt_dump_date
)
...
...
mysql-test/main/mysqldump-compat-102.result
View file @
75bfb4b8
...
...
@@ -72,7 +72,7 @@ $$
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
--
-- Dumping routines for database 'db1_mdev17429'
...
...
@@ -103,7 +103,7 @@ DELIMITER ;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
-- Dump completed on TIMESTAMP
DROP DATABASE db1_mdev17429;
...
...
mysql-test/main/mysqldump-max.result
View file @
75bfb4b8
...
...
@@ -87,7 +87,7 @@ id name
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */;
...
...
@@ -202,7 +202,7 @@ INSERT IGNORE INTO `t6` VALUES
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
...
...
@@ -214,7 +214,7 @@ INSERT IGNORE INTO `t6` VALUES
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */;
...
...
@@ -329,7 +329,7 @@ INSERT INTO `t6` VALUES
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
drop table t1;
drop table t2;
...
...
mysql-test/main/mysqldump-system.result
View file @
75bfb4b8
...
...
@@ -51,7 +51,7 @@ CREATE FUNCTION metaphon RETURNS STRING SONAME "UDF_EXAMPLE_LIB";
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
INSTALL PLUGIN test_plugin_server SONAME 'AUTH_TEST_PLUGIN_LIB';
INSTALL PLUGIN cleartext_plugin_server SONAME 'AUTH_TEST_PLUGIN_LIB';
CREATE USER `mariadb.sys`@`localhost` PASSWORD EXPIRE;
...
...
@@ -632,7 +632,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
#
# mysqldump of system tables with --system=all --replace
...
...
@@ -647,7 +647,7 @@ UNLOCK TABLES;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
/*M!100401 UNINSTALL PLUGIN IF EXIST test_plugin_server */;
INSTALL PLUGIN test_plugin_server SONAME 'AUTH_TEST_PLUGIN_LIB';
/*M!100401 UNINSTALL PLUGIN IF EXIST cleartext_plugin_server */;
...
...
@@ -1251,7 +1251,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
#
# mysqldump of system tables with --system=all --insert-ignore
...
...
@@ -1266,7 +1266,7 @@ UNLOCK TABLES;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
INSTALL PLUGIN test_plugin_server /*M!100401 IF NOT EXISTS */ SONAME 'AUTH_TEST_PLUGIN_LIB';
INSTALL PLUGIN cleartext_plugin_server /*M!100401 IF NOT EXISTS */ SONAME 'AUTH_TEST_PLUGIN_LIB';
CREATE USER IF NOT EXISTS `mariadb.sys`@`localhost` PASSWORD EXPIRE;
...
...
@@ -1847,7 +1847,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
SELECT * FROM mysql.global_priv ORDER BY User,Host;
Host User Priv
...
...
mysql-test/main/mysqldump-timing.result
View file @
75bfb4b8
...
...
@@ -17,7 +17,7 @@ timeout without t1 contents expected
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -40,7 +40,7 @@ This would be a race condition otherwise, but default max_statement_time=0 makes
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -63,7 +63,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
SET GLOBAL max_statement_time=@save_max_statement_time;
DROP DATABASE test1;
...
...
mysql-test/main/mysqldump-utf8mb4.result
View file @
75bfb4b8
...
...
@@ -42,7 +42,7 @@ Testing text format output
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -68,7 +68,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
DROP TABLE t1;
----
...
...
mysql-test/main/mysqldump.result
View file @
75bfb4b8
...
...
@@ -106,7 +106,7 @@ INSERT INTO `t1` VALUES
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -134,14 +134,14 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `t1` (
...
...
@@ -161,7 +161,7 @@ INSERT INTO `t1` VALUES
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
DROP TABLE t1;
CREATE TABLE t1(a int, b text, c varchar(3));
...
...
@@ -227,7 +227,7 @@ INSERT INTO t1 VALUES (_koi8r x'C1C2C3C4C5'), (NULL);
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -250,7 +250,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
DROP TABLE t1;
#
...
...
@@ -263,7 +263,7 @@ INSERT INTO t1 VALUES (1), (2);
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL40' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
...
...
@@ -281,14 +281,14 @@ UNLOCK TABLES;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
...
...
@@ -306,7 +306,7 @@ UNLOCK TABLES;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
DROP TABLE t1;
#
...
...
@@ -334,7 +334,7 @@ create table t1(a int);
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -355,14 +355,14 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS "t1";
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -380,7 +380,7 @@ UNLOCK TABLES;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
set global sql_mode='ANSI_QUOTES';
...
...
@@ -393,7 +393,7 @@ set global sql_mode='ANSI_QUOTES';
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -414,14 +414,14 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS "t1";
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -439,7 +439,7 @@ UNLOCK TABLES;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
set global sql_mode=default;
drop table t1;
...
...
@@ -456,7 +456,7 @@ insert into t1 values (1),(2),(3);
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -471,7 +471,7 @@ CREATE TABLE `t1` (
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
1
2
...
...
@@ -490,7 +490,7 @@ drop table t1;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */;
...
...
@@ -503,7 +503,7 @@ USE `test`;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
create database mysqldump_test_db character set latin2 collate latin2_bin;
...
...
@@ -516,7 +516,7 @@ create database mysqldump_test_db character set latin2 collate latin2_bin;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_test_db` /*!40100 DEFAULT CHARACTER SET latin2 COLLATE latin2_bin */;
...
...
@@ -529,7 +529,7 @@ USE `mysqldump_test_db`;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
drop database mysqldump_test_db;
#
...
...
@@ -550,7 +550,7 @@ INSERT INTO t1 VALUES (_latin1 '
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -573,7 +573,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
#
# Bug#8063 make test mysqldump [ fail ]
...
...
@@ -587,7 +587,7 @@ UNLOCK TABLES;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
CREATE TABLE `t1` (
`a` char(10) DEFAULT NULL
...
...
@@ -604,14 +604,14 @@ UNLOCK TABLES;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
CREATE TABLE `t1` (
`a` char(10) DEFAULT NULL
...
...
@@ -628,14 +628,14 @@ UNLOCK TABLES;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
CREATE TABLE `t1` (
`a` char(10) DEFAULT NULL
...
...
@@ -652,7 +652,7 @@ UNLOCK TABLES;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
DROP TABLE t1;
#
...
...
@@ -672,7 +672,7 @@ INSERT INTO t2 VALUES (4),(5),(6);
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t2`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -697,7 +697,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
DROP TABLE t1;
DROP TABLE t2;
...
...
@@ -716,7 +716,7 @@ INSERT INTO `t1` VALUES (0x602010000280100005E71A);
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -738,7 +738,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
DROP TABLE t1;
#
...
...
@@ -757,7 +757,7 @@ INSERT INTO t1 VALUES (4),(5),(6);
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -785,7 +785,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
...
...
@@ -797,7 +797,7 @@ UNLOCK TABLES;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -823,7 +823,7 @@ INSERT DELAYED IGNORE INTO `t1` VALUES
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
DROP TABLE t1;
#
...
...
@@ -1172,7 +1172,7 @@ insert into t1 (F_8d3bba7425e7c98c50f52ca1b52d3735) values (1);
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -1523,7 +1523,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
drop table t1;
#
...
...
@@ -1541,7 +1541,7 @@ INSERT INTO t1 VALUES (1),(2),(3);
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
/*!40000 DROP DATABASE IF EXISTS `test`*/;
...
...
@@ -1572,7 +1572,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
DROP TABLE t1;
#
...
...
@@ -1594,7 +1594,7 @@ INSERT INTO t2 VALUES (1), (2);
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -1617,7 +1617,7 @@ CREATE TABLE `t2` (
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
...
...
@@ -1629,7 +1629,7 @@ CREATE TABLE `t2` (
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -1652,7 +1652,7 @@ CREATE TABLE `t2` (
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
<?xml version="1.0"?>
<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
...
...
@@ -1776,7 +1776,7 @@ insert into t2 (a, b) values (NULL, NULL),(10, NULL),(NULL, "twenty"),(30, "thir
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
LOCK TABLES `t1` WRITE;
/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
...
...
@@ -1803,7 +1803,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
...
...
@@ -1815,7 +1815,7 @@ UNLOCK TABLES;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -1863,7 +1863,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
drop table t1, t2;
#
...
...
@@ -1940,7 +1940,7 @@ mariadb-dump: Couldn't find table: "non_existing"
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t3`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -1970,7 +1970,7 @@ CREATE TABLE `t2` (
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
drop table t1, t2, t3;
#
...
...
@@ -1989,7 +1989,7 @@ mariadb-dump: Got error: 1064: "You have an error in your SQL syntax; check the
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -2006,7 +2006,7 @@ CREATE TABLE `t1` (
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
drop table t1;
#
...
...
@@ -2025,7 +2025,7 @@ insert into t1 values (0815, 4711, 2006);
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS "t1";
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -2048,7 +2048,7 @@ UNLOCK TABLES;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
...
...
@@ -2060,7 +2060,7 @@ UNLOCK TABLES;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -2086,7 +2086,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
DROP TABLE `t1`;
End of 4.1 tests
...
...
@@ -2115,7 +2115,7 @@ create view v2 as select * from t2 where a like 'a%' with check option;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t2`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -2164,7 +2164,7 @@ SET character_set_client = @saved_cs_client;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
drop table t2;
drop view v2;
...
...
@@ -2214,7 +2214,7 @@ create view v1 as select * from t1;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -2255,7 +2255,7 @@ SET character_set_client = @saved_cs_client;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
drop view v1;
drop table t1;
...
...
@@ -2284,7 +2284,7 @@ create view v2 as select * from t2 where a like 'a%' with check option;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t2`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -2333,7 +2333,7 @@ SET character_set_client = @saved_cs_client;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
drop table t2;
drop view v2;
...
...
@@ -2354,7 +2354,7 @@ INSERT INTO t1 VALUES ('\'');
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -2377,7 +2377,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
DROP TABLE t1;
#
...
...
@@ -2401,7 +2401,7 @@ select v3.a from v3, v1 where v1.a=v3.a and v3.b=3 limit 1;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -2492,7 +2492,7 @@ SET character_set_client = @saved_cs_client;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
drop view v1, v2, v3;
drop table t1;
...
...
@@ -2553,7 +2553,7 @@ update t1 set a = 4 where a=3;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */;
...
...
@@ -2674,7 +2674,7 @@ DELIMITER ;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
...
...
@@ -2686,7 +2686,7 @@ DELIMITER ;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */;
...
...
@@ -2729,7 +2729,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
drop table t1;
show tables;
...
...
@@ -2835,7 +2835,7 @@ set sql_mode='';
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */;
...
...
@@ -2956,7 +2956,7 @@ DELIMITER ;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
DROP FUNCTION bug9056_func1;
DROP FUNCTION bug9056_func2;
...
...
@@ -2991,7 +2991,7 @@ set global time_zone='Europe/Moscow';
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */;
...
...
@@ -3020,7 +3020,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
...
...
@@ -3030,7 +3030,7 @@ UNLOCK TABLES;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */;
...
...
@@ -3058,7 +3058,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
drop table t1;
set global time_zone=default;
...
...
@@ -3089,7 +3089,7 @@ a2
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS "t1 test";
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -3143,7 +3143,7 @@ UNLOCK TABLES;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
DROP TRIGGER `test trig`;
DROP TABLE `t1 test`;
...
...
@@ -3174,7 +3174,7 @@ a b c
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */;
...
...
@@ -3273,7 +3273,7 @@ USE `test`;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
drop view v2;
drop view v0;
...
...
@@ -3302,7 +3302,7 @@ SET SQL_MODE = @old_sql_mode;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */;
...
...
@@ -3346,7 +3346,7 @@ DELIMITER ;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
DROP TRIGGER tr1;
DROP TABLE t1;
...
...
@@ -3365,7 +3365,7 @@ insert into t1 values ('','');
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -3388,7 +3388,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
...
...
@@ -3400,7 +3400,7 @@ UNLOCK TABLES;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -3424,7 +3424,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
drop table t1;
#
...
...
@@ -3576,7 +3576,7 @@ insert into t1 values (0815);
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
/*!40000 DROP DATABASE IF EXISTS `mysqldump_test_db`*/;
...
...
@@ -3630,7 +3630,7 @@ USE `mysqldump_test_db`;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
drop view v1;
drop table t1;
...
...
@@ -3865,7 +3865,7 @@ CREATE TABLE t1 (a INT) ENGINE=merge UNION=(t2, t3);
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -3905,7 +3905,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
DROP TABLE t1, t2, t3;
#
...
...
@@ -4027,19 +4027,25 @@ DROP TABLE t1,t2;
# --skip-dump-date:
--
/*M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY=0 */;
/*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
-- Dump completed
# --dump-date:
--
/*M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY=0 */;
/*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
-- Dump completed on DATE
# --dump-date (default):
--
/*M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY=0 */;
/*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
-- Dump completed on DATE
#
...
...
@@ -4061,7 +4067,7 @@ create view db42635.v2 (c) as select * from db42635.t1;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -4102,7 +4108,7 @@ SET character_set_client = @saved_cs_client;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
use test;
drop database db42635;
...
...
@@ -4116,7 +4122,7 @@ CREATE TABLE `straße` ( f1 INT );
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `straße`;
CREATE TABLE `straße` (
`f1` int(11) DEFAULT NULL
...
...
@@ -4131,14 +4137,14 @@ UNLOCK TABLES;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `strae`;
CREATE TABLE `strae` (
`f1` int(11) DEFAULT NULL
...
...
@@ -4153,7 +4159,7 @@ UNLOCK TABLES;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
DROP TABLE `straße`;
CREATE TABLE `כדשגכחךלדגכחשךדגחכךלדגכ` ( f1 INT );
...
...
@@ -4162,7 +4168,7 @@ CREATE TABLE `כדשגכחךלדגכחשךדגחכךלדגכ` ( f1 INT );
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `כדשגכחךלדגכחשךדגחכךלדגכ`;
CREATE TABLE `כדשגכחךלדגכחשךדגחכךלדגכ` (
`f1` int(11) DEFAULT NULL
...
...
@@ -4177,7 +4183,7 @@ UNLOCK TABLES;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
mariadb-dump: Got error: 1146: "Table 'test.???????????????????????' doesn't exist" when using LOCK TABLES
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
...
...
@@ -4185,7 +4191,7 @@ mariadb-dump: Got error: 1146: "Table 'test.???????????????????????' doesn't exi
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE `כדשגכחךלדגכחשךדגחכךלדגכ`;
SET NAMES latin1;
#
...
...
@@ -4206,7 +4212,7 @@ INSERT INTO t1 VALUES (3,4), (4,5);
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -4233,7 +4239,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
DROP TABLE t1;
create table t1 (a text , b text);
...
...
@@ -4480,7 +4486,7 @@ insert into t1 values (0815);
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
/*!40000 DROP DATABASE IF EXISTS `mysqldump_test_db`*/;
...
...
@@ -4534,7 +4540,7 @@ USE `mysqldump_test_db`;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
drop view v1;
drop table t1;
...
...
@@ -5313,7 +5319,7 @@ CREATE TABLE t1 (a INT);
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -5331,7 +5337,7 @@ UNLOCK TABLES;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
DROP TABLE t1;
#
...
...
@@ -5824,7 +5830,7 @@ INSERT INTO t1 (a) VALUES (1),(2),(3);
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */;
...
...
@@ -5853,7 +5859,7 @@ DELIMITER ;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
DROP TABLE t1;
#
...
...
@@ -5873,7 +5879,7 @@ DROP TABLE t1;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE IF NOT EXISTS `general_log` (
...
...
@@ -5953,7 +5959,7 @@ CREATE TABLE IF NOT EXISTS `transaction_registry` (
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
#
# With --replace
...
...
@@ -5968,7 +5974,7 @@ CREATE TABLE IF NOT EXISTS `transaction_registry` (
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE IF NOT EXISTS `general_log` (
...
...
@@ -6058,7 +6064,7 @@ CREATE TABLE IF NOT EXISTS `transaction_registry` (
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
#
# With --insert-ignore
...
...
@@ -6073,7 +6079,7 @@ CREATE TABLE IF NOT EXISTS `transaction_registry` (
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE IF NOT EXISTS `general_log` (
...
...
@@ -6163,7 +6169,7 @@ CREATE TABLE IF NOT EXISTS `transaction_registry` (
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
# End of 10.2 tests
#
...
...
mysql-test/main/openssl_1.result
View file @
75bfb4b8
...
...
@@ -87,7 +87,7 @@ INSERT INTO t1 VALUES (1), (2);
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -111,7 +111,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
...
...
@@ -123,7 +123,7 @@ UNLOCK TABLES;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -147,7 +147,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
...
...
@@ -159,7 +159,7 @@ UNLOCK TABLES;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
DROP TABLE IF EXISTS `t1`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
...
...
@@ -183,7 +183,7 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
mariadb-dump: Got error: 2026: "TLS/SSL error: xxxx
DROP TABLE t1;
...
...
mysql-test/main/variables.result
View file @
75bfb4b8
...
...
@@ -892,6 +892,8 @@ VARIABLE_NAME VARIABLE_VALUE
SQL_BIG_SELECTS ON
set @@sql_big_selects = @old_sql_big_selects;
set @@sql_notes = 0, @@sql_warnings = 0;
Warnings:
Warning 1287 '@@sql_notes' is deprecated and will be removed in a future release. Please use '@@note_verbosity' instead
show variables like 'sql_notes';
Variable_name Value
sql_notes OFF
...
...
@@ -905,6 +907,8 @@ select * from information_schema.session_variables where variable_name like 'sql
VARIABLE_NAME VARIABLE_VALUE
SQL_WARNINGS OFF
set @@sql_notes = 1, @@sql_warnings = 1;
Warnings:
Warning 1287 '@@sql_notes' is deprecated and will be removed in a future release. Please use '@@note_verbosity' instead
show variables like 'sql_notes';
Variable_name Value
sql_notes ON
...
...
@@ -1561,6 +1565,8 @@ End of 5.1 tests
SET @sql_notes_saved = @@sql_notes;
SET @@sql_notes = ON;
Warnings:
Warning 1287 '@@sql_notes' is deprecated and will be removed in a future release. Please use '@@note_verbosity' instead
SELECT @@sql_notes;
@@sql_notes
1
...
...
@@ -1572,11 +1578,15 @@ SELECT @@sql_notes;
1
SET @@sql_notes = OFF;
Warnings:
Warning 1287 '@@sql_notes' is deprecated and will be removed in a future release. Please use '@@note_verbosity' instead
SELECT @@sql_notes;
@@sql_notes
0
SET @@sql_notes = @sql_notes_saved;
Warnings:
Warning 1287 '@@sql_notes' is deprecated and will be removed in a future release. Please use '@@note_verbosity' instead
# Checking delay_key_write...
SET @delay_key_write_saved = @@delay_key_write;
...
...
mysql-test/suite/compat/oracle/r/sp-package-mysqldump.result
View file @
75bfb4b8
...
...
@@ -44,7 +44,7 @@ $$
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*
!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES
=0 */;
/*
M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY
=0 */;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER,SIMULTANEOUS_ASSIGNMENT' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `p1` */;
...
...
@@ -136,7 +136,7 @@ DELIMITER ;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*
!40111 SET SQL_NOTES=@OLD_SQL_NOTES
*/;
/*
M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY
*/;
<?xml version="1.0"?>
<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
...
...
mysql-test/suite/optimizer_unfixed_bugs/r/bug42991.result
View file @
75bfb4b8
...
...
@@ -9,8 +9,9 @@ set session debug_dbug="+d,optimizer_innodb_icp";
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
DROP TABLE IF EXISTS `table5`;
Warnings:
Note 1051 Unknown table 'test.table5'
SET @saved_cs_client = @@character_set_client;
SET character_set_client = utf8;
CREATE TABLE `table5` (
...
...
@@ -207,6 +208,8 @@ KEY `idx11` (`col126`)
SET character_set_client = @saved_cs_client;
LOCK TABLES `table5` WRITE;
/*!40000 ALTER TABLE `table5` DISABLE KEYS */;
Warnings:
Note 1031 Storage engine InnoDB of the table `test`.`table5` doesn't have this option
INSERT INTO `table5` VALUES ('referenda','hermaphroditism','superable','00:00:00',-128,NULL,-128,'0000-00-00 00:00:00',NULL,-128,1901,NULL,'blandly',NULL,6541,'unsuspectingly',NULL,'7250','',NULL,-31358,26248,'Kilmarnock\'s',127,'-27305',28987,NULL,NULL,'-30388','utilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitarians','0000-00-00','Agincourt','0000-00-00',-28063,27242,'readies',NULL,'00:00:00',NULL,-128,'',NULL,NULL,18719,NULL,NULL,14038,17275,NULL,'gait\'s','honeymoon\'shoneymoon\'shoneymoon\'shoneymoon\'shoneymoon\'shoneymoon\'shoneymoon\'shoneymoon\'shoneymoon\'shoneymoon\'shoneymoon\'shoneymoon\'shoneymoon\'shoneymoon\'shoneymoon\'shoneymoon\'shoneymoon\'shoneymoon\'shoneymoon\'shoneymoon\'shoneymoon\'shoneymoon\'shoneymoon\'sho',8860,NULL,'demigod','outpulling',NULL,'1904-01-17 09:51:06','test1','-18008','grotesqueness\'sgrotesqueness\'sgrotesqueness\'sgrotesqueness\'sgrotesqueness\'sgrotesqueness\'sgrotesqueness\'s','Oakleil\'s','Shostakovich','indiscretionsindiscretionsindiscretionsindiscretionsindiscretionsindiscretionsindiscretionsindiscretionsindiscretionsindiscretionsindiscretionsindiscretionsindiscretionsindiscretionsindiscretionsindiscretionsindiscretionsindiscretionsindiscretionsindiscre','2076-10-05 02:05:43','29914',-18885,'2088-05-25 13:36:33','25',-128,'Bob','-14559','ammeter','0000-00-00','00:00:00',-29756,NULL,'digressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigressiondigression',-23894,1963,1915,'SadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadyeSadye',NULL,NULL,'','17512','','anaphylaxis\'s','chiseler\'schiseler\'schiseler\'schiseler\'schiseler\'schiseler\'schiseler\'schiseler\'schiseler\'schiseler\'schiseler\'schiseler\'schiseler\'schiseler\'schiseler\'schiseler\'schiseler\'schiseler\'schiseler\'schiseler\'schiseler\'schiseler\'schiseler\'schiseler\'schiseler\'schise','50:11:25','test1','-13685',-18328,'2020-01-19 22:04:54',NULL,'1988-05-10 10:30:56','0000-00-00 00:00:00','Birdie\'s',-27746,NULL,'179:19:25',-128,24141,'radiotransparentradiotransparentradiotransparentradiotransparentradiotransparentradiotransparentradiotransparentradiotransparentradiotransparentradiotransparentradiotransparentradiotransparentradiotransparentradiotransparentradiotransparentradiotransparen','ingroup\'singroup\'singroup\'singroup\'singroup\'singroup\'singroup\'singroup\'singroup\'singroup\'singroup\'singroup\'singroup\'singroup\'singroup\'singroup\'singroup\'singroup\'singroup\'singroup\'singroup\'singroup\'singroup\'singroup\'singroup\'singroup\'singroup\'singroup\'sing',18950,'Beaulieu','0000-00-00 00:00:00',-23421,'-2865',NULL,NULL,NULL,NULL,'vandalizes',-24683,'interop','Apis\'s','0000-00-00',19745,'Volgograd\'s',-15194,NULL,'Binni','4540','phylumphylumphylumphylum','-25781',NULL,-128,'406:37:03','posthasteposthasteposthasteposthasteposthasteposthasteposthasteposthasteposthasteposthasteposthasteposthasteposthasteposthasteposthasteposthasteposthasteposthasteposthasteposthasteposthasteposthasteposthasteposthasteposthasteposthasteposthasteposthastepos','manneristmanneristmanneristmanneristmanneristmanneristmanneristmanneristmanneristmanneristmanneristmanneristmanneristmanneristmanneristmanneristmanneristmanneristmanneristmanneristmanneristmanneristmanneristmanneristmanneristmanneristmanneristmanneristman','0000-00-00',19774,'shariah',NULL,'aquarelle','homographic',NULL,-18959,'thoroughfarethoroughfarethoroughfarethoroughfarethoroughfarethoroughfare','2000-09-05 03:33:50','Baptlsta','Witt\'sWitt\'sWitt\'sWitt\'sWitt\'sWitt\'sWitt\'sWitt\'s',4727,NULL,'posting',2119,'32416',NULL,'charredcharredcharredcharredcharredcharredcharredcharredcharredcharred',-128,NULL,'Rollin\'s',NULL,NULL,127,'waviness\'s',11164,'424:28:18','FaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucherFaucher','stalactite\'sstalactite\'sstalactite\'sstalactite\'sstalactite\'sstalactite\'sstalactite\'sstalactite\'sstalactite\'sstalactite\'sstalactite\'s','1901-01-29 13:48:34',-31988,'Dyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'sDyan\'s','','2022-01-01 21:14:30','0000-00-00','conventionalistconventionalistconventionalistconventionalistconventionalistconventionalistconventionalistconventionalist','mirthlessnessesmirthlessnessesmirthlessnessesmirthlessnessesmirthlessnessesmirthlessnessesmirthlessnessesmirthlessnessesmirthlessnessesmirthlessnessesmirthlessnessesmirthlessnessesmirthlessnessesmirthlessnessesmirthlessnessesmirthlessnessesmirthlessnesses','tessellation\'stessellation\'stessellation\'stessellation\'stessellation\'stessellation\'stessellation\'stessellation\'stessellation\'stessellation\'stessellation\'stessellation\'stessellation\'stessellation\'stessellation\'stessellation\'stessellation\'stessellation\'stes','2028-05-21 04:56:16',NULL,'Hasid','Hardecanute','00:00:00',-3782);
Warnings:
Warning 1265 Data truncated for column 'col83' at row 1
...
...
@@ -236,6 +239,8 @@ INSERT INTO `table5` VALUES ('Frasquito\'s','unsatisfactory','jetted','00:00:00'
Warnings:
Warning 1265 Data truncated for column 'col57' at row 1
/*!40000 ALTER TABLE `table5` ENABLE KEYS */;
Warnings:
Note 1031 Storage engine InnoDB of the table `test`.`table5` doesn't have this option
UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
...
...
@@ -244,7 +249,6 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
select * from `table5` where (col2 <= '6566-06-15' AND (col24 < 'd' or col24 > 'd')) group by `col83` order by `col83` desc ;
col0 col1 col2 col3 col4 col5 col6 col7 col8 col9 col10 col11 col12 col13 col14 col15 col16 col17 col18 col19 col20 col21 col22 col23 col24 col25 col26 col27 col28 col29 col30 col31 col32 col33 col34 col35 col36 col37 col38 col39 col40 col41 col42 col43 col44 col45 col46 col47 col48 col49 col50 col51 col52 col53 col54 col55 col56 col57 col58 col59 col60 col61 col62 col63 col64 col65 col66 col67 col68 col69 col70 col71 col72 col73 col74 col75 col76 col77 col78 col79 col80 col81 col82 col83 col84 col85 col86 col87 col88 col89 col90 col91 col92 col93 col94 col95 col96 col97 col98 col99 col100 col101 col102 col103 col104 col105 col106 col107 col108 col109 col110 col111 col112 col113 col114 col115 col116 col117 col118 col119 col120 col121 col122 col123 col124 col125 col126 col127 col128 col129 col130 col131 col132 col133 col134 col135 col136 col137 col138 col139 col140 col141 col142 col143 col144 col145 col146 col147 col148 col149 col150 col151 col152 col153 col154 col155 col156 col157 col158 col159 col160 col161 col162 col163 col164 col165 col166 col167 col168 col169 col170 col171 col172 col173 col174 col175
Warnings:
...
...
mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test
View file @
75bfb4b8
...
...
@@ -10,7 +10,6 @@ SET @saved_dbug = @@SESSION.debug_dbug;
# Valgrind errors happen only with this:
set
session
debug_dbug
=
"+d,optimizer_innodb_icp"
;
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */
;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */
;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */
;
...
...
@@ -20,8 +19,6 @@ set session debug_dbug="+d,optimizer_innodb_icp";
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */
;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */
;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */
;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */
;
DROP
TABLE
IF
EXISTS
`table5`
;
SET
@
saved_cs_client
=
@@
character_set_client
;
...
...
@@ -239,8 +236,6 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */
;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */
;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */
;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */
;
#explain select * from `table5` where (col2 <= '6566-06-15' AND (col24 < 'd' or col24 > 'd') group by `col83` order by `col83` desc ;
...
...
mysql-test/suite/sys_vars/r/sql_notes_basic.result
deleted
100644 → 0
View file @
22da0de6
SET @session_start_value = @@session.sql_notes;
SELECT @session_start_value;
@session_start_value
1
'#--------------------FN_DYNVARS_161_01------------------------#'
SET @@session.sql_notes = 0;
SET @@session.sql_notes = DEFAULT;
SELECT @@session.sql_notes;
@@session.sql_notes
1
SET @@session.sql_notes = 1;
SET @@session.sql_notes = DEFAULT;
SELECT @@session.sql_notes;
@@session.sql_notes
1
'#---------------------FN_DYNVARS_161_02-------------------------#'
SET sql_notes = 1;
SELECT @@sql_notes;
@@sql_notes
1
SELECT session.sql_notes;
ERROR 42S02: Unknown table 'session' in field list
SELECT local.sql_notes;
ERROR 42S02: Unknown table 'local' in field list
SET session sql_notes = 0;
SELECT @@session.sql_notes;
@@session.sql_notes
0
'#--------------------FN_DYNVARS_161_03------------------------#'
SET @@session.sql_notes = 0;
SELECT @@session.sql_notes;
@@session.sql_notes
0
SET @@session.sql_notes = 1;
SELECT @@session.sql_notes;
@@session.sql_notes
1
'#--------------------FN_DYNVARS_161_04-------------------------#'
SET @@session.sql_notes = -1;
ERROR 42000: Variable 'sql_notes' can't be set to the value of '-1'
SET @@session.sql_notes = 2;
ERROR 42000: Variable 'sql_notes' can't be set to the value of '2'
SET @@session.sql_notes = "T";
ERROR 42000: Variable 'sql_notes' can't be set to the value of 'T'
SET @@session.sql_notes = "Y";
ERROR 42000: Variable 'sql_notes' can't be set to the value of 'Y'
SET @@session.sql_notes = TRÜE;
ERROR 42000: Variable 'sql_notes' can't be set to the value of 'TRÜE'
SET @@session.sql_notes = ÕN;
ERROR 42000: Variable 'sql_notes' can't be set to the value of 'ÕN'
SET @@session.sql_notes = OF;
ERROR 42000: Variable 'sql_notes' can't be set to the value of 'OF'
SET @@session.sql_notes = ÓFF;
ERROR 42000: Variable 'sql_notes' can't be set to the value of 'ÓFF'
SET @@session.sql_notes = '¹';
ERROR 42000: Variable 'sql_notes' can't be set to the value of '¹'
SET @@session.sql_notes = NO;
ERROR 42000: Variable 'sql_notes' can't be set to the value of 'NO'
'#-------------------FN_DYNVARS_161_05----------------------------#'
SET @@global.sql_notes = 1-@@global.sql_notes;
SELECT @@global.sql_notes;
@@global.sql_notes
0
SET @@global.sql_notes = 1-@@global.sql_notes;
SELECT @@global.sql_notes;
@@global.sql_notes
1
'#----------------------FN_DYNVARS_161_06------------------------#'
SELECT count(VARIABLE_VALUE) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='sql_notes';
count(VARIABLE_VALUE)
1
'#----------------------FN_DYNVARS_161_07------------------------#'
SELECT IF(@@session.sql_notes, "ON", "OFF") = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.SESSION_VARIABLES
WHERE VARIABLE_NAME='sql_notes';
IF(@@session.sql_notes, "ON", "OFF") = VARIABLE_VALUE
1
SELECT @@session.sql_notes;
@@session.sql_notes
1
SELECT VARIABLE_VALUE
FROM INFORMATION_SCHEMA.SESSION_VARIABLES
WHERE VARIABLE_NAME='sql_notes';
VARIABLE_VALUE
ON
'#---------------------FN_DYNVARS_161_08-------------------------#'
SET @@session.sql_notes = OFF;
SELECT @@session.sql_notes;
@@session.sql_notes
0
SET @@session.sql_notes = ON;
SELECT @@session.sql_notes;
@@session.sql_notes
1
'#---------------------FN_DYNVARS_161_09----------------------#'
SET @@session.sql_notes = TRUE;
SELECT @@session.sql_notes;
@@session.sql_notes
1
SET @@session.sql_notes = FALSE;
SELECT @@session.sql_notes;
@@session.sql_notes
0
SET @@session.sql_notes = @session_start_value;
SELECT @@session.sql_notes;
@@session.sql_notes
1
mysql-test/suite/sys_vars/r/sql_notes_func.result
View file @
75bfb4b8
...
...
@@ -3,6 +3,8 @@
SET @default_sql_notes = @@sql_notes;
'#--------------------FN_DYNVARS_162_01-------------------------#'
SET SESSION sql_notes = ON;
Warnings:
Warning 1287 '@@sql_notes' is deprecated and will be removed in a future release. Please use '@@note_verbosity' instead
creating a temporary table
CREATE TEMPORARY TABLE t1(a varchar(20), b varchar(20));
conditionally dropping the table twice so that a note generates
...
...
@@ -20,6 +22,8 @@ SELECT @@warning_count;
1 Expected
'#--------------------FN_DYNVARS_162_02-------------------------#'
SET SESSION sql_notes = OFF;
Warnings:
Warning 1287 '@@sql_notes' is deprecated and will be removed in a future release. Please use '@@note_verbosity' instead
creating a temporary table
CREATE TEMPORARY TABLE t1(a varchar(20), b varchar(20));
conditionally dropping the table twice so that a note generates
...
...
@@ -41,6 +45,8 @@ SELECT @@SESSION.sql_notes;
1
1 / TRUE Expected
SET SESSION sql_notes = FALSE;
Warnings:
Warning 1287 '@@sql_notes' is deprecated and will be removed in a future release. Please use '@@note_verbosity' instead
connect con_int2,localhost,root,,;
connection con_int2;
SELECT @@SESSION.sql_notes;
...
...
@@ -48,6 +54,8 @@ SELECT @@SESSION.sql_notes;
1
1 / TRUE Expected
SET SESSION sql_notes = TRUE;
Warnings:
Warning 1287 '@@sql_notes' is deprecated and will be removed in a future release. Please use '@@note_verbosity' instead
connection con_int2;
SELECT @@SESSION.sql_notes;
@@SESSION.sql_notes
...
...
@@ -62,4 +70,6 @@ connection default;
disconnect con_int1;
disconnect con_int2;
SET SESSION sql_notes = @default_sql_notes;
Warnings:
Warning 1287 '@@sql_notes' is deprecated and will be removed in a future release. Please use '@@note_verbosity' instead
DROP TABLE IF EXISTS t1;
mysql-test/suite/sys_vars/t/sql_notes_basic.test
deleted
100644 → 0
View file @
22da0de6
################### mysql-test\t\sql_notes_basic.test #########################
# #
# Variable Name: sql_notes #
# Scope: SESSION #
# Access Type: Dynamic #
# Data Type: boolean #
# Default Value: #
# Valid Values: 0,1 #
# #
# #
# Creation Date: 2008-02-07 #
# Author: Rizwan #
# #
# Description: Test Cases of Dynamic System Variable sql_notes #
# that checks the behavior of this variable in the following ways#
# * Default Value #
# * Valid & Invalid values #
# * Scope & Access method #
# * Data Integrity #
# #
# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
# server-system-variables.html #
# #
###############################################################################
--
source
include
/
load_sysvars
.
inc
########################################################################
# START OF sql_notes TESTS #
########################################################################
##############################################################################
# Saving initial value of sql_notes in a temporary variable #
##############################################################################
SET
@
session_start_value
=
@@
session
.
sql_notes
;
SELECT
@
session_start_value
;
--
echo
'#--------------------FN_DYNVARS_161_01------------------------#'
######################################################################
# Display the DEFAULT value of sql_notes #
######################################################################
SET
@@
session
.
sql_notes
=
0
;
SET
@@
session
.
sql_notes
=
DEFAULT
;
SELECT
@@
session
.
sql_notes
;
SET
@@
session
.
sql_notes
=
1
;
SET
@@
session
.
sql_notes
=
DEFAULT
;
SELECT
@@
session
.
sql_notes
;
--
echo
'#---------------------FN_DYNVARS_161_02-------------------------#'
###########################################################################
# Check if sql_notes can be accessed with and without @@ sign #
###########################################################################
SET
sql_notes
=
1
;
SELECT
@@
sql_notes
;
--
Error
ER_UNKNOWN_TABLE
SELECT
session
.
sql_notes
;
--
Error
ER_UNKNOWN_TABLE
SELECT
local
.
sql_notes
;
SET
session
sql_notes
=
0
;
SELECT
@@
session
.
sql_notes
;
--
echo
'#--------------------FN_DYNVARS_161_03------------------------#'
######################################################################
# change the value of sql_notes to a valid value #
######################################################################
SET
@@
session
.
sql_notes
=
0
;
SELECT
@@
session
.
sql_notes
;
SET
@@
session
.
sql_notes
=
1
;
SELECT
@@
session
.
sql_notes
;
--
echo
'#--------------------FN_DYNVARS_161_04-------------------------#'
#########################################################################
# Change the value of sql_notes to invalid value #
#########################################################################
--
Error
ER_WRONG_VALUE_FOR_VAR
SET
@@
session
.
sql_notes
=
-
1
;
--
Error
ER_WRONG_VALUE_FOR_VAR
SET
@@
session
.
sql_notes
=
2
;
--
Error
ER_WRONG_VALUE_FOR_VAR
SET
@@
session
.
sql_notes
=
"T"
;
--
Error
ER_WRONG_VALUE_FOR_VAR
SET
@@
session
.
sql_notes
=
"Y"
;
--
Error
ER_WRONG_VALUE_FOR_VAR
SET
@@
session
.
sql_notes
=
TRE
;
--
Error
ER_WRONG_VALUE_FOR_VAR
SET
@@
session
.
sql_notes
=
N
;
--
Error
ER_WRONG_VALUE_FOR_VAR
SET
@@
session
.
sql_notes
=
OF
;
--
Error
ER_WRONG_VALUE_FOR_VAR
SET
@@
session
.
sql_notes
=
FF
;
--
Error
ER_WRONG_VALUE_FOR_VAR
SET
@@
session
.
sql_notes
=
''
;
--
Error
ER_WRONG_VALUE_FOR_VAR
SET
@@
session
.
sql_notes
=
NO
;
--
echo
'#-------------------FN_DYNVARS_161_05----------------------------#'
#########################################################################
# Test if accessing global sql_notes gives error #
#########################################################################
SET
@@
global
.
sql_notes
=
1
-@@
global
.
sql_notes
;
SELECT
@@
global
.
sql_notes
;
SET
@@
global
.
sql_notes
=
1
-@@
global
.
sql_notes
;
SELECT
@@
global
.
sql_notes
;
--
echo
'#----------------------FN_DYNVARS_161_06------------------------#'
#########################################################################
# Check if the value in GLOBAL Table contains variable value #
#########################################################################
SELECT
count
(
VARIABLE_VALUE
)
FROM
INFORMATION_SCHEMA
.
GLOBAL_VARIABLES
WHERE
VARIABLE_NAME
=
'sql_notes'
;
--
echo
'#----------------------FN_DYNVARS_161_07------------------------#'
#########################################################################
# Check if the value in GLOBAL Table matches value in variable #
#########################################################################
SELECT
IF
(
@@
session
.
sql_notes
,
"ON"
,
"OFF"
)
=
VARIABLE_VALUE
FROM
INFORMATION_SCHEMA
.
SESSION_VARIABLES
WHERE
VARIABLE_NAME
=
'sql_notes'
;
SELECT
@@
session
.
sql_notes
;
SELECT
VARIABLE_VALUE
FROM
INFORMATION_SCHEMA
.
SESSION_VARIABLES
WHERE
VARIABLE_NAME
=
'sql_notes'
;
--
echo
'#---------------------FN_DYNVARS_161_08-------------------------#'
###################################################################
# Check if ON and OFF values can be used on variable #
###################################################################
SET
@@
session
.
sql_notes
=
OFF
;
SELECT
@@
session
.
sql_notes
;
SET
@@
session
.
sql_notes
=
ON
;
SELECT
@@
session
.
sql_notes
;
--
echo
'#---------------------FN_DYNVARS_161_09----------------------#'
###################################################################
# Check if TRUE and FALSE values can be used on variable #
###################################################################
SET
@@
session
.
sql_notes
=
TRUE
;
SELECT
@@
session
.
sql_notes
;
SET
@@
session
.
sql_notes
=
FALSE
;
SELECT
@@
session
.
sql_notes
;
##############################
# Restore initial value #
##############################
SET
@@
session
.
sql_notes
=
@
session_start_value
;
SELECT
@@
session
.
sql_notes
;
#############################################################
# END OF sql_notes TESTS #
#############################################################
sql/sys_vars.cc
View file @
75bfb4b8
...
...
@@ -4677,7 +4677,9 @@ static Sys_var_bit Sys_sql_notes(
"See also note_verbosity, which allows one to define with notes are "
"sent."
,
SESSION_VAR
(
option_bits
),
NO_CMD_LINE
,
OPTION_SQL_NOTES
,
DEFAULT
(
TRUE
));
DEFAULT
(
TRUE
),
NO_MUTEX_GUARD
,
NOT_IN_BINLOG
,
ON_CHECK
(
0
),
ON_UPDATE
(
0
),
DEPRECATED
(
1103
,
"'@@note_verbosity'"
));
static
Sys_var_bit
Sys_auto_is_null
(
"sql_auto_is_null"
,
"If set to 1, the query SELECT * FROM table_name WHERE "
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment