after merging fix

include/mysqld_error.h

@@ -261,5 +261,5 @@
 #define ER_CORRUPT_HELP_DB 1242
 #define ER_CYCLIC_REFERENCE 1243
 #define ER_AUTO_CONVERT	1244
-#define ER_ILLEGAL_REFERENCE 1246
+#define ER_ILLEGAL_REFERENCE 1245
 #define ER_ERROR_MESSAGES 246

mysql-test/t/subselect.test

 select (select 2);
 SELECT (SELECT 1) UNION SELECT (SELECT 2);
 SELECT (SELECT (SELECT 0 UNION SELECT 0));
--- error 1244
+-- error 1245
 SELECT (SELECT 1 FROM (SELECT 1) HAVING a=1) as a;
--- error 1244
+-- error 1245
 SELECT (SELECT 1 FROM (SELECT 1) HAVING b=1) as a,(SELECT 1 FROM (SELECT 1) HAVING a=1) as b;
 drop table if exists t1,t2,t3,t4,t5,attend,clinic,inscrit;
 create table t1 (a int);
@@ -13,7 +13,7 @@ create table t4 (a int, b int);
 insert into t1 values (2);
 insert into t2 values (1,7),(2,7);
 insert into t4 values (4,8),(3,8),(5,9);
--- error 1244
+-- error 1245
 select (select a from t1 where t1.a = a1) as a2, (select b from t2 where t2.b=a2) as a1;
 select (select a from t1 where t1.a=t2.a), a from t2;
 select (select a from t1 where t1.a=t2.b), a from t2;
@@ -178,7 +178,7 @@ CREATE TABLE `threadhardwarefr7` (
   UNIQUE KEY `numreponse` (`numreponse`),
   KEY `pseudo` (`pseudo`,`numeropost`)
 ) TYPE=MyISAM;
--- error 1244
+-- error 1245
 SELECT (SELECT numeropost FROM threadhardwarefr7 HAVING numreponse=a),numreponse FROM (SELECT * FROM threadhardwarefr7) as a;
 -- error 1054
 SELECT numreponse, (SELECT numeropost FROM threadhardwarefr7 HAVING numreponse=a) FROM (SELECT * FROM threadhardwarefr7) as a;