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
3936edd7
Commit
3936edd7
authored
Feb 02, 2005
by
monty@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed during review of new pulled code
parent
b131520f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
8 deletions
+18
-8
extra/perror.c
extra/perror.c
+8
-6
sql/sql_table.cc
sql/sql_table.cc
+7
-2
sql/sql_update.cc
sql/sql_update.cc
+3
-0
No files found.
extra/perror.c
View file @
3936edd7
...
...
@@ -213,12 +213,14 @@ int main(int argc,char *argv[])
string 'Unknown Error'. To avoid printing it we try to find the
error string by asking for an impossible big error message.
*/
msg
=
strerror
(
10000
);
msg
=
strerror
(
10000
);
/* allocate a buffer for unknown_error since strerror always returns the same pointer
on some platforms such as Windows */
unknown_error
=
malloc
(
strlen
(
msg
)
+
1
);
strcpy
(
unknown_error
,
msg
);
/*
Allocate a buffer for unknown_error since strerror always returns
the same pointer on some platforms such as Windows
*/
unknown_error
=
malloc
(
strlen
(
msg
)
+
1
);
strmov
(
unknown_error
,
msg
);
for
(
;
argc
--
>
0
;
argv
++
)
{
...
...
sql/sql_table.cc
View file @
3936edd7
...
...
@@ -2272,7 +2272,10 @@ int mysql_create_like_table(THD* thd, TABLE_LIST* table,
strxmov
(
src_path
,
(
*
tmp_table
)
->
path
,
reg_ext
,
NullS
);
else
{
fn_format
(
src_path
,
src_table
,
src_db
,
reg_ext
,
MYF
(
MY_UNPACK_FILENAME
));
strxmov
(
src_path
,
mysql_data_home
,
"/"
,
src_db
,
"/"
,
src_table
,
reg_ext
,
NullS
);
/* Resolve symlinks (for windows) */
fn_format
(
src_path
,
src_path
,
""
,
""
,
MYF
(
MY_UNPACK_FILENAME
));
if
(
access
(
src_path
,
F_OK
))
{
my_error
(
ER_BAD_TABLE_ERROR
,
MYF
(
0
),
src_table
);
...
...
@@ -2299,7 +2302,9 @@ int mysql_create_like_table(THD* thd, TABLE_LIST* table,
}
else
{
fn_format
(
dst_path
,
table_name
,
db
,
reg_ext
,
MYF
(
MY_UNPACK_FILENAME
));
strxmov
(
dst_path
,
mysql_data_home
,
"/"
,
db
,
"/"
,
table_name
,
reg_ext
,
NullS
);
fn_format
(
dst_path
,
dst_path
,
""
,
""
,
MYF
(
MY_UNPACK_FILENAME
));
if
(
!
access
(
dst_path
,
F_OK
))
goto
table_exists
;
}
...
...
sql/sql_update.cc
View file @
3936edd7
...
...
@@ -167,7 +167,10 @@ int mysql_update(THD *thd,
else
if
((
used_index
=
table
->
file
->
key_used_on_scan
)
<
MAX_KEY
)
used_key_is_modified
=
check_if_key_used
(
table
,
used_index
,
fields
);
else
{
used_key_is_modified
=
0
;
used_index
=
MAX_KEY
;
}
if
(
used_key_is_modified
||
order
)
{
/*
...
...
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