diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-10-28 14:02:09 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-10-28 14:02:09 +0300 |
| commit | 17cf3c633eb1db29457cbd62c5fc022d07d5dd6d (patch) | |
| tree | e934afe2ce49581363e182ea64ec3ffb54109e38 | |
| parent | 46ce3d00921491398d2e9a00c2b03e67540dee23 (diff) | |
| download | mariadb-git-17cf3c633eb1db29457cbd62c5fc022d07d5dd6d.tar.gz | |
post-merge fix
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 | ||||
| -rw-r--r-- | mysql-test/t/connect.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl_charset.test | 6 | ||||
| -rw-r--r-- | mysql-test/t/rpl_timezone.test | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index fdc1acea09b..85e4ccd48bf 100644 --- a/libmysqld/lib_sql.cc +++ b/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 */ } diff --git a/mysql-test/t/connect.test b/mysql-test/t/connect.test index 3ec2648fa7e..8e1a92a586e 100644 --- a/mysql-test/t/connect.test +++ b/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; diff --git a/mysql-test/t/rpl_charset.test b/mysql-test/t/rpl_charset.test index e49ab7468a3..b270a704eaa 100644 --- a/mysql-test/t/rpl_charset.test +++ b/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; diff --git a/mysql-test/t/rpl_timezone.test b/mysql-test/t/rpl_timezone.test index 03e910cd7ca..ebb58a9c880 100644 --- a/mysql-test/t/rpl_timezone.test +++ b/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 |