mysqltest bugfix

typo/bad merge fixed
chmod a-x for man/*.1 files


man/isamchk.1:
  Change mode to -rw-rw-r--
man/mysqlaccess.1:
  Change mode to -rw-rw-r--
man/mysqladmin.1:
  Change mode to -rw-rw-r--
man/mysqld.1:
  Change mode to -rw-rw-r--
man/mysqldump.1:
  Change mode to -rw-rw-r--
man/mysqlshow.1:
  Change mode to -rw-rw-r--
man/perror.1:
  Change mode to -rw-rw-r--
man/safe_mysqld.1:
  Change mode to -rw-rw-r--
mysql-test/r/handler.result:
  new tests added
client/mysqltest.c:
  bug fixed: errors from handler.test (that is send_error()
  after send_fields) weren't catched by expected_errno
mysql-test/t/handler.test:
  typo fixed
sql/Makefile.am:
  bad merge fixed
sql/sql_yacc.yy:
  bad merge (?) fixed

13 files changed, 76 insertions, 24 deletions

diff --git a/client/mysqltest.c b/client/mysqltest.c
index 10095bbf7df..a05b232e230 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -1522,13 +1522,16 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
   if(!(flags & QUERY_REAP))
     return 0;
   
-  if (mysql_read_query_result(mysql))
+  if (mysql_read_query_result(mysql) ||
+      (!(res = mysql_store_result(mysql)) && mysql_field_count(mysql)))
   {
     if (q->require_file)
       abort_not_supported_test();
     if (q->abort_on_error)
       die("At line %u: query '%s' failed: %d: %s", start_lineno, query,
 	  mysql_errno(mysql), mysql_error(mysql));
+      /*die("At line %u: Failed in mysql_store_result for query '%s' (%d)",
+	  start_lineno, query, mysql_errno(mysql));*/
     else
     {
       for (i=0 ; q->expected_errno[i] ; i++)
@@ -1549,6 +1552,12 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
       */
       goto end;
     }
+    /*{
+      verbose_msg("failed in mysql_store_result for query '%s' (%d)", query,
+		  mysql_errno(mysql));
+      error = 1;
+      goto end;
+    }*/
   }
 
   if (q->expected_errno[0])
@@ -1559,23 +1568,6 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
     goto end;
   }
 
-
-  if (!(res = mysql_store_result(mysql)) && mysql_field_count(mysql))
-  {
-    if (q->require_file)
-      abort_not_supported_test();
-    if (q->abort_on_error)
-      die("At line %u: Failed in mysql_store_result for query '%s' (%d)",
-	  start_lineno, query, mysql_errno(mysql));
-    else
-    {
-      verbose_msg("failed in mysql_store_result for query '%s' (%d)", query,
-		  mysql_errno(mysql));
-      error = 1;
-      goto end;
-    }
-  }
-
   if (!res) goto end;
 
   fields =  mysql_fetch_fields(res);
diff --git a/man/isamchk.1 b/man/isamchk.1
index f225dc35d18..f225dc35d18 100755..100644
--- a/man/isamchk.1
+++ b/man/isamchk.1
diff --git a/man/mysqlaccess.1 b/man/mysqlaccess.1
index 888cfe8f646..888cfe8f646 100755..100644
--- a/man/mysqlaccess.1
+++ b/man/mysqlaccess.1
diff --git a/man/mysqladmin.1 b/man/mysqladmin.1
index 58bd2070de6..58bd2070de6 100755..100644
--- a/man/mysqladmin.1
+++ b/man/mysqladmin.1
diff --git a/man/mysqld.1 b/man/mysqld.1
index d3f22c0be1b..d3f22c0be1b 100755..100644
--- a/man/mysqld.1
+++ b/man/mysqld.1
diff --git a/man/mysqldump.1 b/man/mysqldump.1
index f108da17bf9..f108da17bf9 100755..100644
--- a/man/mysqldump.1
+++ b/man/mysqldump.1
diff --git a/man/mysqlshow.1 b/man/mysqlshow.1
index 55a87c1df78..55a87c1df78 100755..100644
--- a/man/mysqlshow.1
+++ b/man/mysqlshow.1
diff --git a/man/perror.1 b/man/perror.1
index 2853f2cb1ba..2853f2cb1ba 100755..100644
--- a/man/perror.1
+++ b/man/perror.1
diff --git a/man/safe_mysqld.1 b/man/safe_mysqld.1
index 30abf04ae6b..30abf04ae6b 100755..100644
--- a/man/safe_mysqld.1
+++ b/man/safe_mysqld.1
diff --git a/mysql-test/r/handler.result b/mysql-test/r/handler.result
index b13199ba96d..5dcab296eac 100644
--- a/mysql-test/r/handler.result
+++ b/mysql-test/r/handler.result
@@ -24,3 +24,64 @@ a	b
 a	b
 a	b
 15	bbb
+a	b
+16	ccc
+a	b
+19	fff
+a	b
+19	yyy
+a	b
+19	fff
+a	b
+a	b
+14	aaa
+a	b
+18	eee
+a	b
+18	eee
+a	b
+19	fff
+a	b
+18	eee
+a	b
+17	ddd
+a	b
+14	aaa
+15	bbb
+16	ccc
+16	xxx
+17	ddd
+a	b
+18	eee
+19	fff
+19	yyy
+a	b
+19	fff
+18	eee
+17	ddd
+16	xxx
+16	ccc
+15	bbb
+14	aaa
+a	b
+16	ccc
+16	xxx
+17	ddd
+18	eee
+a	b
+17	ddd
+18	eee
+a	b
+22	iii
+21	hhh
+20	ggg
+a	b
+19	fff
+a	b
+19	yyy
+a	b
+17	ddd
+a	b
+18	eee
+a	b
+19	fff
diff --git a/mysql-test/t/handler.test b/mysql-test/t/handler.test
index a22e5546252..359c5641056 100644
--- a/mysql-test/t/handler.test
+++ b/mysql-test/t/handler.test
@@ -59,7 +59,7 @@ handler t2 read a=(19) where b="yyy";
 handler t2 read first;
 handler t2 read next;
 handler t2 read next;
-handler t2 read last;
+!$1064 handler t2 read last;
 
 handler t2 close;
 drop table if exists t1;
diff --git a/sql/Makefile.am b/sql/Makefile.am
index 2fc621090b3..5af1b2900ff 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -41,7 +41,7 @@ LDADD =			../isam/libnisam.a \
 			../regex/libregex.a \
 			../strings/libmystrings.a
 mysqld_LDADD =		@MYSQLD_EXTRA_LDFLAGS@ \
-			@bdb_libs@ @innobase_libs@ @pstack_libs@ \
+			@bdb_libs@ @innodb_libs@ @pstack_libs@ \
                         @gemini_libs@ \
 			$(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS)
 noinst_HEADERS =	item.h item_func.h item_sum.h item_cmpfunc.h \
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index ef271bb888e..357ba41046c 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -444,7 +444,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
 %token	TINYINT
 %token	TINYTEXT
 %token	UNSIGNED
->>>>>>> BitKeeper/tmp/sql_yacc.yy_serg@1.85
 %token	VARBINARY
 %token	VARCHAR
 %token	VARIABLES
@@ -2185,7 +2184,7 @@ values:
 /* Update rows in a table */
 
 update:
-	UPDATE_SYM opt_low_priority opt_ignore table 
+	UPDATE_SYM opt_low_priority opt_ignore table_name
         SET update_list 
         where_clause 
         opt_order_clause
@@ -2224,7 +2223,7 @@ delete:
           Lex->order_list.first=0;
           Lex->order_list.next= (byte**) &Lex->order_list.first;
         }
-        opt_delete_options FROM table
+        opt_delete_options FROM table_name
 	where_clause opt_order_clause delete_limit_clause
 
 
@@ -2237,7 +2236,7 @@ opt_delete_option:
 	| LOW_PRIORITY	{ Lex->lock_option= TL_WRITE_LOW_PRIORITY; }
 
 truncate:
-	TRUNCATE_SYM opt_table_sym table
+	TRUNCATE_SYM opt_table_sym table_name
 	{
 	  LEX* lex = Lex;
 	  lex->sql_command= SQLCOM_TRUNCATE;