From 7d0912010566ea390cdd9325dc98e96fc7d24675 Mon Sep 17 00:00:00 2001
From: "monty@mashka.mysql.fi" <>
Date: Thu, 27 Mar 2003 14:15:42 +0200
Subject: [PATCH] After merge fixes

---
 mysql-test/r/query_cache.result | 1 -
 mysql-test/t/query_cache.test   | 3 +--
 sql/sql_parse.cc                | 2 +-
 sql/sql_yacc.yy                 | 4 ++--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
index da229571497..32959e2cb47 100644
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -566,7 +566,6 @@ show status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	0
 drop table t1;
-drop table if exists t1;
 create table t1 (a int);
 insert into t1 values (1),(2),(3);
 show status like "Qcache_queries_in_cache";
diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test
index 243910bf64b..533f6959522 100644
--- a/mysql-test/t/query_cache.test
+++ b/mysql-test/t/query_cache.test
@@ -416,11 +416,10 @@ drop table t1;
 # INTO OUTFILE/DUMPFILE test
 #
 
-drop table if exists t1;
 create table t1 (a int);
 insert into t1 values (1),(2),(3);
 show status like "Qcache_queries_in_cache";
 select * from t1 into outfile "query_caceh.out.file";
 select * from t1 limit 1 into dumpfile "query_cache.dump.file";
 show status like "Qcache_queries_in_cache";
-drop table t1;
\ No newline at end of file
+drop table t1;
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 318e67252c7..008803183f2 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -3433,7 +3433,7 @@ bool add_field_to_list(THD *thd, char *field_name, enum_field_types type,
     }
     else if (type_modifier & AUTO_INCREMENT_FLAG)
     {
-      net_printf(&thd, ER_INVALID_DEFAULT, field_name);
+      net_printf(thd, ER_INVALID_DEFAULT, field_name);
       DBUG_RETURN(1);
     }
   }
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index c57fc10543a..893e4ae90db 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -3081,7 +3081,7 @@ into:
 	  LEX *lex=Lex;
 	  if (!lex->describe)
 	  {
-	    lex->uncacheable()
+	    lex->uncacheable();
 	    if (!(lex->exchange= new sql_exchange($3.str,0)))
 	      YYABORT;
 	    if (!(lex->result= new select_export(lex->exchange)))
@@ -3094,7 +3094,7 @@ into:
 	  LEX *lex=Lex;
 	  if (!lex->describe)
 	  {
-	    lex->uncacheable()
+	    lex->uncacheable();
 	    if (!(lex->exchange= new sql_exchange($3.str,1)))
 	      YYABORT;
 	    if (!(lex->result= new select_dump(lex->exchange)))