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
15e9be7a
Commit
15e9be7a
authored
Dec 11, 2011
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed valgrind problem: reference on deleted memory of temporary table name.
Removed previous patch of this problem.
parent
2e34f182
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
11 deletions
+0
-11
sql/sql_derived.cc
sql/sql_derived.cc
+0
-2
sql/sql_show.cc
sql/sql_show.cc
+0
-9
No files found.
sql/sql_derived.cc
View file @
15e9be7a
...
@@ -211,8 +211,6 @@ exit:
...
@@ -211,8 +211,6 @@ exit:
}
}
orig_table_list
->
derived_result
=
derived_result
;
orig_table_list
->
derived_result
=
derived_result
;
orig_table_list
->
table
=
table
;
orig_table_list
->
table
=
table
;
orig_table_list
->
table_name
=
table
->
s
->
table_name
.
str
;
orig_table_list
->
table_name_length
=
table
->
s
->
table_name
.
length
;
table
->
derived_select_number
=
first_select
->
select_number
;
table
->
derived_select_number
=
first_select
->
select_number
;
table
->
s
->
tmp_table
=
NON_TRANSACTIONAL_TMP_TABLE
;
table
->
s
->
tmp_table
=
NON_TRANSACTIONAL_TMP_TABLE
;
#ifndef NO_EMBEDDED_ACCESS_CHECKS
#ifndef NO_EMBEDDED_ACCESS_CHECKS
...
...
sql/sql_show.cc
View file @
15e9be7a
...
@@ -729,7 +729,6 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
...
@@ -729,7 +729,6 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
Protocol
*
protocol
=
thd
->
protocol
;
Protocol
*
protocol
=
thd
->
protocol
;
char
buff
[
2048
];
char
buff
[
2048
];
String
buffer
(
buff
,
sizeof
(
buff
),
system_charset_info
);
String
buffer
(
buff
,
sizeof
(
buff
),
system_charset_info
);
char
*
save_db
,
*
save_table_name
;
bool
retval
=
TRUE
;
// Assume error
bool
retval
=
TRUE
;
// Assume error
List
<
Item
>
field_list
;
List
<
Item
>
field_list
;
DBUG_ENTER
(
"mysqld_show_create"
);
DBUG_ENTER
(
"mysqld_show_create"
);
...
@@ -739,10 +738,6 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
...
@@ -739,10 +738,6 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
/* We want to preserve the tree for views. */
/* We want to preserve the tree for views. */
thd
->
lex
->
context_analysis_only
|=
CONTEXT_ANALYSIS_ONLY_VIEW
;
thd
->
lex
->
context_analysis_only
|=
CONTEXT_ANALYSIS_ONLY_VIEW
;
/* Store original names if called from SP */
save_db
=
table_list
->
db
;
save_table_name
=
table_list
->
table_name
;
{
{
Show_create_error_handler
view_error_suppressor
(
thd
,
table_list
);
Show_create_error_handler
view_error_suppressor
(
thd
,
table_list
);
thd
->
push_internal_handler
(
&
view_error_suppressor
);
thd
->
push_internal_handler
(
&
view_error_suppressor
);
...
@@ -825,11 +820,7 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
...
@@ -825,11 +820,7 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
retval
=
FALSE
;
// ok
retval
=
FALSE
;
// ok
error:
error:
/* Restore table list if called by stored procedure */
table_list
->
db
=
save_db
;
table_list
->
table_name
=
save_table_name
;
DBUG_RETURN
(
retval
);
DBUG_RETURN
(
retval
);
}
}
bool
mysqld_show_create_db
(
THD
*
thd
,
char
*
dbname
,
bool
mysqld_show_create_db
(
THD
*
thd
,
char
*
dbname
,
...
...
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