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
388ba068
Commit
388ba068
authored
7 years ago
by
Igor Babaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Post-merge fixes for mdev-12172, mdev-12176.
parent
9ada5a3c
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
56 additions
and
17 deletions
+56
-17
mysql-test/r/default.result
mysql-test/r/default.result
+1
-1
mysql-test/suite/funcs_1/r/storedproc.result
mysql-test/suite/funcs_1/r/storedproc.result
+7
-6
mysql-test/suite/gcol/inc/gcol_blocked_sql_funcs_main.inc
mysql-test/suite/gcol/inc/gcol_blocked_sql_funcs_main.inc
+1
-1
mysql-test/suite/gcol/r/gcol_blocked_sql_funcs_innodb.result
mysql-test/suite/gcol/r/gcol_blocked_sql_funcs_innodb.result
+2
-2
mysql-test/suite/gcol/r/gcol_blocked_sql_funcs_myisam.result
mysql-test/suite/gcol/r/gcol_blocked_sql_funcs_myisam.result
+2
-2
mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
...test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
+22
-0
mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
+14
-0
mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result
mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result
+2
-2
mysql-test/suite/vcol/t/vcol_blocked_sql_funcs_main.inc
mysql-test/suite/vcol/t/vcol_blocked_sql_funcs_main.inc
+1
-1
sql/item.h
sql/item.h
+1
-1
sql/item_cmpfunc.h
sql/item_cmpfunc.h
+1
-0
sql/sys_vars.cc
sql/sys_vars.cc
+2
-1
No files found.
mysql-test/r/default.result
View file @
388ba068
...
...
@@ -547,7 +547,7 @@ CALL p1;
ERROR 42S22: Unknown column 'par' in 'DEFAULT'
DROP PROCEDURE p1;
CREATE TABLE t1 (a INT DEFAULT VALUE(a));
ERROR HY000: Function or expression 'value
s
()' cannot be used in the DEFAULT clause of `a`
ERROR HY000: Function or expression 'value()' cannot be used in the DEFAULT clause of `a`
CREATE TABLE t1 (a INT);
CREATE TRIGGER tr1 AFTER INSERT ON t1 FOR EACH ROW CREATE TABLE t2 (a INT DEFAULT NEW.a);
ERROR HY000: Function or expression 'NEW.a' cannot be used in the DEFAULT clause of `a`
...
...
This diff is collapsed.
Click to expand it.
mysql-test/suite/funcs_1/r/storedproc.result
View file @
388ba068
No preview for this file type
This diff is collapsed.
Click to expand it.
mysql-test/suite/gcol/inc/gcol_blocked_sql_funcs_main.inc
View file @
388ba068
...
...
@@ -111,7 +111,7 @@ create table t1 (a int, b int generated always as (sleep(a)) virtual);
--
echo
# VALUES()
--
error
ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
create
table
t1
(
a
varchar
(
1024
),
b
varchar
(
1024
)
generated
always
as
(
value
s
(
a
))
virtual
);
create
table
t1
(
a
varchar
(
1024
),
b
varchar
(
1024
)
generated
always
as
(
value
(
a
))
virtual
);
--
echo
# Stored procedures
...
...
This diff is collapsed.
Click to expand it.
mysql-test/suite/gcol/r/gcol_blocked_sql_funcs_innodb.result
View file @
388ba068
...
...
@@ -70,8 +70,8 @@ ERROR HY000: Function or expression 'row_count()' cannot be used in the GENERATE
create table t1 (a int, b int generated always as (sleep(a)) virtual);
ERROR HY000: Function or expression 'sleep()' cannot be used in the GENERATED ALWAYS AS clause of `b`
# VALUES()
create table t1 (a varchar(1024), b varchar(1024) generated always as (value
s
(a)) virtual);
ERROR HY000: Function or expression 'value
s
()' cannot be used in the GENERATED ALWAYS AS clause of `b`
create table t1 (a varchar(1024), b varchar(1024) generated always as (value(a)) virtual);
ERROR HY000: Function or expression 'value()' cannot be used in the GENERATED ALWAYS AS clause of `b`
# Stored procedures
create procedure p1()
begin
...
...
This diff is collapsed.
Click to expand it.
mysql-test/suite/gcol/r/gcol_blocked_sql_funcs_myisam.result
View file @
388ba068
...
...
@@ -72,8 +72,8 @@ ERROR HY000: Function or expression 'row_count()' cannot be used in the GENERATE
create table t1 (a int, b int generated always as (sleep(a)) virtual);
ERROR HY000: Function or expression 'sleep()' cannot be used in the GENERATED ALWAYS AS clause of `b`
# VALUES()
create table t1 (a varchar(1024), b varchar(1024) generated always as (value
s
(a)) virtual);
ERROR HY000: Function or expression 'value
s
()' cannot be used in the GENERATED ALWAYS AS clause of `b`
create table t1 (a varchar(1024), b varchar(1024) generated always as (value(a)) virtual);
ERROR HY000: Function or expression 'value()' cannot be used in the GENERATED ALWAYS AS clause of `b`
# Stored procedures
create procedure p1()
begin
...
...
This diff is collapsed.
Click to expand it.
mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
View file @
388ba068
...
...
@@ -287,6 +287,19 @@
NUMERIC_BLOCK_SIZE 4096
ENUM_VALUE_LIST NULL
READ_ONLY NO
@@ -1556,10 +1556,10 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 10000
VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT The minimum number of scalar elements in the value list of IN predicate that triggers its conversion to IN subquery
NUMERIC_MIN_VALUE 0
-NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL
READ_ONLY NO
@@ -1639,7 +1639,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 86400
...
...
@@ -1267,3 +1280,12 @@
VARIABLE_COMMENT Size of transaction coordinator log.
ENUM_VALUE_LIST NULL
READ_ONLY YES
@@ -5422,7 +5422,7 @@
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes
NUMERIC_MIN_VALUE 0
-NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL
READ_ONLY NO
This diff is collapsed.
Click to expand it.
mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
View file @
388ba068
...
...
@@ -1424,6 +1424,20 @@ NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME IN_SUBQUERY_CONVERSION_THRESHOLD
SESSION_VALUE 10000
GLOBAL_VALUE 10000
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 10000
VARIABLE_SCOPE SESSION
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT The minimum number of scalar elements in the value list of IN predicate that triggers its conversion to IN subquery
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 18446744073709551615
NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME IN_TRANSACTION
SESSION_VALUE 0
GLOBAL_VALUE NULL
...
...
This diff is collapsed.
Click to expand it.
mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result
View file @
388ba068
...
...
@@ -127,8 +127,8 @@ ERROR HY000: Function or expression 'uuid_short()' cannot be used in the GENERAT
create or replace table t1 (a varchar(1024) as (uuid()) PERSISTENT);
ERROR HY000: Function or expression 'uuid()' cannot be used in the GENERATED ALWAYS AS clause of `a`
# VALUES()
create or replace table t1 (a varchar(1024), b varchar(1024) as (value
s
(a)));
ERROR HY000: Function or expression 'value
s
()' cannot be used in the GENERATED ALWAYS AS clause of `b`
create or replace table t1 (a varchar(1024), b varchar(1024) as (value(a)));
ERROR HY000: Function or expression 'value()' cannot be used in the GENERATED ALWAYS AS clause of `b`
# VERSION()
create or replace table t1 (a varchar(1024), b varchar(1024) as (version()) PERSISTENT);
ERROR HY000: Function or expression 'version()' cannot be used in the GENERATED ALWAYS AS clause of `b`
...
...
This diff is collapsed.
Click to expand it.
mysql-test/suite/vcol/t/vcol_blocked_sql_funcs_main.inc
View file @
388ba068
...
...
@@ -187,7 +187,7 @@ create or replace table t1 (a varchar(1024) as (uuid()) PERSISTENT);
--
echo
# VALUES()
--
error
ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
create
or
replace
table
t1
(
a
varchar
(
1024
),
b
varchar
(
1024
)
as
(
value
s
(
a
)));
create
or
replace
table
t1
(
a
varchar
(
1024
),
b
varchar
(
1024
)
as
(
value
(
a
)));
--
echo
# VERSION()
--
error
ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
...
...
This diff is collapsed.
Click to expand it.
sql/item.h
View file @
388ba068
...
...
@@ -5506,7 +5506,7 @@ class Item_insert_value : public Item_field
bool
update_vcol_processor
(
void
*
arg
)
{
return
0
;
}
bool
check_vcol_func_processor
(
void
*
arg
)
{
return
mark_unsupported_function
(
"value
s
()"
,
arg
,
VCOL_IMPOSSIBLE
);
return
mark_unsupported_function
(
"value()"
,
arg
,
VCOL_IMPOSSIBLE
);
}
};
...
...
This diff is collapsed.
Click to expand it.
sql/item_cmpfunc.h
View file @
388ba068
...
...
@@ -2302,6 +2302,7 @@ class Item_func_in :public Item_func_opt_neg,
Item_func_in
(
THD
*
thd
,
List
<
Item
>
&
list
)
:
Item_func_opt_neg
(
thd
,
list
),
Predicant_to_list_comparator
(
thd
,
arg_count
-
1
),
transform_into_subq
(
false
),
array
(
0
),
have_null
(
0
),
arg_types_compatible
(
FALSE
),
emb_on_expr_nest
(
0
)
{
}
...
...
This diff is collapsed.
Click to expand it.
sql/sys_vars.cc
View file @
388ba068
...
...
@@ -5790,6 +5790,8 @@ static Sys_var_mybool Sys_session_track_state_change(
ON_CHECK
(
0
),
ON_UPDATE
(
update_session_track_state_change
));
#endif //EMBEDDED_LIBRARY
static
Sys_var_ulong
Sys_in_subquery_conversion_threshold
(
"in_subquery_conversion_threshold"
,
"The minimum number of scalar elements in the value list of "
...
...
@@ -5797,4 +5799,3 @@ static Sys_var_ulong Sys_in_subquery_conversion_threshold(
SESSION_VAR
(
in_subquery_conversion_threshold
),
CMD_LINE
(
OPT_ARG
),
VALID_RANGE
(
0
,
ULONG_MAX
),
DEFAULT
(
10000
),
BLOCK_SIZE
(
1
));
#endif //EMBEDDED_LIBRARY
This diff is collapsed.
Click to expand it.
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