database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge from mysql-5.5 to mysql-5.5-security

Browse Source 
No conflicts
This commit is contained in:
Jon Olav Hauglid
2012-03-15 11:25:53 +01:00
parent 13053fbe54 8f9f40aa1b
commit 29443d085c
18 changed files with 380 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/suite/rpl/r/rpl_report_port.result
View File

@@ -1,15 +1,8 @@
include/master-slave.inc
[connection master]
[The default value shown for the slave's port number is the actual port number of the slave]
SHOW SLAVE HOSTS;
Server_id Host Port Master_id
2 127.0.0.1 SLAVE_PORT 1
[The default value shown for the slave's port number is the actual port number of the slave]
include/assert.inc [The default value shown for the slave's port number is the actual port number of the slave.]
include/rpl_restart_server.inc [server_number=2 parameters: --report-port=9000]
include/start_slave.inc
[Slave restarted with the report-port set to some value]
[The value shown for the slave's port number is 9000 which is the value set for report-port]
SHOW SLAVE HOSTS;
Server_id Host Port Master_id
2 127.0.0.1 9000 1
include/assert.inc [The value shown for the slave's port number is 9000 which is the value set for report-port.]
include/rpl_end.inc

5
mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result Normal file
View File

@@ -0,0 +1,5 @@
include/master-slave.inc
[connection master]
include/assert.inc [Assert that relay log space is close to the limit]
include/diff_tables.inc [master:test.t1,slave:test.t1]
include/rpl_end.inc