Merge 4.1 into 5.0.

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
BitKeeper/deleted/.del-opt_ft.cc~2048ffa561f9c59:
  Auto merged
BitKeeper/deleted/.del-opt_ft.h~24aac1d29304599a:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/null.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/null.test:
  Auto merged
mysql-test/t/rpl_until.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql-common/client.c:
  Auto merged

1 files changed, 17 insertions, 17 deletions

diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 2c62a71a798..b05b83f8a06 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -1589,7 +1589,7 @@ static my_bool my_realloc_str(NET *net, ulong length)
 ********************************************************************/
 
 /*
-  Read the prepare statement results ..
+  Read the prepared statement results ..
 
   NOTE
     This is only called for connection to servers that supports
@@ -1815,7 +1815,7 @@ static void store_param_type(NET *net, uint type)
 /****************************************************************************
   Functions to store parameter data from a prepared statement.
 
-  All functions has the following characteristics:
+  All functions have the following characteristics:
 
   SYNOPSIS
     store_param_xxx()
@@ -1997,7 +1997,7 @@ static my_bool store_param(MYSQL_STMT *stmt, MYSQL_BIND *param)
 
 
 /*
-  Send the prepare query to server for execution
+  Send the prepared query to server for execution
 */
 
 static my_bool execute(MYSQL_STMT * stmt, char *packet, ulong length)
@@ -2035,14 +2035,6 @@ int cli_stmt_execute(MYSQL_STMT *stmt)
     uint null_count;
     my_bool    result;
 
-#ifdef CHECK_EXTRA_ARGUMENTS
-    if (!stmt->param_buffers)
-    {
-      /* Parameters exists, but no bound buffers */
-      set_stmt_error(stmt, CR_NOT_ALL_PARAMS_BOUND, unknown_sqlstate);
-      DBUG_RETURN(1);
-    }
-#endif
     net_clear(net);				/* Sets net->write_pos */
     /* Reserve place for null-marker bytes */
     null_count= (stmt->param_count+7) /8;
@@ -2087,7 +2079,7 @@ int cli_stmt_execute(MYSQL_STMT *stmt)
 }
 
 /*
-  Execute the prepare query
+  Execute the prepared query
 */
 
 int STDCALL mysql_execute(MYSQL_STMT *stmt)
@@ -2099,6 +2091,14 @@ int STDCALL mysql_execute(MYSQL_STMT *stmt)
     set_stmt_error(stmt, CR_NO_PREPARE_STMT, unknown_sqlstate);
     DBUG_RETURN(1);
   }
+#ifdef CHECK_EXTRA_ARGUMENTS
+  if (stmt->param_count && !stmt->param_buffers)
+  {
+    /* Parameters exists, but no bound buffers */
+    set_stmt_error(stmt, CR_NOT_ALL_PARAMS_BOUND, unknown_sqlstate);
+    DBUG_RETURN(1);
+  }
+#endif
   if ((*stmt->mysql->methods->stmt_execute)(stmt))
     DBUG_RETURN(1);
       
@@ -2332,7 +2332,7 @@ mysql_send_long_data(MYSQL_STMT *stmt, uint param_number,
 /****************************************************************************
   Functions to fetch data to application buffers
 
-  All functions has the following characteristics:
+  All functions have the following characteristics:
 
   SYNOPSIS
     fetch_result_xxx()
@@ -3059,12 +3059,12 @@ no_data:
 
 
 /*
-  Fetch datat for one specified column data
+  Fetch data for one specified column data
 
   SYNOPSIS
     mysql_fetch_column()
     stmt		Prepared statement handler
-    bind		Where date should be placed. Should be filled in as
+    bind		Where data should be placed. Should be filled in as
 			when calling mysql_bind_param()
     column		Column to fetch (first column is 0)
     ulong offset	Offset in result data (to fetch blob in pieces)
@@ -3492,8 +3492,8 @@ my_bool STDCALL mysql_autocommit(MYSQL * mysql, my_bool auto_mode)
 *********************************************************************/
 
 /*
-  Returns if there are any more query results exists to be read using 
-  mysql_next_result()
+  Returns true/false to indicate whether any more query results exist
+  to be read using mysql_next_result()
 */
 
 my_bool STDCALL mysql_more_results(MYSQL *mysql)