Problem:

tiagoportelajorge · tiagoportelajorge · commit 62e04473da1c · 2013-07-02T12:09:08.000+01:00
An error message shows a variable that is not available 
to change.
            
Analysis: 

Several error messages have an explicit reference to 
@@SESSION.GTID_NEXT_LIST. 
The issue is that SESSION.GTID_NEXT_LIST is not 
available to be changed and nor it should be, since it is a
future feature to be integrated in NDB, thus not being 
available in the server mainline. The error messages are 
misleading to a user.

Fix: 
Change the error messages in order to state the only 
possible source of error. Also corrected the binlog
tests that were expecting that specific message.
diff --git a/mysql-test/suite/binlog/r/binlog_gtid_errors.result b/mysql-test/suite/binlog/r/binlog_gtid_errors.result
@@ -179,7 +179,7 @@ AUTOMATIC
 # can't set inside transaction
 BEGIN;
 SET @@SESSION.GTID_NEXT = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:12';
-ERROR HY000: When @@SESSION.GTID_NEXT_LIST == NULL, the system variable @@SESSION.GTID_NEXT cannot change inside a transaction.
+ERROR HY000: The system variable @@SESSION.GTID_NEXT cannot change inside a transaction.
 INSERT INTO t1 VALUES (4);
 ROLLBACK;
 # can't set while owning a GTID
@@ -197,14 +197,14 @@ SET @@SESSION.GTID_NEXT = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:14';
 # can't do implicit commit while gtid_next=SID:GNO
 BEGIN;
 CREATE TABLE t2 (a INT);
-ERROR HY000: Cannot execute statements with implicit commit inside a transaction when @@SESSION.GTID_NEXT != AUTOMATIC or @@SESSION.GTID_NEXT_LIST != NULL.
+ERROR HY000: Cannot execute statements with implicit commit inside a transaction when @@SESSION.GTID_NEXT != AUTOMATIC.
 ROLLBACK;
 SET GTID_NEXT = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:15';
 # can't do implicit commit while gtid_next=SID:GNO
 SET AUTOCOMMIT = 0;
 INSERT INTO t1 VALUES (1);
 CREATE TABLE t2 (a INT);
-ERROR HY000: Cannot execute statements with implicit commit inside a transaction when @@SESSION.GTID_NEXT != AUTOMATIC or @@SESSION.GTID_NEXT_LIST != NULL.
+ERROR HY000: Cannot execute statements with implicit commit inside a transaction when @@SESSION.GTID_NEXT != AUTOMATIC.
 ROLLBACK;
 SELECT @@SESSION.GTID_NEXT;
 @@SESSION.GTID_NEXT
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
@@ -6724,7 +6724,7 @@ ER_GTID_NEXT_IS_NOT_IN_GTID_NEXT_LIST
   eng "The system variable @@SESSION.GTID_NEXT has the value %.200s, which is not listed in @@SESSION.GTID_NEXT_LIST."
 
 ER_CANT_CHANGE_GTID_NEXT_IN_TRANSACTION_WHEN_GTID_NEXT_LIST_IS_NULL
-  eng "When @@SESSION.GTID_NEXT_LIST == NULL, the system variable @@SESSION.GTID_NEXT cannot change inside a transaction."
+  eng "The system variable @@SESSION.GTID_NEXT cannot change inside a transaction."
 
 ER_SET_STATEMENT_CANNOT_INVOKE_FUNCTION
   eng "The statement 'SET %.200s' cannot invoke a stored function."
@@ -6754,7 +6754,7 @@ ER_AUTO_POSITION_REQUIRES_GTID_MODE_ON
   eng "CHANGE MASTER TO MASTER_AUTO_POSITION = 1 can only be executed when @@GLOBAL.GTID_MODE = ON."
 
 ER_CANT_DO_IMPLICIT_COMMIT_IN_TRX_WHEN_GTID_NEXT_IS_SET
-  eng "Cannot execute statements with implicit commit inside a transaction when @@SESSION.GTID_NEXT != AUTOMATIC or @@SESSION.GTID_NEXT_LIST != NULL."
+  eng "Cannot execute statements with implicit commit inside a transaction when @@SESSION.GTID_NEXT != AUTOMATIC."
 
 ER_GTID_MODE_2_OR_3_REQUIRES_ENFORCE_GTID_CONSISTENCY_ON
   eng "@@GLOBAL.GTID_MODE = ON or UPGRADE_STEP_2 requires @@GLOBAL.ENFORCE_GTID_CONSISTENCY = 1."
