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
d42d3994
Commit
d42d3994
authored
Jan 11, 2006
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable code for "let" to assign each column from query to it's own variable
parent
a09473e6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
22 deletions
+4
-22
client/mysqltest.c
client/mysqltest.c
+2
-1
mysql-test/r/mysqltest.result
mysql-test/r/mysqltest.result
+0
-19
mysql-test/t/mysqltest.test
mysql-test/t/mysqltest.test
+2
-2
No files found.
client/mysqltest.c
View file @
d42d3994
...
@@ -1205,6 +1205,7 @@ int var_query_set(VAR* var, const char *query, const char** query_end)
...
@@ -1205,6 +1205,7 @@ int var_query_set(VAR* var, const char *query, const char** query_end)
{
{
if
(
row
[
0
])
if
(
row
[
0
])
{
{
#ifdef NOT_YET
/* Add to <var_name>_<col_name> */
/* Add to <var_name>_<col_name> */
uint
j
;
uint
j
;
char
var_col_name
[
MAX_VAR_NAME
];
char
var_col_name
[
MAX_VAR_NAME
];
...
@@ -1218,7 +1219,7 @@ int var_query_set(VAR* var, const char *query, const char** query_end)
...
@@ -1218,7 +1219,7 @@ int var_query_set(VAR* var, const char *query, const char** query_end)
}
}
var_set
(
var_col_name
,
var_col_name
+
length
,
var_set
(
var_col_name
,
var_col_name
+
length
,
row
[
i
],
row
[
i
]
+
lengths
[
i
]);
row
[
i
],
row
[
i
]
+
lengths
[
i
]);
#endif
/* Add column to tab separated string */
/* Add column to tab separated string */
dynstr_append_mem
(
&
result
,
row
[
i
],
lengths
[
i
]);
dynstr_append_mem
(
&
result
,
row
[
i
],
lengths
[
i
]);
}
}
...
...
mysql-test/r/mysqltest.result
View file @
d42d3994
...
@@ -222,25 +222,6 @@ mysqltest: At line 1: Missing arguments to let
...
@@ -222,25 +222,6 @@ mysqltest: At line 1: Missing arguments to let
mysqltest: At line 1: Missing variable name in let
mysqltest: At line 1: Missing variable name in let
mysqltest: At line 1: Variable name in =hi does not start with '$'
mysqltest: At line 1: Variable name in =hi does not start with '$'
mysqltest: At line 1: Missing assignment operator in let
mysqltest: At line 1: Missing assignment operator in let
var1
hi 1 hi there
hi
1
hi there
var2
2
var2 again
2
2
var3 two columns with same name
1 2 3
2
2
3
mysqltest: At line 1: Missing file name in source
mysqltest: At line 1: Missing file name in source
mysqltest: At line 1: Could not open file ./non_existingFile
mysqltest: At line 1: Could not open file ./non_existingFile
mysqltest: In included file "./var/tmp/recursive.sql": At line 1: Source directives are nesting too deep
mysqltest: In included file "./var/tmp/recursive.sql": At line 1: Source directives are nesting too deep
...
...
mysql-test/t/mysqltest.test
View file @
d42d3994
...
@@ -543,7 +543,7 @@ echo $novar1;
...
@@ -543,7 +543,7 @@ echo $novar1;
# Test to assign let from query
# Test to assign let from query
# let $<var_name>=`<query>`;
# let $<var_name>=`<query>`;
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
--
disable_parsing
echo
var1
;
echo
var1
;
let
$var1
=
`select "hi" as "Col", 1 as "Column1", "hi there" as Col3`
;
let
$var1
=
`select "hi" as "Col", 1 as "Column1", "hi there" as Col3`
;
echo
$var1
;
echo
$var1
;
...
@@ -574,7 +574,7 @@ echo $var3_var3;
...
@@ -574,7 +574,7 @@ echo $var3_var3;
#echo failing query in let;
#echo failing query in let;
#--error 1
#--error 1
#--exec echo "let $var2= `failing query;`" | $MYSQL_TEST 2>&1
#--exec echo "let $var2= `failing query;`" | $MYSQL_TEST 2>&1
--
enable_parsing
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
# Test source command
# Test source command
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
...
...
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