simple optimzation

Portability fixes


client/mysqltest.c:
  Fixed that if error number 0 is included in --error, we will not generate an error message
include/mysql.h:
  Portability fix
mysql-test/mysql-test-run.sh:
  Portability fix
mysql-test/r/heap_btree.result:
  Portability fix
mysql-test/r/rpl_error_ignored_table.result:
  Portability fix
mysql-test/t/heap_btree.test:
  Portability fix
mysql-test/t/rpl_error_ignored_table.test:
  Portability fix
sql/sql_base.cc:
  simple optimzation
sql/sql_yacc.yy:
  simple optimzation

5 files changed, 6 insertions, 3 deletions

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index b4d5958fb50..d0ce62cdcee 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -22,6 +22,9 @@ case `uname` in
     SCO_SV | UnixWare | OpenUNIX )
         # do nothing (Causes strange behavior)
         ;;
+    QNX)
+        # do nothing (avoid error message)
+        ;;
     * )
         ulimit -n 1024
         ;;
diff --git a/mysql-test/r/heap_btree.result b/mysql-test/r/heap_btree.result
index f92a8653a69..5c60c97d674 100644
--- a/mysql-test/r/heap_btree.result
+++ b/mysql-test/r/heap_btree.result
@@ -178,7 +178,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	btn	btn	10	NULL	1	Using where
 explain select * from t1 where btn like "h%";
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	btn	btn	10	NULL	4	Using where
+1	SIMPLE	t1	range	btn	btn	10	NULL	#	Using where
 explain select * from t1 where btn like "a%";
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	btn	btn	10	NULL	1	Using where
diff --git a/mysql-test/r/rpl_error_ignored_table.result b/mysql-test/r/rpl_error_ignored_table.result
index dd277e41ad0..4a562dbfc70 100644
--- a/mysql-test/r/rpl_error_ignored_table.result
+++ b/mysql-test/r/rpl_error_ignored_table.result
@@ -26,7 +26,6 @@ select (@id := id) - id from t3;
 0
 kill @id;
 drop table t2,t3;
-Got one of the listed errors
 show binlog events from 79;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
 master-bin.000001	79	Query	1	79	use `test`; create table t1 (a int primary key)
diff --git a/mysql-test/t/heap_btree.test b/mysql-test/t/heap_btree.test
index ad78636d002..d156d059634 100644
--- a/mysql-test/t/heap_btree.test
+++ b/mysql-test/t/heap_btree.test
@@ -111,6 +111,7 @@ drop table t1;
 create table t1 (btn char(10) not null, key using BTREE (btn)) engine=heap;
 insert into t1 values ("hello"),("hello"),("hello"),("hello"),("hello"),("a"),("b"),("c"),("d"),("e"),("f"),("g"),("h"),("i");
 explain select * from t1 where btn like "i%";
+--replace_column 9 #
 explain select * from t1 where btn like "h%";
 explain select * from t1 where btn like "a%";
 explain select * from t1 where btn like "b%";
diff --git a/mysql-test/t/rpl_error_ignored_table.test b/mysql-test/t/rpl_error_ignored_table.test
index 40dbe455c7a..f2ddaa273ed 100644
--- a/mysql-test/t/rpl_error_ignored_table.test
+++ b/mysql-test/t/rpl_error_ignored_table.test
@@ -45,7 +45,7 @@ select (@id := id) - id from t3;
 kill @id;
 drop table t2,t3;
 connection master;
---error 1053,0;
+--error 0,1053;
 reap;
 connection master1;
 show binlog events from 79;