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
8a076120
Commit
8a076120
authored
Nov 28, 2006
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
parents
03a5dcd7
76b8b450
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+1
-0
mysql-test/r/rpl000015.result
mysql-test/r/rpl000015.result
+1
-1
mysql-test/t/rpl000015.test
mysql-test/t/rpl000015.test
+1
-1
No files found.
mysql-test/mysql-test-run.pl
View file @
8a076120
...
@@ -1676,6 +1676,7 @@ sub environment_setup () {
...
@@ -1676,6 +1676,7 @@ sub environment_setup () {
$ENV
{'
SLAVE_MYPORT1
'}
=
$slave
->
[
1
]
->
{'
port
'};
$ENV
{'
SLAVE_MYPORT1
'}
=
$slave
->
[
1
]
->
{'
port
'};
$ENV
{'
SLAVE_MYPORT2
'}
=
$slave
->
[
2
]
->
{'
port
'};
$ENV
{'
SLAVE_MYPORT2
'}
=
$slave
->
[
2
]
->
{'
port
'};
$ENV
{'
MYSQL_TCP_PORT
'}
=
$mysqld_variables
{'
port
'};
$ENV
{'
MYSQL_TCP_PORT
'}
=
$mysqld_variables
{'
port
'};
$ENV
{'
DEFAULT_MASTER_PORT
'}
=
$mysqld_variables
{'
master-port
'};
$ENV
{'
IM_PATH_SOCK
'}
=
$instance_manager
->
{
path_sock
};
$ENV
{'
IM_PATH_SOCK
'}
=
$instance_manager
->
{
path_sock
};
$ENV
{'
IM_USERNAME
'}
=
$instance_manager
->
{
admin_login
};
$ENV
{'
IM_USERNAME
'}
=
$instance_manager
->
{
admin_login
};
...
...
mysql-test/r/rpl000015.result
View file @
8a076120
...
@@ -8,7 +8,7 @@ Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File
...
@@ -8,7 +8,7 @@ Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File
change master to master_host='127.0.0.1';
change master to master_host='127.0.0.1';
show slave status;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
# 127.0.0.1 test MASTER_PORT 7 4 # # No No 0 0 0 # None 0 No #
# 127.0.0.1 test
DEFAULT_
MASTER_PORT 7 4 # # No No 0 0 0 # None 0 No #
change master to master_host='127.0.0.1',master_user='root',
change master to master_host='127.0.0.1',master_user='root',
master_password='',master_port=MASTER_PORT;
master_password='',master_port=MASTER_PORT;
show slave status;
show slave status;
...
...
mysql-test/t/rpl000015.test
View file @
8a076120
...
@@ -12,7 +12,7 @@ show slave status;
...
@@ -12,7 +12,7 @@ show slave status;
change
master
to
master_host
=
'127.0.0.1'
;
change
master
to
master_host
=
'127.0.0.1'
;
# The following needs to be cleaned up when change master is fixed
# The following needs to be cleaned up when change master is fixed
--
replace_result
$
MYSQL_TCP_PORT
MASTER_PORT
--
replace_result
$
DEFAULT_MASTER_PORT
DEFAULT_
MASTER_PORT
--
replace_column
1
# 8 # 9 # 23 # 33 #
--
replace_column
1
# 8 # 9 # 23 # 33 #
show
slave
status
;
show
slave
status
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_result
$MASTER_MYPORT
MASTER_PORT
...
...
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