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
3d5868c6
Commit
3d5868c6
authored
Jan 14, 2011
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
compare "Copying to tmp table" proc_info as a pointer, not as a string
parent
563da78d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
sql/sql_select.cc
sql/sql_select.cc
+5
-3
No files found.
sql/sql_select.cc
View file @
3d5868c6
...
@@ -45,6 +45,8 @@ const char *join_type_str[]={ "UNKNOWN","system","const","eq_ref","ref",
...
@@ -45,6 +45,8 @@ const char *join_type_str[]={ "UNKNOWN","system","const","eq_ref","ref",
"index_merge"
"index_merge"
};
};
const
char
*
copy_to_tmp_table
=
"Copying to tmp table"
;
struct
st_sargable_param
;
struct
st_sargable_param
;
static
void
optimize_keyuse
(
JOIN
*
join
,
DYNAMIC_ARRAY
*
keyuse_array
);
static
void
optimize_keyuse
(
JOIN
*
join
,
DYNAMIC_ARRAY
*
keyuse_array
);
...
@@ -1987,7 +1989,7 @@ JOIN::exec()
...
@@ -1987,7 +1989,7 @@ JOIN::exec()
curr_tmp_table
=
exec_tmp_table1
;
curr_tmp_table
=
exec_tmp_table1
;
/* Copy data to the temporary table */
/* Copy data to the temporary table */
thd_proc_info
(
thd
,
"Copying to tmp table"
);
thd_proc_info
(
thd
,
copy_to_tmp_table
);
DBUG_PRINT
(
"info"
,
(
"%s"
,
thd
->
proc_info
));
DBUG_PRINT
(
"info"
,
(
"%s"
,
thd
->
proc_info
));
if
(
!
curr_join
->
sort_and_group
&&
if
(
!
curr_join
->
sort_and_group
&&
curr_join
->
const_tables
!=
curr_join
->
tables
)
curr_join
->
const_tables
!=
curr_join
->
tables
)
...
@@ -12857,8 +12859,8 @@ create_internal_tmp_table_from_heap2(THD *thd, TABLE *table,
...
@@ -12857,8 +12859,8 @@ create_internal_tmp_table_from_heap2(THD *thd, TABLE *table,
table
->
file
->
change_table_ptr
(
table
,
table
->
s
);
table
->
file
->
change_table_ptr
(
table
,
table
->
s
);
table
->
use_all_columns
();
table
->
use_all_columns
();
if
(
save_proc_info
)
if
(
save_proc_info
)
thd_proc_info
(
thd
,
(
!
strcmp
(
save_proc_info
,
"Copying to tmp table"
)
?
thd_proc_info
(
thd
,
save_proc_info
==
copy_to_tmp_table
?
"Copying to tmp table on disk"
:
save_proc_info
)
);
"Copying to tmp table on disk"
:
save_proc_info
);
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
err:
err:
...
...
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