post-merge fix

libmysqld/lib_sql.cc

@@ -664,7 +664,7 @@ bool Protocol::send_fields(List<Item> *list, int flags)
 
   DBUG_RETURN(prepare_for_send(list));
  err:
-  send_error(thd, ER_OUT_OF_RESOURCES);	/* purecov: inspected */
+  my_error(ER_OUT_OF_RESOURCES, MYF(0));        /* purecov: inspected */
   DBUG_RETURN(1);				/* purecov: inspected */
 }
 

mysql-test/t/connect.test

@@ -49,7 +49,7 @@ flush privileges;
 #show tables;
 connect (con1,localhost,test,gambling2,mysql);
 set password="";
---error 1371
+--error 1372
 set password='gambling3';
 set password=old_password('gambling3');
 show tables;

mysql-test/t/rpl_charset.test

@@ -112,10 +112,10 @@ sync_slave_with_master;
 
 # Check that we can't change global.collation_server
 
-error 1386;
+error 1387;
 set global character_set_server=latin2;
 connection master;
-error 1386;
+error 1387;
 set global character_set_server=latin2;
 
 # Check that SET ONE_SHOT is really one shot
@@ -129,7 +129,7 @@ select @@character_set_server;
 select @@character_set_server;
 
 # ONE_SHOT on not charset/collation stuff is not allowed
-error 1381;
+error 1382;
 set one_shot max_join_size=10;
 
 # Test of wrong character set numbers;

mysql-test/t/rpl_timezone.test

@@ -76,7 +76,7 @@ select * from t2;
 # replication
 #
 connection master;
---error 1386
+--error 1387
 set global time_zone='MET';
 
 # Clean up