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
ffecd803
Commit
ffecd803
authored
Jul 30, 2007
by
serg@janus.mylan
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
parents
5a687561
f451ac1f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
16 deletions
+3
-16
sql/handler.cc
sql/handler.cc
+0
-13
sql/handler.h
sql/handler.h
+0
-1
sql/log.cc
sql/log.cc
+2
-2
sql/sql_base.cc
sql/sql_base.cc
+1
-0
No files found.
sql/handler.cc
View file @
ffecd803
...
...
@@ -3654,19 +3654,6 @@ int handler::ha_write_row(uchar *buf)
}
/**
Write a record to the engine bypassing row-level binary logging.
This method is used internally by the server for writing to
performance schema tables, which are never replicated.
TODO: Merge this function with ha_write_row(), and provide a way
to disable the binlog there.
*/
int
handler
::
ha_write_row_no_binlog
(
uchar
*
buf
)
{
return
write_row
(
buf
);
}
int
handler
::
ha_update_row
(
const
uchar
*
old_data
,
uchar
*
new_data
)
{
int
error
;
...
...
sql/handler.h
View file @
ffecd803
...
...
@@ -1158,7 +1158,6 @@ class handler :public Sql_alloc
*/
int
ha_external_lock
(
THD
*
thd
,
int
lock_type
);
int
ha_write_row
(
uchar
*
buf
);
int
ha_write_row_no_binlog
(
uchar
*
buf
);
int
ha_update_row
(
const
uchar
*
old_data
,
uchar
*
new_data
);
int
ha_delete_row
(
const
uchar
*
buf
);
...
...
sql/log.cc
View file @
ffecd803
...
...
@@ -409,7 +409,7 @@ bool Log_to_csv_event_handler::
}
/* log table entries are not replicated */
if
(
table
->
file
->
ha_write_row
_no_binlog
(
table
->
record
[
0
]))
if
(
table
->
file
->
ha_write_row
(
table
->
record
[
0
]))
{
struct
tm
start
;
localtime_r
(
&
event_time
,
&
start
);
...
...
@@ -612,7 +612,7 @@ bool Log_to_csv_event_handler::
goto
err
;
/* log table entries are not replicated */
if
(
table
->
file
->
ha_write_row
_no_binlog
(
table
->
record
[
0
]))
if
(
table
->
file
->
ha_write_row
(
table
->
record
[
0
]))
{
struct
tm
start
;
localtime_r
(
&
current_time
,
&
start
);
...
...
sql/sql_base.cc
View file @
ffecd803
...
...
@@ -7716,6 +7716,7 @@ open_performance_schema_table(THD *thd, TABLE_LIST *one_table,
DBUG_ASSERT
(
table
->
s
->
table_category
==
TABLE_CATEGORY_PERFORMANCE
);
/* Make sure all columns get assigned to a default value */
table
->
use_all_columns
();
table
->
no_replicate
=
1
;
}
DBUG_RETURN
(
table
);
...
...
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