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
3360c997
Commit
3360c997
authored
20 years ago
by
serg@serg.mylan
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
parents
8ef3cdc2
96a000ae
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
sql/sql_class.h
sql/sql_class.h
+1
-1
sql/sql_table.cc
sql/sql_table.cc
+9
-9
No files found.
sql/sql_class.h
View file @
3360c997
...
...
@@ -647,7 +647,7 @@ public:
so we internally disable it temporarily by creating the Disable_binlog
object and reset the state by destroying the object (don't forget that! or
write code so that the object gets automatically destroyed when leaving a
function...
).
block, see example in sql_table.cc
).
*/
class
Disable_binlog
{
private:
...
...
This diff is collapsed.
Click to expand it.
sql/sql_table.cc
View file @
3360c997
...
...
@@ -1762,7 +1762,6 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
List_iterator
<
Key
>
key_it
(
keys
);
List_iterator
<
create_field
>
field_it
(
create_list
);
List
<
key_part_spec
>
key_parts
;
Disable_binlog
*
disable_binlog
;
KEY
*
key_info
=
table
->
key_info
;
for
(
uint
i
=
0
;
i
<
table
->
keys
;
i
++
,
key_info
++
)
...
...
@@ -1925,16 +1924,17 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
}
else
create_info
->
data_file_name
=
create_info
->
index_file_name
=
0
;
/* We don't log the statement, it will be logged later */
disable_binlog
=
new
Disable_binlog
(
thd
);
if
((
error
=
mysql_create_table
(
thd
,
new_db
,
tmp_name
,
create_info
,
create_list
,
key_list
,
1
)))
{
delete
disable_binlog
;
DBUG_RETURN
(
error
);
/*
We don't log the statement, it will be logged later. Using a block so
that disable_binlog is deleted when we leave it in either way.
*/
Disable_binlog
disable_binlog
(
thd
);
if
((
error
=
mysql_create_table
(
thd
,
new_db
,
tmp_name
,
create_info
,
create_list
,
key_list
,
1
)))
DBUG_RETURN
(
error
);
}
delete
disable_binlog
;
// reset binlogging properties for next code lines
if
(
table
->
tmp_table
)
new_table
=
open_table
(
thd
,
new_db
,
tmp_name
,
tmp_name
,
0
);
else
...
...
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