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
4bd55cd6
Commit
4bd55cd6
authored
Oct 14, 2010
by
Jimmy Yang
Browse files
Options
Browse Files
Download
Plain Diff
Merge from mysql-5.1-innodb to mysql-5.5-innodb.
parents
ebf1ac2b
0fb4d497
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1138 additions
and
6 deletions
+1138
-6
mysql-test/suite/innodb/r/innodb_bug56143.result
mysql-test/suite/innodb/r/innodb_bug56143.result
+556
-0
mysql-test/suite/innodb/t/innodb_bug56143.test
mysql-test/suite/innodb/t/innodb_bug56143.test
+581
-0
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.cc
+0
-2
storage/innobase/srv/srv0start.c
storage/innobase/srv/srv0start.c
+1
-4
No files found.
mysql-test/suite/innodb/r/innodb_bug56143.result
0 → 100644
View file @
4bd55cd6
This diff is collapsed.
Click to expand it.
mysql-test/suite/innodb/t/innodb_bug56143.test
0 → 100644
View file @
4bd55cd6
This diff is collapsed.
Click to expand it.
storage/innobase/handler/ha_innodb.cc
View file @
4bd55cd6
...
@@ -8295,8 +8295,6 @@ ha_innobase::get_foreign_key_create_info(void)
...
@@ -8295,8 +8295,6 @@ ha_innobase::get_foreign_key_create_info(void)
flen
=
ftell
(
srv_dict_tmpfile
);
flen
=
ftell
(
srv_dict_tmpfile
);
if
(
flen
<
0
)
{
if
(
flen
<
0
)
{
flen
=
0
;
flen
=
0
;
}
else
if
(
flen
>
64000
-
1
)
{
flen
=
64000
-
1
;
}
}
/* allocate buffer for the string, and
/* allocate buffer for the string, and
...
...
storage/innobase/srv/srv0start.c
View file @
4bd55cd6
...
@@ -477,7 +477,6 @@ io_handler_thread(
...
@@ -477,7 +477,6 @@ io_handler_thread(
the aio array */
the aio array */
{
{
ulint
segment
;
ulint
segment
;
ulint
i
;
segment
=
*
((
ulint
*
)
arg
);
segment
=
*
((
ulint
*
)
arg
);
...
@@ -490,7 +489,7 @@ io_handler_thread(
...
@@ -490,7 +489,7 @@ io_handler_thread(
pfs_register_thread
(
io_handler_thread_key
);
pfs_register_thread
(
io_handler_thread_key
);
#endif
/* UNIV_PFS_THREAD */
#endif
/* UNIV_PFS_THREAD */
for
(
i
=
0
;;
i
++
)
{
while
(
srv_shutdown_state
!=
SRV_SHUTDOWN_EXIT_THREADS
)
{
fil_aio_wait
(
segment
);
fil_aio_wait
(
segment
);
mutex_enter
(
&
ios_mutex
);
mutex_enter
(
&
ios_mutex
);
...
@@ -498,8 +497,6 @@ io_handler_thread(
...
@@ -498,8 +497,6 @@ io_handler_thread(
mutex_exit
(
&
ios_mutex
);
mutex_exit
(
&
ios_mutex
);
}
}
thr_local_free
(
os_thread_get_curr_id
());
/* We count the number of threads in os_thread_exit(). A created
/* We count the number of threads in os_thread_exit(). A created
thread should always use that to exit and not use return() to exit.
thread should always use that to exit and not use return() to exit.
The thread actually never comes here because it is exited in an
The thread actually never comes here because it is exited in an
...
...
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