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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
59b3c197
Commit
59b3c197
authored
May 11, 2006
by
reggie@big_geek
Browse files
Options
Browse Files
Download
Plain Diff
Merge reggie@192.168.1.107:/home/reggie/work/mysql-5.1
into big_geek.:C:/Work/mysql/mysql-5.1-test
parents
67a692f9
431582af
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
12 deletions
+25
-12
mysql-test/r/rpl_user_variables.result
mysql-test/r/rpl_user_variables.result
+1
-0
mysql-test/t/rpl_user_variables.test
mysql-test/t/rpl_user_variables.test
+1
-0
sql/item_func.cc
sql/item_func.cc
+10
-0
sql/sql_prepare.cc
sql/sql_prepare.cc
+13
-12
No files found.
mysql-test/r/rpl_user_variables.result
View file @
59b3c197
...
@@ -78,5 +78,6 @@ abcn1
...
@@ -78,5 +78,6 @@ abcn1
abcn1n2
abcn1n2
abc\def
abc\def
This is a test
This is a test
insert into t1 select * FROM (select @var1 union select @var2) AS t2;
drop table t1;
drop table t1;
stop slave;
stop slave;
mysql-test/t/rpl_user_variables.test
View file @
59b3c197
...
@@ -55,6 +55,7 @@ SELECT * FROM t1 ORDER BY n;
...
@@ -55,6 +55,7 @@ SELECT * FROM t1 ORDER BY n;
sync_slave_with_master
;
sync_slave_with_master
;
SELECT
*
FROM
t1
ORDER
BY
n
;
SELECT
*
FROM
t1
ORDER
BY
n
;
connection
master
;
connection
master
;
insert
into
t1
select
*
FROM
(
select
@
var1
union
select
@
var2
)
AS
t2
;
drop
table
t1
;
drop
table
t1
;
sync_slave_with_master
;
sync_slave_with_master
;
stop
slave
;
stop
slave
;
sql/item_func.cc
View file @
59b3c197
...
@@ -3948,14 +3948,24 @@ int get_var_with_binlog(THD *thd, enum_sql_command sql_command,
...
@@ -3948,14 +3948,24 @@ int get_var_with_binlog(THD *thd, enum_sql_command sql_command,
sql_set_variables(), we could instead manually call check() and update();
sql_set_variables(), we could instead manually call check() and update();
this would save memory and time; but calling sql_set_variables() makes
this would save memory and time; but calling sql_set_variables() makes
one unique place to maintain (sql_set_variables()).
one unique place to maintain (sql_set_variables()).
Manipulation with lex is necessary since free_underlaid_joins
is going to release memory belonging to the main query.
*/
*/
List
<
set_var_base
>
tmp_var_list
;
List
<
set_var_base
>
tmp_var_list
;
LEX
*
sav_lex
=
thd
->
lex
,
lex_tmp
;
thd
->
lex
=
&
lex_tmp
;
lex_start
(
thd
,
NULL
,
0
);
tmp_var_list
.
push_back
(
new
set_var_user
(
new
Item_func_set_user_var
(
name
,
tmp_var_list
.
push_back
(
new
set_var_user
(
new
Item_func_set_user_var
(
name
,
new
Item_null
())));
new
Item_null
())));
/* Create the variable */
/* Create the variable */
if
(
sql_set_variables
(
thd
,
&
tmp_var_list
))
if
(
sql_set_variables
(
thd
,
&
tmp_var_list
))
{
thd
->
lex
=
sav_lex
;
goto
err
;
goto
err
;
}
thd
->
lex
=
sav_lex
;
if
(
!
(
var_entry
=
get_variable
(
&
thd
->
user_vars
,
name
,
0
)))
if
(
!
(
var_entry
=
get_variable
(
&
thd
->
user_vars
,
name
,
0
)))
goto
err
;
goto
err
;
}
}
...
...
sql/sql_prepare.cc
View file @
59b3c197
...
@@ -2087,7 +2087,8 @@ void reinit_stmt_before_use(THD *thd, LEX *lex)
...
@@ -2087,7 +2087,8 @@ void reinit_stmt_before_use(THD *thd, LEX *lex)
sl
->
exclude_from_table_unique_test
=
FALSE
;
sl
->
exclude_from_table_unique_test
=
FALSE
;
/*
/*
Copy WHERE, HAVING clause pointers to avoid damaging them by optimisation
Copy WHERE, HAVING clause pointers to avoid damaging them
by optimisation
*/
*/
if
(
sl
->
prep_where
)
if
(
sl
->
prep_where
)
{
{
...
...
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