summaryrefslogtreecommitdiff
path: root/mysql-test/r/variables.result
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2016-08-29 20:28:06 +0300
committerMonty <monty@mariadb.org>2016-08-29 20:28:06 +0300
commit1c91569274219ac612fcfdea4764311e2377977c (patch)
tree3d00dcc739c364f5da4c202e4f631791d7b62496 /mysql-test/r/variables.result
parente139d971ecbffe00d9a5626fdcd69aa1b9ba0f2c (diff)
downloadmariadb-git-1c91569274219ac612fcfdea4764311e2377977c.tar.gz
Set server_id to 1 by default and disallow to set it to 0
This makes it easier to setup master as on only have to set --log-bin. Before this patch if one did set up the master with just --log-bin, slaves could not connect until server_id was set on the master, which could be both confusing and hard to do.
Diffstat (limited to 'mysql-test/r/variables.result')
-rw-r--r--mysql-test/r/variables.result6
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index d8f8c0c03f7..b78b3caa58d 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -1466,15 +1466,17 @@ SELECT @@GLOBAL.server_id;
@@GLOBAL.server_id
4294967295
SET GLOBAL server_id = 0;
+Warnings:
+Warning 1292 Truncated incorrect server_id value: '0'
SELECT @@GLOBAL.server_id;
@@GLOBAL.server_id
-0
+1
SET GLOBAL server_id = -1;
Warnings:
Warning 1292 Truncated incorrect server_id value: '-1'
SELECT @@GLOBAL.server_id;
@@GLOBAL.server_id
-0
+1
SET GLOBAL server_id = @old_server_id;
#
# BUG#10206 - InnoDB: Transaction requiring Max_BinLog_Cache_size > 4GB always rollsback