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
bef71c9a
Commit
bef71c9a
authored
24 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
parents
9c8afb1f
464471ae
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
2 deletions
+8
-2
mysql-test/include/master-slave.inc
mysql-test/include/master-slave.inc
+3
-1
mysql-test/r/slave-running.result
mysql-test/r/slave-running.result
+2
-0
mysql-test/r/slave-stopped.result
mysql-test/r/slave-stopped.result
+2
-0
sql/log_event.cc
sql/log_event.cc
+1
-1
sql/share/romanian/errmsg.sys
sql/share/romanian/errmsg.sys
+0
-0
No files found.
mysql-test/include/master-slave.inc
View file @
bef71c9a
...
@@ -4,8 +4,10 @@ connect (slave,localhost,root,,test,0,var/tmp/mysql-slave.sock);
...
@@ -4,8 +4,10 @@ connect (slave,localhost,root,,test,0,var/tmp/mysql-slave.sock);
connect
(
slave1
,
localhost
,
root
,,
test
,
0
,
var
/
tmp
/
mysql
-
slave
.
sock
);
connect
(
slave1
,
localhost
,
root
,,
test
,
0
,
var
/
tmp
/
mysql
-
slave
.
sock
);
connection
slave
;
connection
slave
;
!
slave
stop
;
!
slave
stop
;
@
r
/
slave
-
stopped
.
result
show
status
like
'Slave_running'
;
connection
master
;
connection
master
;
reset
master
;
reset
master
;
connection
slave
;
connection
slave
;
reset
slave
;
reset
slave
;
!
slave
start
;
slave
start
;
@
r
/
slave
-
running
.
result
show
status
like
'Slave_running'
;
This diff is collapsed.
Click to expand it.
mysql-test/r/slave-running.result
0 → 100644
View file @
bef71c9a
Variable_name Value
Slave_running ON
This diff is collapsed.
Click to expand it.
mysql-test/r/slave-stopped.result
0 → 100644
View file @
bef71c9a
Variable_name Value
Slave_running OFF
This diff is collapsed.
Click to expand it.
sql/log_event.cc
View file @
bef71c9a
...
@@ -572,7 +572,7 @@ Load_log_event::Load_log_event(IO_CACHE* file, time_t when, uint32 server_id):
...
@@ -572,7 +572,7 @@ Load_log_event::Load_log_event(IO_CACHE* file, time_t when, uint32 server_id):
}
}
Load_log_event
::
Load_log_event
(
const
char
*
buf
,
int
event_len
)
:
Load_log_event
::
Load_log_event
(
const
char
*
buf
,
int
event_len
)
:
Log_event
(
when
,
0
,
0
,
server_id
),
data_buf
(
0
),
num_fields
(
0
),
fields
(
0
),
Log_event
(
buf
),
data_buf
(
0
),
num_fields
(
0
),
fields
(
0
),
field_lens
(
0
),
field_block_len
(
0
),
field_lens
(
0
),
field_block_len
(
0
),
table_name
(
0
),
db
(
0
),
fname
(
0
)
table_name
(
0
),
db
(
0
),
fname
(
0
)
{
{
...
...
This diff is collapsed.
Click to expand it.
sql/share/romanian/errmsg.sys
View file @
bef71c9a
No preview for this file type
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