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
22f9353b
Commit
22f9353b
authored
Oct 04, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xtradb/innodb: fix to compile with VS 2008
and compiler warnings
parent
4a784356
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
12 deletions
+12
-12
storage/innobase/handler/handler0alter.cc
storage/innobase/handler/handler0alter.cc
+4
-4
storage/innobase/row/row0mysql.cc
storage/innobase/row/row0mysql.cc
+1
-1
storage/xtradb/handler/handler0alter.cc
storage/xtradb/handler/handler0alter.cc
+6
-6
storage/xtradb/row/row0mysql.cc
storage/xtradb/row/row0mysql.cc
+1
-1
No files found.
storage/innobase/handler/handler0alter.cc
View file @
22f9353b
...
@@ -2237,7 +2237,7 @@ innobase_check_foreigns_low(
...
@@ -2237,7 +2237,7 @@ innobase_check_foreigns_low(
/* Check if any FOREIGN KEY constraints are defined on this
/* Check if any FOREIGN KEY constraints are defined on this
column. */
column. */
for
(
dict_foreign_set
::
iterator
it
=
user_table
->
foreign_set
.
begin
();
for
(
dict_foreign_set
::
const_
iterator
it
=
user_table
->
foreign_set
.
begin
();
it
!=
user_table
->
foreign_set
.
end
();
it
!=
user_table
->
foreign_set
.
end
();
++
it
)
{
++
it
)
{
...
@@ -2274,7 +2274,7 @@ innobase_check_foreigns_low(
...
@@ -2274,7 +2274,7 @@ innobase_check_foreigns_low(
/* Check if any FOREIGN KEY constraints in other tables are
/* Check if any FOREIGN KEY constraints in other tables are
referring to the column that is being dropped. */
referring to the column that is being dropped. */
for
(
dict_foreign_set
::
iterator
it
for
(
dict_foreign_set
::
const_
iterator
it
=
user_table
->
referenced_set
.
begin
();
=
user_table
->
referenced_set
.
begin
();
it
!=
user_table
->
referenced_set
.
end
();
it
!=
user_table
->
referenced_set
.
end
();
++
it
)
{
++
it
)
{
...
@@ -4446,7 +4446,7 @@ err_exit:
...
@@ -4446,7 +4446,7 @@ err_exit:
rename_foreign:
rename_foreign:
trx
->
op_info
=
"renaming column in SYS_FOREIGN_COLS"
;
trx
->
op_info
=
"renaming column in SYS_FOREIGN_COLS"
;
for
(
dict_foreign_set
::
iterator
it
=
user_table
->
foreign_set
.
begin
();
for
(
dict_foreign_set
::
const_
iterator
it
=
user_table
->
foreign_set
.
begin
();
it
!=
user_table
->
foreign_set
.
end
();
it
!=
user_table
->
foreign_set
.
end
();
++
it
)
{
++
it
)
{
...
@@ -4481,7 +4481,7 @@ rename_foreign:
...
@@ -4481,7 +4481,7 @@ rename_foreign:
}
}
}
}
for
(
dict_foreign_set
::
iterator
it
for
(
dict_foreign_set
::
const_
iterator
it
=
user_table
->
referenced_set
.
begin
();
=
user_table
->
referenced_set
.
begin
();
it
!=
user_table
->
referenced_set
.
end
();
it
!=
user_table
->
referenced_set
.
end
();
++
it
)
{
++
it
)
{
...
...
storage/innobase/row/row0mysql.cc
View file @
22f9353b
...
@@ -2839,7 +2839,7 @@ row_discard_tablespace_foreign_key_checks(
...
@@ -2839,7 +2839,7 @@ row_discard_tablespace_foreign_key_checks(
/* Check if the table is referenced by foreign key constraints from
/* Check if the table is referenced by foreign key constraints from
some other table (not the table itself) */
some other table (not the table itself) */
dict_foreign_set
::
iterator
it
dict_foreign_set
::
const_
iterator
it
=
std
::
find_if
(
table
->
referenced_set
.
begin
(),
=
std
::
find_if
(
table
->
referenced_set
.
begin
(),
table
->
referenced_set
.
end
(),
table
->
referenced_set
.
end
(),
dict_foreign_different_tables
());
dict_foreign_different_tables
());
...
...
storage/xtradb/handler/handler0alter.cc
View file @
22f9353b
...
@@ -2238,7 +2238,7 @@ innobase_check_foreigns_low(
...
@@ -2238,7 +2238,7 @@ innobase_check_foreigns_low(
/* Check if any FOREIGN KEY constraints are defined on this
/* Check if any FOREIGN KEY constraints are defined on this
column. */
column. */
for
(
dict_foreign_set
::
iterator
it
=
user_table
->
foreign_set
.
begin
();
for
(
dict_foreign_set
::
const_
iterator
it
=
user_table
->
foreign_set
.
begin
();
it
!=
user_table
->
foreign_set
.
end
();
it
!=
user_table
->
foreign_set
.
end
();
++
it
)
{
++
it
)
{
...
@@ -2275,7 +2275,7 @@ innobase_check_foreigns_low(
...
@@ -2275,7 +2275,7 @@ innobase_check_foreigns_low(
/* Check if any FOREIGN KEY constraints in other tables are
/* Check if any FOREIGN KEY constraints in other tables are
referring to the column that is being dropped. */
referring to the column that is being dropped. */
for
(
dict_foreign_set
::
iterator
it
for
(
dict_foreign_set
::
const_
iterator
it
=
user_table
->
referenced_set
.
begin
();
=
user_table
->
referenced_set
.
begin
();
it
!=
user_table
->
referenced_set
.
end
();
it
!=
user_table
->
referenced_set
.
end
();
++
it
)
{
++
it
)
{
...
@@ -2667,7 +2667,7 @@ prepare_inplace_alter_table_dict(
...
@@ -2667,7 +2667,7 @@ prepare_inplace_alter_table_dict(
if
(
UNIV_UNLIKELY
(
ctx
->
trx
->
fake_changes
))
{
if
(
UNIV_UNLIKELY
(
ctx
->
trx
->
fake_changes
))
{
trx_rollback_to_savepoint
(
ctx
->
trx
,
NULL
);
trx_rollback_to_savepoint
(
ctx
->
trx
,
NULL
);
trx_free_for_mysql
(
ctx
->
trx
);
trx_free_for_mysql
(
ctx
->
trx
);
DBUG_RETURN
(
HA_ERR_WRONG_COMMAND
);
DBUG_RETURN
(
true
);
}
}
trx_start_for_ddl
(
ctx
->
trx
,
TRX_DICT_OP_INDEX
);
trx_start_for_ddl
(
ctx
->
trx
,
TRX_DICT_OP_INDEX
);
...
@@ -3387,7 +3387,7 @@ ha_innobase::prepare_inplace_alter_table(
...
@@ -3387,7 +3387,7 @@ ha_innobase::prepare_inplace_alter_table(
DBUG_ASSERT
(
!
srv_read_only_mode
);
DBUG_ASSERT
(
!
srv_read_only_mode
);
if
(
UNIV_UNLIKELY
(
prebuilt
->
trx
->
fake_changes
))
{
if
(
UNIV_UNLIKELY
(
prebuilt
->
trx
->
fake_changes
))
{
DBUG_RETURN
(
HA_ERR_WRONG_COMMAND
);
DBUG_RETURN
(
true
);
}
}
MONITOR_ATOMIC_INC
(
MONITOR_PENDING_ALTER_TABLE
);
MONITOR_ATOMIC_INC
(
MONITOR_PENDING_ALTER_TABLE
);
...
@@ -4462,7 +4462,7 @@ err_exit:
...
@@ -4462,7 +4462,7 @@ err_exit:
rename_foreign:
rename_foreign:
trx
->
op_info
=
"renaming column in SYS_FOREIGN_COLS"
;
trx
->
op_info
=
"renaming column in SYS_FOREIGN_COLS"
;
for
(
dict_foreign_set
::
iterator
it
=
user_table
->
foreign_set
.
begin
();
for
(
dict_foreign_set
::
const_
iterator
it
=
user_table
->
foreign_set
.
begin
();
it
!=
user_table
->
foreign_set
.
end
();
it
!=
user_table
->
foreign_set
.
end
();
++
it
)
{
++
it
)
{
...
@@ -4497,7 +4497,7 @@ rename_foreign:
...
@@ -4497,7 +4497,7 @@ rename_foreign:
}
}
}
}
for
(
dict_foreign_set
::
iterator
it
for
(
dict_foreign_set
::
const_
iterator
it
=
user_table
->
referenced_set
.
begin
();
=
user_table
->
referenced_set
.
begin
();
it
!=
user_table
->
referenced_set
.
end
();
it
!=
user_table
->
referenced_set
.
end
();
++
it
)
{
++
it
)
{
...
...
storage/xtradb/row/row0mysql.cc
View file @
22f9353b
...
@@ -2853,7 +2853,7 @@ row_discard_tablespace_foreign_key_checks(
...
@@ -2853,7 +2853,7 @@ row_discard_tablespace_foreign_key_checks(
/* Check if the table is referenced by foreign key constraints from
/* Check if the table is referenced by foreign key constraints from
some other table (not the table itself) */
some other table (not the table itself) */
dict_foreign_set
::
iterator
it
dict_foreign_set
::
const_
iterator
it
=
std
::
find_if
(
table
->
referenced_set
.
begin
(),
=
std
::
find_if
(
table
->
referenced_set
.
begin
(),
table
->
referenced_set
.
end
(),
table
->
referenced_set
.
end
(),
dict_foreign_different_tables
());
dict_foreign_different_tables
());
...
...
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