Changed error expected at login failure caused by expired password from 1862 to 1820 in the driver and in the related testcase.

лаврин · лаврин · commit cd6be55c082d · 2013-01-24T15:06:50.000+02:00
diff --git a/driver/mysql_connection.cpp b/driver/mysql_connection.cpp
@@ -71,7 +71,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mysql_debug.h"
 
 #ifndef ER_MUST_CHANGE_PASSWORD_LOGIN
-# define ER_MUST_CHANGE_PASSWORD_LOGIN 1862
+# define ER_MUST_CHANGE_PASSWORD_LOGIN 1820
 #endif
 
 namespace sql
diff --git a/test/unit/bugs/bugs.cpp b/test/unit/bugs/bugs.cpp
@@ -293,7 +293,7 @@ void bugs::expired_pwd()
   }
   catch (sql::SQLException &e)
   {
-    ASSERT_EQUALS(1862, e.getErrorCode()/*ER_MUST_CHANGE_PASSWORD_LOGIN*/);
+    ASSERT_EQUALS(1820, e.getErrorCode()/*ER_MUST_CHANGE_PASSWORD_LOGIN*/);
   }
 
   /* ... Now with it */
@@ -327,6 +327,8 @@ void bugs::expired_pwd()
   }
 
   // Trying to connect with new pwd
+  opts.erase("preInit");
+  opts.erase("OPT_CAN_HANDLE_EXPIRED_PASSWORDS");
   opts["password"]= sql::SQLString("bar");
   opts["CLIENT_MULTI_STATEMENTS"]= true;
   opts["postInit"]= sql::SQLString("create table test.ccpp_expired_pwd(i int);"

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ void bugs::expired_pwd()`
`293`	`293`	`}`
`294`	`294`	`catch (sql::SQLException &e)`
`295`	`295`	`{`
`296`		`- ASSERT_EQUALS(1862, e.getErrorCode()/ER_MUST_CHANGE_PASSWORD_LOGIN/);`
	`296`	`+ ASSERT_EQUALS(1820, e.getErrorCode()/ER_MUST_CHANGE_PASSWORD_LOGIN/);`
`297`	`297`	`}`
`298`	`298`
`299`	`299`	`/* ... Now with it */`
`@@ -327,6 +327,8 @@ void bugs::expired_pwd()`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`// Trying to connect with new pwd`
	`330`	`+ opts.erase("preInit");`
	`331`	`+ opts.erase("OPT_CAN_HANDLE_EXPIRED_PASSWORDS");`
`330`	`332`	`opts["password"]= sql::SQLString("bar");`
`331`	`333`	`opts["CLIENT_MULTI_STATEMENTS"]= true;`
`332`	`334`	`opts["postInit"]= sql::SQLString("create table test.ccpp_expired_pwd(i int);"`