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
ae83d682
Commit
ae83d682
authored
May 04, 2006
by
monty@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
parents
634afcc9
e71ad86c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
1 deletion
+10
-1
sql/item_func.h
sql/item_func.h
+1
-0
sql/sp.cc
sql/sp.cc
+1
-1
sql/sp_head.cc
sql/sp_head.cc
+4
-0
sql/sp_head.h
sql/sp_head.h
+3
-0
sql/sql_view.cc
sql/sql_view.cc
+1
-0
No files found.
sql/item_func.h
View file @
ae83d682
...
@@ -284,6 +284,7 @@ class Item_func_connection_id :public Item_int_func
...
@@ -284,6 +284,7 @@ class Item_func_connection_id :public Item_int_func
longlong
value
;
longlong
value
;
public:
public:
Item_func_connection_id
()
{}
const
char
*
func_name
()
const
{
return
"connection_id"
;
}
const
char
*
func_name
()
const
{
return
"connection_id"
;
}
void
fix_length_and_dec
();
void
fix_length_and_dec
();
bool
fix_fields
(
THD
*
thd
,
Item
**
ref
);
bool
fix_fields
(
THD
*
thd
,
Item
**
ref
);
...
...
sql/sp.cc
View file @
ae83d682
...
@@ -269,7 +269,6 @@ db_find_routine_aux(THD *thd, int type, sp_name *name, TABLE *table)
...
@@ -269,7 +269,6 @@ db_find_routine_aux(THD *thd, int type, sp_name *name, TABLE *table)
static
int
static
int
db_find_routine
(
THD
*
thd
,
int
type
,
sp_name
*
name
,
sp_head
**
sphp
)
db_find_routine
(
THD
*
thd
,
int
type
,
sp_name
*
name
,
sp_head
**
sphp
)
{
{
extern
int
MYSQLparse
(
void
*
thd
);
TABLE
*
table
;
TABLE
*
table
;
const
char
*
params
,
*
returns
,
*
body
;
const
char
*
params
,
*
returns
,
*
body
;
int
ret
;
int
ret
;
...
@@ -478,6 +477,7 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp,
...
@@ -478,6 +477,7 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp,
(
*
sphp
)
->
optimize
();
(
*
sphp
)
->
optimize
();
}
}
end:
end:
lex_end
(
thd
->
lex
);
thd
->
spcont
=
old_spcont
;
thd
->
spcont
=
old_spcont
;
thd
->
variables
.
sql_mode
=
old_sql_mode
;
thd
->
variables
.
sql_mode
=
old_sql_mode
;
thd
->
variables
.
select_limit
=
old_select_limit
;
thd
->
variables
.
select_limit
=
old_select_limit
;
...
...
sql/sp_head.cc
View file @
ae83d682
...
@@ -671,6 +671,7 @@ sp_head::destroy()
...
@@ -671,6 +671,7 @@ sp_head::destroy()
DBUG_ASSERT
(
m_lex
.
is_empty
()
||
m_thd
);
DBUG_ASSERT
(
m_lex
.
is_empty
()
||
m_thd
);
while
((
lex
=
(
LEX
*
)
m_lex
.
pop
()))
while
((
lex
=
(
LEX
*
)
m_lex
.
pop
()))
{
{
lex_end
(
m_thd
->
lex
);
delete
m_thd
->
lex
;
delete
m_thd
->
lex
;
m_thd
->
lex
=
lex
;
m_thd
->
lex
=
lex
;
}
}
...
@@ -1643,7 +1644,10 @@ sp_head::restore_lex(THD *thd)
...
@@ -1643,7 +1644,10 @@ sp_head::restore_lex(THD *thd)
*/
*/
merge_table_list
(
thd
,
sublex
->
query_tables
,
sublex
);
merge_table_list
(
thd
,
sublex
->
query_tables
,
sublex
);
if
(
!
sublex
->
sp_lex_in_use
)
if
(
!
sublex
->
sp_lex_in_use
)
{
lex_end
(
sublex
);
delete
sublex
;
delete
sublex
;
}
thd
->
lex
=
oldlex
;
thd
->
lex
=
oldlex
;
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
}
}
...
...
sql/sp_head.h
View file @
ae83d682
...
@@ -520,7 +520,10 @@ class sp_lex_keeper
...
@@ -520,7 +520,10 @@ class sp_lex_keeper
virtual
~
sp_lex_keeper
()
virtual
~
sp_lex_keeper
()
{
{
if
(
m_lex_resp
)
if
(
m_lex_resp
)
{
lex_end
(
m_lex
);
delete
m_lex
;
delete
m_lex
;
}
}
}
/*
/*
...
...
sql/sql_view.cc
View file @
ae83d682
...
@@ -1195,6 +1195,7 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table)
...
@@ -1195,6 +1195,7 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table)
end:
end:
if
(
arena
)
if
(
arena
)
thd
->
restore_active_arena
(
arena
,
&
backup
);
thd
->
restore_active_arena
(
arena
,
&
backup
);
lex_end
(
thd
->
lex
);
thd
->
lex
=
old_lex
;
thd
->
lex
=
old_lex
;
DBUG_RETURN
(
result
);
DBUG_RETURN
(
result
);
...
...
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