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
d9737f20
Commit
d9737f20
authored
Aug 06, 2001
by
sasha@mysql.sashanet.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
misc bug fixes
parent
31f269f1
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
7 deletions
+12
-7
.bzrignore
.bzrignore
+1
-0
libmysqld/Makefile.am
libmysqld/Makefile.am
+2
-2
mysql-test/mysql-test-run.sh
mysql-test/mysql-test-run.sh
+2
-0
mysql-test/r/rpl_log.result
mysql-test/r/rpl_log.result
+4
-4
sql/log.cc
sql/log.cc
+1
-1
sql/log_event.h
sql/log_event.h
+2
-0
No files found.
.bzrignore
View file @
d9737f20
...
@@ -376,3 +376,4 @@ support-files/mysql.spec
...
@@ -376,3 +376,4 @@ support-files/mysql.spec
tags
tags
tmp/*
tmp/*
vio/viotest-ssl
vio/viotest-ssl
libmysqld/sql_union.cc
libmysqld/Makefile.am
View file @
d9737f20
...
@@ -54,7 +54,7 @@ sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \
...
@@ -54,7 +54,7 @@ sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \
sql_rename.cc sql_repl.cc sql_select.cc sql_show.cc
\
sql_rename.cc sql_repl.cc sql_select.cc sql_show.cc
\
sql_string.cc sql_table.cc sql_test.cc sql_udf.cc
\
sql_string.cc sql_table.cc sql_test.cc sql_udf.cc
\
sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc
\
sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc
\
unireg.cc uniques.cc stacktrace.c sql_union
s
.cc hash_filo.cc
unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc
## XXX: we should not have to duplicate info from the sources list
## XXX: we should not have to duplicate info from the sources list
sqlobjects
=
convert.lo derror.lo field.lo field_conv.lo filesort.lo
\
sqlobjects
=
convert.lo derror.lo field.lo field_conv.lo filesort.lo
\
...
@@ -72,7 +72,7 @@ sqlobjects = convert.lo derror.lo field.lo field_conv.lo filesort.lo \
...
@@ -72,7 +72,7 @@ sqlobjects = convert.lo derror.lo field.lo field_conv.lo filesort.lo \
sql_rename.lo sql_repl.lo sql_select.lo sql_show.lo
\
sql_rename.lo sql_repl.lo sql_select.lo sql_show.lo
\
sql_string.lo sql_table.lo sql_test.lo sql_udf.lo
\
sql_string.lo sql_table.lo sql_test.lo sql_udf.lo
\
sql_update.lo sql_yacc.lo table.lo thr_malloc.lo time.lo
\
sql_update.lo sql_yacc.lo table.lo thr_malloc.lo time.lo
\
unireg.lo uniques.lo stacktrace.lo sql_union
s
.lo hash_filo.lo
unireg.lo uniques.lo stacktrace.lo sql_union.lo hash_filo.lo
EXTRA_DIST
=
lib_vio.c
EXTRA_DIST
=
lib_vio.c
...
...
mysql-test/mysql-test-run.sh
View file @
d9737f20
...
@@ -109,6 +109,7 @@ USERT=0
...
@@ -109,6 +109,7 @@ USERT=0
SYST
=
0
SYST
=
0
REALT
=
0
REALT
=
0
MYSQL_TMP_DIR
=
$MYSQL_TEST_DIR
/var/tmp
MYSQL_TMP_DIR
=
$MYSQL_TEST_DIR
/var/tmp
SLAVE_LOAD_TMPDIR
=
../../var/tmp
#needs to be same length to test logging
RES_SPACE
=
" "
RES_SPACE
=
" "
MYSQLD_SRC_DIRS
=
"strings mysys include extra regex isam merge myisam
\
MYSQLD_SRC_DIRS
=
"strings mysys include extra regex isam merge myisam
\
myisammrg heap sql"
myisammrg heap sql"
...
@@ -570,6 +571,7 @@ start_slave()
...
@@ -570,6 +571,7 @@ start_slave()
--tmpdir=
$MYSQL_TMP_DIR
\
--tmpdir=
$MYSQL_TMP_DIR
\
--language=
$LANGUAGE
\
--language=
$LANGUAGE
\
--skip-innodb --skip-slave-start
\
--skip-innodb --skip-slave-start
\
--slave-load-tmpdir=
$SLAVE_LOAD_TMPDIR
\
--report-host=127.0.0.1 --report-user=root
\
--report-host=127.0.0.1 --report-user=root
\
--report-port=
$SLAVE_MYPORT
\
--report-port=
$SLAVE_MYPORT
\
$SMALL_SERVER
\
$SMALL_SERVER
\
...
...
mysql-test/r/rpl_log.result
View file @
d9737f20
...
@@ -47,10 +47,10 @@ slave-bin.001 253 Query 1 4 use test; insert into t1 values (NULL)
...
@@ -47,10 +47,10 @@ slave-bin.001 253 Query 1 4 use test; insert into t1 values (NULL)
slave-bin.001 316 Query 1 5 use test; drop table t1
slave-bin.001 316 Query 1 5 use test; drop table t1
slave-bin.001 364 Query 1 6 use test; create table t1 (word char(20) not null)
slave-bin.001 364 Query 1 6 use test; create table t1 (word char(20) not null)
slave-bin.001 439 Create_file 1 7 db=test;table=t1;file_id=1;block_len=81
slave-bin.001 439 Create_file 1 7 db=test;table=t1;file_id=1;block_len=81
slave-bin.001 6
4
6 Exec_load 1 8 ;file_id=1
slave-bin.001 6
1
6 Exec_load 1 8 ;file_id=1
slave-bin.001 6
6
9 Query 1 9 use test; drop table t1
slave-bin.001 6
3
9 Query 1 9 use test; drop table t1
slave-bin.001
71
7 Rotate 1 4 slave-bin.002;pos=4; forced by master
slave-bin.001
68
7 Rotate 1 4 slave-bin.002;pos=4; forced by master
slave-bin.001 7
5
7 Stop 2 5
slave-bin.001 7
2
7 Stop 2 5
Log_name Pos Event_type Server_id Log_seq Info
Log_name Pos Event_type Server_id Log_seq Info
slave-bin.002 4 Start 2 1 Server ver: $VERSION, Binlog ver: 2
slave-bin.002 4 Start 2 1 Server ver: $VERSION, Binlog ver: 2
slave-bin.002 79 Slave 2 10 host=127.0.0.1,port=$MASTER_MYPORT,log=master-bin.002,pos=4
slave-bin.002 79 Slave 2 10 host=127.0.0.1,port=$MASTER_MYPORT,log=master-bin.002,pos=4
...
...
sql/log.cc
View file @
d9737f20
...
@@ -653,7 +653,7 @@ bool MYSQL_LOG::write(Log_event* event_info)
...
@@ -653,7 +653,7 @@ bool MYSQL_LOG::write(Log_event* event_info)
THD
*
thd
=
event_info
->
thd
;
THD
*
thd
=
event_info
->
thd
;
const
char
*
db
=
event_info
->
get_db
();
const
char
*
db
=
event_info
->
get_db
();
#ifdef USING_TRANSACTIONS
#ifdef USING_TRANSACTIONS
IO_CACHE
*
file
=
((
event_info
->
cache_stmt
&&
thd
)
?
IO_CACHE
*
file
=
((
event_info
->
get_cache_stmt
()
&&
thd
)
?
&
thd
->
transaction
.
trans_log
:
&
thd
->
transaction
.
trans_log
:
&
log_file
);
&
log_file
);
#else
#else
...
...
sql/log_event.h
View file @
d9737f20
...
@@ -210,6 +210,7 @@ public:
...
@@ -210,6 +210,7 @@ public:
{
return
0
;
}
{
return
0
;
}
virtual
Log_event_type
get_type_code
()
=
0
;
virtual
Log_event_type
get_type_code
()
=
0
;
virtual
bool
is_valid
()
=
0
;
virtual
bool
is_valid
()
=
0
;
virtual
bool
get_cache_stmt
()
{
return
0
;
}
Log_event
(
const
char
*
buf
);
Log_event
(
const
char
*
buf
);
#ifndef MYSQL_CLIENT
#ifndef MYSQL_CLIENT
Log_event
(
THD
*
thd_arg
,
uint16
flags_arg
=
0
);
Log_event
(
THD
*
thd_arg
,
uint16
flags_arg
=
0
);
...
@@ -277,6 +278,7 @@ public:
...
@@ -277,6 +278,7 @@ public:
const
char
*
get_db
()
{
return
db
;
}
const
char
*
get_db
()
{
return
db
;
}
void
pack_info
(
String
*
packet
);
void
pack_info
(
String
*
packet
);
int
exec_event
(
struct
st_master_info
*
mi
);
int
exec_event
(
struct
st_master_info
*
mi
);
bool
get_cache_stmt
()
{
return
cache_stmt
;
}
#endif
#endif
Query_log_event
(
const
char
*
buf
,
int
event_len
);
Query_log_event
(
const
char
*
buf
,
int
event_len
);
...
...
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