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
4cb62eb0
Commit
4cb62eb0
authored
Jun 02, 2004
by
monty@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
parents
e6c57151
a1068063
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
50 additions
and
7 deletions
+50
-7
innobase/fil/fil0fil.c
innobase/fil/fil0fil.c
+45
-4
sql/password.c
sql/password.c
+2
-0
sql/sql_acl.cc
sql/sql_acl.cc
+3
-3
No files found.
innobase/fil/fil0fil.c
View file @
4cb62eb0
...
@@ -2572,13 +2572,32 @@ fil_load_single_table_tablespace(
...
@@ -2572,13 +2572,32 @@ fil_load_single_table_tablespace(
fprintf
(
stderr
,
fprintf
(
stderr
,
"InnoDB: Error: could not open single-table tablespace file
\n
"
"InnoDB: Error: could not open single-table tablespace file
\n
"
"InnoDB: %s!
\n
"
,
filepath
);
"InnoDB: %s!
\n
"
"InnoDB: We do no continue crash recovery, because the table will become
\n
"
"InnoDB: corrupt if we cannot apply the log records in the InnoDB log to it.
\n
"
"InnoDB: To fix the problem and start mysqld:
\n
"
"InnoDB: 1) If there is a permission problem in the file and mysqld cannot
\n
"
"InnoDB: open the file, you should modify the permissions.
\n
"
"InnoDB: 2) If the table is not needed, or you can restore it from a backup,
\n
"
"InnoDB: then you can remove the .ibd file, and InnoDB will do a normal
\n
"
"InnoDB: crash recovery and ignore that table.
\n
"
"InnoDB: 3) If the file system or the disk is broken, and you cannot remove
\n
"
"InnoDB: the .ibd file, you can set innodb_force_recovery > 0 in my.cnf
\n
"
"InnoDB: and force InnoDB to continue crash recovery here.
\n
"
,
filepath
);
ut_free
(
filepath
);
ut_free
(
filepath
);
if
(
srv_force_recovery
>
0
)
{
fprintf
(
stderr
,
"InnoDB: innodb_force_recovery was set to %lu. Continuing crash recovery
\n
"
"InnoDB: even though we cannot access the .ibd file of this table.
\n
"
,
srv_force_recovery
);
return
;
return
;
}
}
exit
(
1
);
}
success
=
os_file_get_size
(
file
,
&
size_low
,
&
size_high
);
success
=
os_file_get_size
(
file
,
&
size_low
,
&
size_high
);
if
(
!
success
)
{
if
(
!
success
)
{
...
@@ -2587,14 +2606,36 @@ fil_load_single_table_tablespace(
...
@@ -2587,14 +2606,36 @@ fil_load_single_table_tablespace(
fprintf
(
stderr
,
fprintf
(
stderr
,
"InnoDB: Error: could not measure the size of single-table tablespace file
\n
"
"InnoDB: Error: could not measure the size of single-table tablespace file
\n
"
"InnoDB: %s!
\n
"
,
filepath
);
"InnoDB: %s!
\n
"
"InnoDB: We do no continue crash recovery, because the table will become
\n
"
"InnoDB: corrupt if we cannot apply the log records in the InnoDB log to it.
\n
"
"InnoDB: To fix the problem and start mysqld:
\n
"
"InnoDB: 1) If there is a permission problem in the file and mysqld cannot
\n
"
"InnoDB: access the file, you should modify the permissions.
\n
"
"InnoDB: 2) If the table is not needed, or you can restore it from a backup,
\n
"
"InnoDB: then you can remove the .ibd file, and InnoDB will do a normal
\n
"
"InnoDB: crash recovery and ignore that table.
\n
"
"InnoDB: 3) If the file system or the disk is broken, and you cannot remove
\n
"
"InnoDB: the .ibd file, you can set innodb_force_recovery > 0 in my.cnf
\n
"
"InnoDB: and force InnoDB to continue crash recovery here.
\n
"
,
filepath
);
os_file_close
(
file
);
os_file_close
(
file
);
ut_free
(
filepath
);
ut_free
(
filepath
);
if
(
srv_force_recovery
>
0
)
{
fprintf
(
stderr
,
"InnoDB: innodb_force_recovery was set to %lu. Continuing crash recovery
\n
"
"InnoDB: even though we cannot access the .ibd file of this table.
\n
"
,
srv_force_recovery
);
return
;
return
;
}
}
exit
(
1
);
}
/* TODO: What to do in other cases where we cannot access an .ibd
file during a crash recovery? */
/* Every .ibd file is created >= 4 pages in size. Smaller files
/* Every .ibd file is created >= 4 pages in size. Smaller files
cannot be ok. */
cannot be ok. */
...
...
sql/password.c
View file @
4cb62eb0
...
@@ -218,6 +218,8 @@ check_scramble_323(const char *scrambled, const char *message,
...
@@ -218,6 +218,8 @@ check_scramble_323(const char *scrambled, const char *message,
to
=
buff
;
to
=
buff
;
for
(
pos
=
scrambled
;
*
pos
;
pos
++
)
for
(
pos
=
scrambled
;
*
pos
;
pos
++
)
*
to
++=
(
char
)
(
floor
(
my_rnd
(
&
rand_st
)
*
31
)
+
64
);
*
to
++=
(
char
)
(
floor
(
my_rnd
(
&
rand_st
)
*
31
)
+
64
);
if
(
pos
-
scrambled
!=
SCRAMBLE_LENGTH_323
)
return
1
;
extra
=
(
char
)
(
floor
(
my_rnd
(
&
rand_st
)
*
31
));
extra
=
(
char
)
(
floor
(
my_rnd
(
&
rand_st
)
*
31
));
to
=
buff
;
to
=
buff
;
while
(
*
scrambled
)
while
(
*
scrambled
)
...
...
sql/sql_acl.cc
View file @
4cb62eb0
...
@@ -629,10 +629,10 @@ int acl_getroot(THD *thd, USER_RESOURCES *mqh,
...
@@ -629,10 +629,10 @@ int acl_getroot(THD *thd, USER_RESOURCES *mqh,
if
(
passwd_len
==
acl_user_tmp
->
salt_len
)
if
(
passwd_len
==
acl_user_tmp
->
salt_len
)
{
{
if
(
acl_user_tmp
->
salt_len
==
0
||
if
(
acl_user_tmp
->
salt_len
==
0
||
acl_user_tmp
->
salt_len
==
SCRAMBLE_LENGTH
&&
(
acl_user_tmp
->
salt_len
==
SCRAMBLE_LENGTH
?
check_scramble
(
passwd
,
thd
->
scramble
,
acl_user_tmp
->
salt
)
==
0
||
check_scramble
(
passwd
,
thd
->
scramble
,
acl_user_tmp
->
salt
)
:
check_scramble_323
(
passwd
,
thd
->
scramble
,
check_scramble_323
(
passwd
,
thd
->
scramble
,
(
ulong
*
)
acl_user_tmp
->
salt
)
==
0
)
(
ulong
*
)
acl_user_tmp
->
salt
)
)
==
0
)
{
{
acl_user
=
acl_user_tmp
;
acl_user
=
acl_user_tmp
;
res
=
0
;
res
=
0
;
...
...
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