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
166c0689
Commit
166c0689
authored
Mar 15, 2004
by
serg@serg.mylan
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents
420c956d
3351b01d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
8 deletions
+5
-8
sql/sql_select.cc
sql/sql_select.cc
+1
-2
sql/sql_table.cc
sql/sql_table.cc
+4
-6
No files found.
sql/sql_select.cc
View file @
166c0689
...
...
@@ -842,8 +842,7 @@ JOIN::optimize()
for
(
uint
i_h
=
const_tables
;
i_h
<
tables
;
i_h
++
)
{
TABLE
*
table_h
=
join_tab
[
i_h
].
table
;
if
(
table_h
->
db_type
==
DB_TYPE_INNODB
)
table_h
->
file
->
extra
(
HA_EXTRA_RETRIEVE_ALL_COLS
);
table_h
->
file
->
extra
(
HA_EXTRA_RETRIEVE_ALL_COLS
);
}
}
#endif
...
...
sql/sql_table.cc
View file @
166c0689
...
...
@@ -2979,12 +2979,10 @@ int mysql_checksum_table(THD *thd, TABLE_LIST *tables, HA_CHECK_OPT *check_opt)
/* calculating table's checksum */
ha_checksum
crc
=
0
;
if
(
t
->
db_type
==
DB_TYPE_INNODB
)
{
/* InnoDB must be told explicitly to retrieve all columns, because
this function does not set field->query_id in the columns to the
current query id */
t
->
file
->
extra
(
HA_EXTRA_RETRIEVE_ALL_COLS
);
}
/* InnoDB must be told explicitly to retrieve all columns, because
this function does not set field->query_id in the columns to the
current query id */
t
->
file
->
extra
(
HA_EXTRA_RETRIEVE_ALL_COLS
);
if
(
t
->
file
->
rnd_init
(
1
))
protocol
->
store_null
();
...
...
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