diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/cte_recursive.result | 10 | ||||
| -rw-r--r-- | mysql-test/r/mysqld--help.result | 8 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_server_embedded.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/cte_recursive.test | 18 |
5 files changed, 22 insertions, 22 deletions
diff --git a/mysql-test/r/cte_recursive.result b/mysql-test/r/cte_recursive.result index 20ca5c8f8cb..0624099e365 100644 --- a/mysql-test/r/cte_recursive.result +++ b/mysql-test/r/cte_recursive.result @@ -955,7 +955,7 @@ where folks.id = ma.id and (mother not in (select id from ancestor_ids)) select generation, name from ancestor_ids a, folks where a.id = folks.id; ERROR HY000: Restrictions imposed on recursive definitions are violated for table 'ancestor_ids' -set standards_compliant_cte=0; +set standard_compliant_cte=0; with recursive ancestor_ids (id, generation) as @@ -999,7 +999,7 @@ generation name 2 Grandma Sally 2 Grandpa Ben 3 Grandgrandma Martha -set standards_compliant_cte=1; +set standard_compliant_cte=1; with recursive coupled_ancestor_ids (id) as @@ -1023,7 +1023,7 @@ n.father is not null and n.mother is not null select p.* from coupled_ancestor_ids a, folks p where a.id = p.id; ERROR HY000: Restrictions imposed on recursive definitions are violated for table 'coupled_ancestor_ids' -set statement standards_compliant_cte=0 for +set statement standard_compliant_cte=0 for with recursive coupled_ancestor_ids (id) as @@ -1073,7 +1073,7 @@ where p.id = a.id ) select * from ancestors; ERROR HY000: Restrictions imposed on recursive definitions are violated for table 'ancestor_ids' -set statement standards_compliant_cte=0 for +set statement standard_compliant_cte=0 for with recursive ancestor_ids (id) as @@ -1156,7 +1156,7 @@ where p.id = a.id ) select * from ancestors; ERROR HY000: Restrictions imposed on recursive definitions are violated for table 'ancestor_ids' -set statement standards_compliant_cte=0 for +set statement standard_compliant_cte=0 for with recursive ancestor_ids (id, generation) as diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 0819542727c..9ebd0f37444 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -1068,9 +1068,9 @@ The following options may be given as the first argument: NO_ENGINE_SUBSTITUTION, PAD_CHAR_TO_FULL_LENGTH --stack-trace Print a symbolic stack trace on failure (Defaults to on; use --skip-stack-trace to disable.) - --standards-compliant-cte - Allow only standards compiant CTE - (Defaults to on; use --skip-standards-compliant-cte to disable.) + --standard-compliant-cte + Allow only CTEs compliant to SQL standard + (Defaults to on; use --skip-standard-compliant-cte to disable.) --stored-program-cache=# The soft upper limit for number of cached stored routines for one connection. @@ -1470,7 +1470,7 @@ slow-query-log FALSE sort-buffer-size 2097152 sql-mode NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION stack-trace TRUE -standards-compliant-cte TRUE +standard-compliant-cte TRUE stored-program-cache 256 strict-password-validation TRUE symbolic-links FALSE diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result index ace6beb9b69..d9ca81542cc 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -3803,14 +3803,14 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT NULL -VARIABLE_NAME STANDARDS_COMPLIANT_CTE +VARIABLE_NAME STANDARD_COMPLIANT_CTE SESSION_VALUE ON GLOBAL_VALUE ON GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE ON VARIABLE_SCOPE SESSION VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Allow only standards compiant CTE +VARIABLE_COMMENT Allow only CTEs compliant to SQL standard NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result index dca5b74b840..fd5102d8a60 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -4559,14 +4559,14 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME STANDARDS_COMPLIANT_CTE +VARIABLE_NAME STANDARD_COMPLIANT_CTE SESSION_VALUE ON GLOBAL_VALUE ON GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE ON VARIABLE_SCOPE SESSION VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Allow only standards compiant CTE +VARIABLE_COMMENT Allow only CTEs compliant to SQL standard NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL diff --git a/mysql-test/t/cte_recursive.test b/mysql-test/t/cte_recursive.test index aacafcb73ec..334599f1653 100644 --- a/mysql-test/t/cte_recursive.test +++ b/mysql-test/t/cte_recursive.test @@ -787,7 +787,7 @@ as select * from ancestors; ---ERROR ER_NOT_STANDARDS_COMPLIANT_RECURSIVE +--ERROR ER_NOT_STANDARD_COMPLIANT_RECURSIVE with recursive ancestor_ids (id, generation) as @@ -805,7 +805,7 @@ as select generation, name from ancestor_ids a, folks where a.id = folks.id; -set standards_compliant_cte=0; +set standard_compliant_cte=0; --ERROR ER_WITH_COL_WRONG_LIST with recursive @@ -844,9 +844,9 @@ as select generation, name from ancestor_ids a, folks where a.id = folks.id; -set standards_compliant_cte=1; +set standard_compliant_cte=1; ---ERROR ER_NOT_STANDARDS_COMPLIANT_RECURSIVE +--ERROR ER_NOT_STANDARD_COMPLIANT_RECURSIVE with recursive coupled_ancestor_ids (id) as @@ -870,7 +870,7 @@ as select p.* from coupled_ancestor_ids a, folks p where a.id = p.id; -set statement standards_compliant_cte=0 for +set statement standard_compliant_cte=0 for with recursive coupled_ancestor_ids (id) as @@ -894,7 +894,7 @@ as select p.* from coupled_ancestor_ids a, folks p where a.id = p.id; ---ERROR ER_NOT_STANDARDS_COMPLIANT_RECURSIVE +--ERROR ER_NOT_STANDARD_COMPLIANT_RECURSIVE with recursive ancestor_ids (id) as @@ -915,7 +915,7 @@ as ) select * from ancestors; -set statement standards_compliant_cte=0 for +set statement standard_compliant_cte=0 for with recursive ancestor_ids (id) as @@ -958,7 +958,7 @@ as ) select * from ancestors; ---ERROR ER_NOT_STANDARDS_COMPLIANT_RECURSIVE +--ERROR ER_NOT_STANDARD_COMPLIANT_RECURSIVE with recursive ancestor_ids (id, generation) as @@ -983,7 +983,7 @@ as ) select * from ancestors; -set statement standards_compliant_cte=0 for +set statement standard_compliant_cte=0 for with recursive ancestor_ids (id, generation) as |