Merge rurik.mysql.com:/home/igor/mysql-5.0

into rurik.mysql.com:/home/igor/dev/mysql-5.0-0

include/mysql_com.h

@@ -157,7 +157,8 @@ typedef struct st_net {
   unsigned int *return_status;
   unsigned char reading_or_writing;
   char save_char;
-  my_bool no_send_ok;
+  my_bool no_send_ok;  /* For SPs and other things that do multiple stmts */
+  my_bool no_send_eof; /* For SPs' first version read-only cursors */
   /*
     Pointer to query object in query cache, do not equal NULL (0) for
     queries in cache that have not stored its results yet

mysql-test/r/index_merge.result

@@ -270,6 +270,11 @@ explain select * from t0,t1 where t0.key1 = 5 and
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ref	i1	i1	4	const	1	Using where
 1	SIMPLE	t1	index_merge	i1,i8	i1,i8	4,4	NULL	2	Using where
+explain select * from t0,t1 where t0.key1 < 3 and
+(t1.key1 = t0.key1 or t1.key8 = t0.key1);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t0	range	i1	i1	4	NULL	3	Using where
+1	SIMPLE	t1	ALL	i1,i8	NULL	NULL	NULL	1024	Range checked for each record (index map: 0x81)
 explain select * from t1 where key1=3 or key2=4 
 union select * from t1 where key1<4 or key3=5;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

mysql-test/r/sp-error.result

@@ -259,4 +259,15 @@ declare c cursor for select * from t1;
 declare c cursor for select field from t1;
 end;
 ERROR 42000: Duplicate cursor: c
+create procedure bug1965()
+begin
+declare c cursor for select val from t1 order by valname;
+open c;
+close c;
+end;
+call bug1965();
+ERROR 42S22: Unknown column 'valname' in 'order clause'
+drop procedure bug1965;
+select 1 into a;
+ERROR 42000: Undeclared variable: a
 drop table t1;

mysql-test/t/index_merge.test

@@ -237,6 +237,10 @@ select * from t0,t1 where (t0.key1=t1.key1) and
 explain select * from t0,t1 where t0.key1 = 5 and 
   (t1.key1 = t0.key1 or t1.key8 = t0.key1);
 
+# Fix for bug#1974
+explain select * from t0,t1 where t0.key1 < 3 and
+  (t1.key1 = t0.key1 or t1.key8 = t0.key1);
+
 #  index_merge inside union
 explain select * from t1 where key1=3 or key2=4 
   union select * from t1 where key1<4 or key3=5;

mysql-test/t/sp-error.test

@@ -341,6 +341,27 @@ begin
   declare c cursor for select field from t1;
 end|
 
+#
+# BUG#1965
+#
+create procedure bug1965()
+begin
+  declare c cursor for select val from t1 order by valname;
+  open c;
+  close c;
+end|
+
+--error 1054
+call bug1965()|
+drop procedure bug1965|
+
+#
+# BUG#1966
+#
+--error 1308
+select 1 into a|
+
+
 drop table t1|
 
 delimiter ;|

sql/net_serv.cc

@@ -123,6 +123,7 @@ my_bool my_net_init(NET *net, Vio* vio)
   net->buff_end=net->buff+net->max_packet;
   net->vio = vio;
   net->no_send_ok = 0;
+  net->no_send_eof = 0;
   net->error=0; net->return_errno=0; net->return_status=0;
   net->pkt_nr=net->compress_pkt_nr=0;
   net->write_pos=net->read_pos = net->buff;

sql/opt_range.cc

@@ -1018,6 +1018,7 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
           List_iterator_fast<SEL_IMERGE> it(tree->merges);
           while ((imerge= it++))
           {
+            bool    imerge_failed= false;
             double  imerge_cost= 0;
             ha_rows imerge_total_records= 0;
             double  tree_read_time;
@@ -1036,11 +1037,13 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
                                           &tree_read_time, &tree_records,
                                           &(imerge->best_keys[ptree - 
                                           imerge->trees])))
-                goto imerge_fail;
-
+                imerge_failed= true;
               imerge_cost += tree_read_time;
               imerge_total_records += tree_records;
             }
+
+            if (!imerge_failed)
+            {
               imerge_total_records= min(imerge_total_records, 
                                         head->file->records);
               imerge_cost += imerge_total_records / TIME_FOR_COMPARE;
@@ -1050,7 +1053,7 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
                 min_imerge_cost= imerge_cost;
                 min_imerge_records= imerge_total_records;
               }
-imerge_fail:;
+            }
           }
           
           if (!min_imerge)

sql/protocol.cc

@@ -347,7 +347,7 @@ send_eof(THD *thd, bool no_flush)
   static char eof_buff[1]= { (char) 254 };	/* Marker for end of fields */
   NET *net= &thd->net;
   DBUG_ENTER("send_eof");
-  if (net->vio != 0)
+  if (net->vio != 0 && !net->no_send_eof)
   {
     if (!no_flush && (thd->client_capabilities & CLIENT_PROTOCOL_41))
     {

sql/sp_rcontext.cc

@@ -149,15 +149,15 @@ sp_cursor::pre_open(THD *thd)
   m_oprot= thd->protocol;	// Save the original protocol
   thd->protocol= m_prot;
 
-  m_ovio= thd->net.vio;		// Prevent send_eof()
-  thd->net.vio= 0;
+  m_nseof= thd->net.no_send_eof;
+  thd->net.no_send_eof= TRUE;
   return m_lex;
 }
 
 void
 sp_cursor::post_open(THD *thd, my_bool isopen)
 {
-  thd->net.vio= m_ovio;		// Restore the originals
+  thd->net.no_send_eof= m_nseof; // Restore the originals
   thd->protocol= m_oprot;
   m_isopen= isopen;
   m_current_row= m_prot->data;

sql/sp_rcontext.h

@@ -240,7 +240,7 @@ private:
   LEX *m_lex;
   Protocol_cursor *m_prot;
   my_bool m_isopen;
-  Vio *m_ovio;			// Original vio
+  my_bool m_nseof;		// Original no_send_eof
   Protocol *m_oprot;		// Original protcol
   MYSQL_ROWS *m_current_row;
   

sql/sql_yacc.yy

@@ -4555,12 +4555,11 @@ select_var_ident:
            | ident_or_text
            {
              LEX *lex=Lex;
-	     if (!lex->spcont)
-	       YYABORT;
 	     sp_pvar_t *t;
-	     if (!(t=lex->spcont->find_pvar(&$1)))
+
+	     if (!lex->spcont || !(t=lex->spcont->find_pvar(&$1)))
 	     {
-	       send_error(lex->thd, ER_SP_UNDECLARED_VAR);
+	       net_printf(YYTHD, ER_SP_UNDECLARED_VAR, $1.str);
 	       YYABORT;
 	     }
 	     if (! lex->result)