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
63339c89
Commit
63339c89
authored
Jun 06, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into mysql.com:/home/alexi/innodb/mysql-5.0-ss609
parents
45972e0e
9e3f90e5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
11 deletions
+25
-11
innobase/row/row0mysql.c
innobase/row/row0mysql.c
+10
-10
innobase/row/row0sel.c
innobase/row/row0sel.c
+2
-1
mysql-test/t/innodb.test
mysql-test/t/innodb.test
+13
-0
No files found.
innobase/row/row0mysql.c
View file @
63339c89
...
@@ -2570,14 +2570,14 @@ do not allow the discard. We also reserve the data dictionary latch. */
...
@@ -2570,14 +2570,14 @@ do not allow the discard. We also reserve the data dictionary latch. */
}
}
}
}
funct_exit:
funct_exit:
trx_commit_for_mysql
(
trx
);
row_mysql_unlock_data_dictionary
(
trx
);
row_mysql_unlock_data_dictionary
(
trx
);
if
(
graph
)
{
if
(
graph
)
{
que_graph_free
(
graph
);
que_graph_free
(
graph
);
}
}
trx_commit_for_mysql
(
trx
);
trx
->
op_info
=
""
;
trx
->
op_info
=
""
;
return
((
int
)
err
);
return
((
int
)
err
);
...
@@ -2707,10 +2707,10 @@ row_import_tablespace_for_mysql(
...
@@ -2707,10 +2707,10 @@ row_import_tablespace_for_mysql(
}
}
funct_exit:
funct_exit:
row_mysql_unlock_data_dictionary
(
trx
);
trx_commit_for_mysql
(
trx
);
trx_commit_for_mysql
(
trx
);
row_mysql_unlock_data_dictionary
(
trx
);
trx
->
op_info
=
""
;
trx
->
op_info
=
""
;
return
((
int
)
err
);
return
((
int
)
err
);
...
@@ -3398,6 +3398,8 @@ fputs(" InnoDB: You are trying to drop table ", stderr);
...
@@ -3398,6 +3398,8 @@ fputs(" InnoDB: You are trying to drop table ", stderr);
}
}
funct_exit:
funct_exit:
trx_commit_for_mysql
(
trx
);
if
(
locked_dictionary
)
{
if
(
locked_dictionary
)
{
row_mysql_unlock_data_dictionary
(
trx
);
row_mysql_unlock_data_dictionary
(
trx
);
}
}
...
@@ -3408,8 +3410,6 @@ funct_exit:
...
@@ -3408,8 +3410,6 @@ funct_exit:
que_graph_free
(
graph
);
que_graph_free
(
graph
);
trx_commit_for_mysql
(
trx
);
trx
->
op_info
=
""
;
trx
->
op_info
=
""
;
#ifndef UNIV_HOTBACKUP
#ifndef UNIV_HOTBACKUP
...
@@ -3488,10 +3488,10 @@ loop:
...
@@ -3488,10 +3488,10 @@ loop:
}
}
}
}
row_mysql_unlock_data_dictionary
(
trx
);
trx_commit_for_mysql
(
trx
);
trx_commit_for_mysql
(
trx
);
row_mysql_unlock_data_dictionary
(
trx
);
trx
->
op_info
=
""
;
trx
->
op_info
=
""
;
return
(
err
);
return
(
err
);
...
@@ -3905,6 +3905,8 @@ row_rename_table_for_mysql(
...
@@ -3905,6 +3905,8 @@ row_rename_table_for_mysql(
}
}
}
}
funct_exit:
funct_exit:
trx_commit_for_mysql
(
trx
);
if
(
!
recovering_temp_table
)
{
if
(
!
recovering_temp_table
)
{
row_mysql_unlock_data_dictionary
(
trx
);
row_mysql_unlock_data_dictionary
(
trx
);
}
}
...
@@ -3917,8 +3919,6 @@ funct_exit:
...
@@ -3917,8 +3919,6 @@ funct_exit:
mem_heap_free
(
heap
);
mem_heap_free
(
heap
);
}
}
trx_commit_for_mysql
(
trx
);
trx
->
op_info
=
""
;
trx
->
op_info
=
""
;
return
((
int
)
err
);
return
((
int
)
err
);
...
...
innobase/row/row0sel.c
View file @
63339c89
...
@@ -1064,11 +1064,12 @@ row_sel_try_search_shortcut(
...
@@ -1064,11 +1064,12 @@ row_sel_try_search_shortcut(
ut_ad
(
plan
->
pcur
.
latch_mode
==
node
->
latch_mode
);
ut_ad
(
plan
->
pcur
.
latch_mode
==
node
->
latch_mode
);
plan
->
n_rows_fetched
++
;
plan
->
n_rows_fetched
++
;
ret
=
SEL_FOUND
;
func_exit:
func_exit:
if
(
UNIV_LIKELY_NULL
(
heap
))
{
if
(
UNIV_LIKELY_NULL
(
heap
))
{
mem_heap_free
(
heap
);
mem_heap_free
(
heap
);
}
}
return
(
SEL_FOUND
);
return
(
ret
);
}
}
/*************************************************************************
/*************************************************************************
...
...
mysql-test/t/innodb.test
View file @
63339c89
...
@@ -2196,3 +2196,16 @@ drop table t2, t1;
...
@@ -2196,3 +2196,16 @@ drop table t2, t1;
#
#
--
error
ER_TABLE_CANT_HANDLE_SPKEYS
--
error
ER_TABLE_CANT_HANDLE_SPKEYS
create
table
t1
(
g
geometry
not
null
,
spatial
gk
(
g
))
engine
=
innodb
;
create
table
t1
(
g
geometry
not
null
,
spatial
gk
(
g
))
engine
=
innodb
;
#######################################################################
# #
# Please, DO NOT TOUCH this file as well as the innodb.result file. #
# These files are to be modified ONLY BY INNOBASE guys. #
# #
# Use innodb_mysql.[test|result] files instead. #
# #
# If nevertheless you need to make some changes here, please, forward #
# your commit message To: dev@innodb.com Cc: dev-innodb@mysql.com #
# (otherwise your changes may be erased). #
# #
#######################################################################
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