Skip to content

M
MariaDB
Commit 75bfb4b8 authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

deprecate SQL_NOTES variable in favor of NOTE_VERBOSITY 

as suggested by Monty
parent 22da0de6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 179 additions and 430 deletions
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
This diff is collapsed.
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/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 "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7