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
97b4a341
Commit
97b4a341
authored
20 years ago
by
monty@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
parents
33c97a49
dd1b2ace
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
6 deletions
+23
-6
innobase/os/os0file.c
innobase/os/os0file.c
+4
-4
innobase/row/row0ins.c
innobase/row/row0ins.c
+17
-0
innobase/row/row0mysql.c
innobase/row/row0mysql.c
+2
-2
No files found.
innobase/os/os0file.c
View file @
97b4a341
...
...
@@ -1807,7 +1807,7 @@ os_file_pread(
os_file_n_pending_preads
++
;
os_mutex_exit
(
os_file_count_mutex
);
n_bytes
=
pread
(
file
,
buf
,
n
,
offs
);
n_bytes
=
pread
(
file
,
buf
,
(
ssize_t
)
n
,
offs
);
os_mutex_enter
(
os_file_count_mutex
);
os_file_n_pending_preads
--
;
...
...
@@ -1832,7 +1832,7 @@ os_file_pread(
return
(
ret
);
}
ret
=
read
(
file
,
buf
,
n
);
ret
=
read
(
file
,
buf
,
(
ssize_t
)
n
);
os_mutex_exit
(
os_file_seek_mutexes
[
i
]);
...
...
@@ -1882,7 +1882,7 @@ os_file_pwrite(
os_file_n_pending_pwrites
++
;
os_mutex_exit
(
os_file_count_mutex
);
ret
=
pwrite
(
file
,
buf
,
n
,
offs
);
ret
=
pwrite
(
file
,
buf
,
(
ssize_t
)
n
,
offs
);
os_mutex_enter
(
os_file_count_mutex
);
os_file_n_pending_pwrites
--
;
...
...
@@ -1917,7 +1917,7 @@ os_file_pwrite(
return
(
ret
);
}
ret
=
write
(
file
,
buf
,
n
);
ret
=
write
(
file
,
buf
,
(
ssize_t
)
n
);
if
(
srv_unix_file_flush_method
!=
SRV_UNIX_LITTLESYNC
&&
srv_unix_file_flush_method
!=
SRV_UNIX_NOSYNC
...
...
This diff is collapsed.
Click to expand it.
innobase/row/row0ins.c
View file @
97b4a341
...
...
@@ -980,6 +980,23 @@ row_ins_foreign_check_on_constraint(
err
=
row_update_cascade_for_mysql
(
thr
,
cascade
,
foreign
->
foreign_table
);
if
(
foreign
->
foreign_table
->
n_foreign_key_checks_running
==
0
)
{
fprintf
(
stderr
,
"InnoDB: error: table %s has the counter 0 though there is
\n
"
"InnoDB: a FOREIGN KEY check running on it.
\n
"
,
foreign
->
foreign_table
->
name
);
}
/* Release the data dictionary latch for a while, so that we do not
starve other threads from doing CREATE TABLE etc. if we have a huge
cascaded operation running. The counter n_foreign_key_checks_running
will prevent other users from dropping or ALTERing the table when we
release the latch. */
row_mysql_unfreeze_data_dictionary
(
thr_get_trx
(
thr
));
row_mysql_freeze_data_dictionary
(
thr_get_trx
(
thr
));
mtr_start
(
mtr
);
/* Restore pcur position */
...
...
This diff is collapsed.
Click to expand it.
innobase/row/row0mysql.c
View file @
97b4a341
...
...
@@ -2479,7 +2479,7 @@ row_drop_table_for_mysql(
fputs
(
" InnoDB: You are trying to drop table "
,
stderr
);
ut_print_name
(
stderr
,
trx
,
table
->
name
);
fputs
(
"
\n
"
"InnoDB: though there are
foreign key check running on it.
\n
"
"InnoDB: though there is a
foreign key check running on it.
\n
"
"InnoDB: Adding the table to the background drop queue.
\n
"
,
stderr
);
...
...
This diff is collapsed.
Click to expand it.
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