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
94250392
Commit
94250392
authored
Feb 17, 2006
by
holyfoot@deer.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WL#2645 (CHECK FOR UPGRADE)
5.1-related fixes
parent
be02944d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
8 deletions
+6
-8
.bzrignore
.bzrignore
+1
-0
sql/ha_partition.cc
sql/ha_partition.cc
+2
-2
sql/handler.cc
sql/handler.cc
+3
-6
No files found.
.bzrignore
View file @
94250392
...
...
@@ -1613,3 +1613,4 @@ vio/viotest-sslconnect.cpp
vio/viotest.cpp
zlib/*.ds?
zlib/*.vcproj
scripts/mysql_upgrade
sql/ha_partition.cc
View file @
94250392
...
...
@@ -1078,9 +1078,9 @@ static int handle_opt_part(THD *thd, HA_CHECK_OPT *check_opt,
else
if
(
flag
==
ANALYZE_PARTS
)
error
=
file
->
analyze
(
thd
,
check_opt
);
else
if
(
flag
==
CHECK_PARTS
)
error
=
file
->
check
(
thd
,
check_opt
);
error
=
file
->
ha_
check
(
thd
,
check_opt
);
else
if
(
flag
==
REPAIR_PARTS
)
error
=
file
->
repair
(
thd
,
check_opt
);
error
=
file
->
ha_
repair
(
thd
,
check_opt
);
else
{
DBUG_ASSERT
(
FALSE
);
...
...
sql/handler.cc
View file @
94250392
...
...
@@ -2081,10 +2081,7 @@ static bool update_frm_version(TABLE *table, bool needs_lock)
if
(
table
->
s
->
mysql_version
!=
MYSQL_VERSION_ID
)
DBUG_RETURN
(
0
);
strxnmov
(
path
,
sizeof
(
path
)
-
1
,
mysql_data_home
,
"/"
,
table
->
s
->
db
,
"/"
,
table
->
s
->
table_name
,
reg_ext
,
NullS
);
if
(
!
unpack_filename
(
path
,
path
))
DBUG_RETURN
(
1
);
strxmov
(
path
,
table
->
s
->
normalized_path
.
str
,
reg_ext
,
NullS
);
if
(
needs_lock
)
pthread_mutex_lock
(
&
LOCK_open
);
...
...
@@ -2092,8 +2089,8 @@ static bool update_frm_version(TABLE *table, bool needs_lock)
if
((
file
=
my_open
(
path
,
O_RDWR
|
O_BINARY
,
MYF
(
MY_WME
)))
>=
0
)
{
uchar
version
[
4
];
char
*
key
=
table
->
s
->
table_cache_key
;
uint
key_length
=
table
->
s
->
key_
length
;
char
*
key
=
table
->
s
->
table_cache_key
.
str
;
uint
key_length
=
table
->
s
->
table_cache_key
.
length
;
TABLE
*
entry
;
HASH_SEARCH_STATE
state
;
...
...
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