bk commit into 5.0 tree (monty:1.1814)

[monty]

Below is the list of changes that have just been committed into a local
5.0 repository of monty. When monty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1814 05/03/16 22:59:06 monty@stripped +5 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/my/mysql-5.0

  sql/sql_yacc.yy
    1.353 05/03/16 22:59:05 monty@stripped +0 -0
    Auto merged

  sql/sql_parse.cc
    1.421 05/03/16 22:59:04 monty@stripped +0 -0
    Auto merged

  sql/mysql_priv.h
    1.278 05/03/16 22:59:04 monty@stripped +0 -0
    Auto merged

  sql/log_event.cc
    1.168 05/03/16 22:59:04 monty@stripped +0 -0
    Auto merged

  sql/item_func.cc
    1.174 05/03/16 22:59:04 monty@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	monty
# Host:	narttu.mysql.com
# Root:	/home/my/mysql-5.0/RESYNC

--- 1.173/sql/item_func.cc	2005-03-16 03:32:41 +02:00
+++ 1.174/sql/item_func.cc	2005-03-16 22:59:04 +02:00
@@ -4467,18 +4467,18 @@
 {
   maybe_null= 1;
   m_name->init_qname(current_thd);
-  dummy_table= (TABLE *)sql_alloc(sizeof(TABLE));
-  bzero(dummy_table, sizeof(TABLE));
+  dummy_table= (TABLE*) sql_calloc(sizeof(TABLE));
 }
 
+
 Item_func_sp::Item_func_sp(sp_name *name, List<Item> &list)
   :Item_func(list), m_name(name), m_sp(NULL)
 {
   maybe_null= 1;
   m_name->init_qname(current_thd);
-  dummy_table= (TABLE *)sql_alloc(sizeof(TABLE));
-  bzero(dummy_table, sizeof(TABLE));
+  dummy_table= (TABLE*) sql_calloc(sizeof(TABLE));
 }
+
 
 const char *
 Item_func_sp::func_name() const

--- 1.167/sql/log_event.cc	2005-03-16 11:13:29 +02:00
+++ 1.168/sql/log_event.cc	2005-03-16 22:59:04 +02:00
@@ -2610,7 +2610,7 @@
       "data truncated" warning but which is absorbed and never gets to the
       error log); still we init it to avoid a Valgrind message.
     */
-    mysql_reset_errors(thd);
+    mysql_reset_errors(thd, 0);
 
     TABLE_LIST tables;
     bzero((char*) &tables,sizeof(tables));

--- 1.277/sql/mysql_priv.h	2005-03-16 16:10:55 +02:00
+++ 1.278/sql/mysql_priv.h	2005-03-16 22:59:04 +02:00
@@ -943,8 +943,10 @@
 
 /* sql_load.cc */
 bool mysql_load(THD *thd, sql_exchange *ex, TABLE_LIST *table_list,
-	        List<Item> &fields, enum enum_duplicates handle_duplicates,
-                bool ignore, bool local_file, thr_lock_type lock_type);
+	        List<Item> &fields_vars, List<Item> &set_fields,
+                List<Item> &set_values_list,
+                enum enum_duplicates handle_duplicates, bool ignore,
+                bool local_file);
 int write_record(THD *thd, TABLE *table, COPY_INFO *info);
 
 /* sql_manager.cc */

--- 1.420/sql/sql_parse.cc	2005-03-16 16:10:55 +02:00
+++ 1.421/sql/sql_parse.cc	2005-03-16 22:59:04 +02:00
@@ -3338,14 +3338,10 @@
   {
     DBUG_ASSERT(first_table == all_tables && first_table != 0);
     uint privilege= (lex->duplicates == DUP_REPLACE ?
-		     INSERT_ACL | DELETE_ACL : INSERT_ACL);
+		     INSERT_ACL | DELETE_ACL : INSERT_ACL) |
+                    (lex->local_file ? 0 : FILE_ACL);
 
-    if (!lex->local_file)
-    {
-      if (check_access(thd, privilege | FILE_ACL, first_table->db, 0, 0, 0))
-	goto error;
-    }
-    else
+    if (lex->local_file)
     {
       if (!(thd->client_capabilities & CLIENT_LOCAL_FILES) ||
 	  ! opt_local_infile)
@@ -3353,12 +3349,14 @@
 	my_message(ER_NOT_ALLOWED_COMMAND, ER(ER_NOT_ALLOWED_COMMAND), MYF(0));
 	goto error;
       }
-      if (check_one_table_access(thd, privilege, all_tables))
-	goto error;
     }
+
+    if (check_one_table_access(thd, privilege, all_tables))
+      goto error;
+
     res= mysql_load(thd, lex->exchange, first_table, lex->field_list,
-                    lex->duplicates, lex->ignore, (bool) lex->local_file,
-		    lex->lock_option);
+                    lex->update_list, lex->value_list, lex->duplicates,
+                    lex->ignore, (bool) lex->local_file);
     break;
   }
 
@@ -5848,6 +5846,7 @@
 {
   TABLE_LIST *ptr;
   DBUG_ENTER("end_nested_join");
+  DBUG_ASSERT(embedding);
   ptr= embedding;
   join_list= ptr->join_list;
   embedding= ptr->embedding;
@@ -5860,6 +5859,12 @@
     embedded->embedding= embedding;
     join_list->push_front(embedded);
     ptr= embedded;
+  }
+  else
+  if (nested_join->join_list.elements == 0)
+  {
+    join_list->pop();
+    DBUG_RETURN(0);
   }
   DBUG_RETURN(ptr);
 }

--- 1.352/sql/sql_yacc.yy	2005-03-16 18:27:04 +02:00
+++ 1.353/sql/sql_yacc.yy	2005-03-16 22:59:05 +02:00
@@ -1398,14 +1398,18 @@
 	    uint unused1= 0;
 	    int unused2= 0;
 
-	    if (!(new_field= new_create_field(YYTHD, "", (enum enum_field_types)$8,
-			  lex->length, lex->dec, lex->type,
-			  (Item *)0, (Item *) 0, &cmt, 0, &lex->interval_list, 
-			  (lex->charset ? lex->charset : default_charset_info),
-			  lex->uint_geom_type)))
+	    if (!(new_field= new_create_field(YYTHD, "",
+					      (enum enum_field_types)$8,
+			  		      lex->length, lex->dec, lex->type,
+			  		      (Item *)0, (Item *) 0, &cmt, 0,
+					      &lex->interval_list, 
+			  		      (lex->charset ? lex->charset :
+					       default_charset_info),
+					      lex->uint_geom_type)))
 	      YYABORT;
 
-	    if (prepare_create_field(new_field, unused1, unused2, unused2, 0))
+	    if (prepare_create_field(new_field, &unused1, &unused2, &unused2,
+				     0))
 	      YYABORT;
 
 	    sp->m_returns= new_field->sql_type;