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
75fb3213
Commit
75fb3213
authored
Nov 06, 2016
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix: Item_func_dyncol_add::print()
parent
0980627f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
1 deletion
+17
-1
mysql-test/r/dyncol.result
mysql-test/r/dyncol.result
+8
-0
mysql-test/t/dyncol.test
mysql-test/t/dyncol.test
+8
-0
sql/item_strfunc.cc
sql/item_strfunc.cc
+1
-1
No files found.
mysql-test/r/dyncol.result
View file @
75fb3213
...
@@ -1878,6 +1878,14 @@ COLUMN_JSON(COLUMN_CREATE('a',1 AS DECIMAL,'b',1 AS DECIMAL))
...
@@ -1878,6 +1878,14 @@ COLUMN_JSON(COLUMN_CREATE('a',1 AS DECIMAL,'b',1 AS DECIMAL))
#
#
# Start of 10.2 tests
# Start of 10.2 tests
#
#
create view v1 as select column_get(column_add(column_create(1 , 'blue' as char), 2, 'ttt'), 1 as char);
show create view v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select column_get(column_add(column_create(1,'blue' AS char charset utf8 ),2,'ttt'),1 as char charset utf8) AS `Name_exp_1` utf8 utf8_general_ci
select * from v1;
Name_exp_1
blue
drop view v1;
#
#
# MDEV-10134 Add full support for DEFAULT
# MDEV-10134 Add full support for DEFAULT
#
#
...
...
mysql-test/t/dyncol.test
View file @
75fb3213
...
@@ -928,6 +928,14 @@ SELECT COLUMN_JSON(COLUMN_CREATE('a',1 AS DECIMAL,'b',1 AS DECIMAL));
...
@@ -928,6 +928,14 @@ SELECT COLUMN_JSON(COLUMN_CREATE('a',1 AS DECIMAL,'b',1 AS DECIMAL));
--
echo
# Start of 10.2 tests
--
echo
# Start of 10.2 tests
--
echo
#
--
echo
#
#
# Item_func_dyncol_add::print
#
create
view
v1
as
select
column_get
(
column_add
(
column_create
(
1
,
'blue'
as
char
),
2
,
'ttt'
),
1
as
char
);
show
create
view
v1
;
select
*
from
v1
;
drop
view
v1
;
--
echo
#
--
echo
#
--
echo
# MDEV-10134 Add full support for DEFAULT
--
echo
# MDEV-10134 Add full support for DEFAULT
--
echo
#
--
echo
#
...
...
sql/item_strfunc.cc
View file @
75fb3213
...
@@ -4743,7 +4743,7 @@ void Item_func_dyncol_add::print(String *str,
...
@@ -4743,7 +4743,7 @@ void Item_func_dyncol_add::print(String *str,
enum_query_type
query_type
)
enum_query_type
query_type
)
{
{
DBUG_ASSERT
((
arg_count
&
0x1
)
==
1
);
// odd number of arguments
DBUG_ASSERT
((
arg_count
&
0x1
)
==
1
);
// odd number of arguments
str
->
append
(
STRING_WITH_LEN
(
"column_
create
("
));
str
->
append
(
STRING_WITH_LEN
(
"column_
add
("
));
args
[
arg_count
-
1
]
->
print
(
str
,
query_type
);
args
[
arg_count
-
1
]
->
print
(
str
,
query_type
);
str
->
append
(
','
);
str
->
append
(
','
);
print_arguments
(
str
,
query_type
);
print_arguments
(
str
,
query_type
);
...
...
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