Fixes during review

mysql-test/r/select.result:
  Better error message
mysql-test/t/select.test:
  Better error message
sql/hostname.cc:
  Join identical code
sql/sql_yacc.yy:
  Combine code (and get a better error message)
strings/ctype-ucs2.c:
  Cast pointer differencess

2 files changed, 4 insertions, 4 deletions

diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index 50300ed9b76..387e7eff693 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -2451,7 +2451,7 @@ a
 select distinct distinct * from t1;
 a
 select all distinct * from t1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'distinct * from t1' at line 1
+ERROR HY000: Incorrect usage of ALL and DISTINCT
 select distinct all * from t1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'all * from t1' at line 1
+ERROR HY000: Incorrect usage of ALL and DISTINCT
 drop table t1;
diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test
index 6d6d5f6b6e1..a46522c1510 100644
--- a/mysql-test/t/select.test
+++ b/mysql-test/t/select.test
@@ -1987,9 +1987,9 @@ drop table t1;
 create table t1 (a int(11));
 select all all * from t1;
 select distinct distinct * from t1;
---error 1064
+--error 1221
 select all distinct * from t1;
---error 1064
+--error 1221
 select distinct all * from t1;
 drop table t1;