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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
0062e693
Commit
0062e693
authored
Oct 11, 2010
by
Jimmy Yang
Browse files
Options
Browse Files
Download
Plain Diff
Merge from mysql-5.1-innodb to mysql-5.5-innodb
parents
2e1c48e0
f3a8c2be
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
3 deletions
+18
-3
mysql-test/t/disabled.def
mysql-test/t/disabled.def
+0
-1
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.cc
+5
-1
storage/innobase/row/row0sel.c
storage/innobase/row/row0sel.c
+13
-1
No files found.
mysql-test/t/disabled.def
View file @
0062e693
...
...
@@ -13,7 +13,6 @@ kill : Bug#37780 2008-12-03 HHunger need some changes to be
lowercase_table3 : Bug#54845 2010-06-30 alik main.lowercase_table3 on Mac OSX
mysqlhotcopy_myisam : Bug#54129 2010-08-31 alik mysqlhotcopy* fails
mysqlhotcopy_archive : Bug#54129 2010-08-31 alik mysqlhotcopy* fails
partition_innodb_plugin : Bug#53307 2010-04-30 VasilDimov valgrind warnings
query_cache_28249 : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
sp_sync : Bug#48157 2010-02-06 5.5-m3 demands a differnt solution
ctype_utf8mb4_ndb : Bug#55799, Bug#51907, disabled by Konstantin 2010-08-06
storage/innobase/handler/ha_innodb.cc
View file @
0062e693
...
...
@@ -9584,7 +9584,11 @@ ha_innobase::innobase_peek_autoinc(void)
auto_inc
=
dict_table_autoinc_read
(
innodb_table
);
ut_a
(
auto_inc
>
0
);
if
(
auto_inc
==
0
)
{
ut_print_timestamp
(
stderr
);
fprintf
(
stderr
,
" InnoDB: AUTOINC next value generation "
"is disabled for '%s'
\n
"
,
innodb_table
->
name
);
}
dict_table_autoinc_unlock
(
innodb_table
);
...
...
storage/innobase/row/row0sel.c
View file @
0062e693
...
...
@@ -3348,6 +3348,7 @@ row_search_for_mysql(
mem_heap_t
*
heap
=
NULL
;
ulint
offsets_
[
REC_OFFS_NORMAL_SIZE
];
ulint
*
offsets
=
offsets_
;
ibool
table_lock_waited
=
FALSE
;
rec_offs_init
(
offsets_
);
...
...
@@ -3734,13 +3735,15 @@ row_search_for_mysql(
trx_assign_read_view
(
trx
);
prebuilt
->
sql_stat_start
=
FALSE
;
}
else
{
wait_table_again:
err
=
lock_table
(
0
,
index
->
table
,
prebuilt
->
select_lock_type
==
LOCK_S
?
LOCK_IS
:
LOCK_IX
,
thr
);
if
(
err
!=
DB_SUCCESS
)
{
goto
lock_wait_or_error
;
table_lock_waited
=
TRUE
;
goto
lock_table_wait
;
}
prebuilt
->
sql_stat_start
=
FALSE
;
}
...
...
@@ -4551,6 +4554,7 @@ row_search_for_mysql(
btr_pcur_store_position
(
pcur
,
&
mtr
);
lock_table_wait:
mtr_commit
(
&
mtr
);
mtr_has_extra_clust_latch
=
FALSE
;
...
...
@@ -4568,6 +4572,14 @@ row_search_for_mysql(
thr
->
lock_state
=
QUE_THR_LOCK_NOLOCK
;
mtr_start
(
&
mtr
);
/* Table lock waited, go try to obtain table lock
again */
if
(
table_lock_waited
)
{
table_lock_waited
=
FALSE
;
goto
wait_table_again
;
}
sel_restore_position_for_mysql
(
&
same_user_rec
,
BTR_SEARCH_LEAF
,
pcur
,
moves_up
,
&
mtr
);
...
...
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