Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


sql/item_timefunc.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

2 files changed, 6 insertions, 3 deletions

diff --git a/client/mysql.cc b/client/mysql.cc
index 6744600aadb..76ed82508be 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -3083,7 +3083,10 @@ com_connect(String *buffer, char *line)
       Two null bytes are needed in the end of buff to allow
       get_arg to find end of string the second time it's called.
     */
-    strmake(buff, line, sizeof(buff)-2);
+    tmp= strmake(buff, line, sizeof(buff)-2);
+#ifdef EXTRA_DEBUG
+    tmp[1]= 0;
+#endif
     tmp= get_arg(buff, 0);
     if (tmp && *tmp)
     {
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 15bf7d792fb..88575c26bc6 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -3592,7 +3592,7 @@ void do_get_file_name(struct st_command *command,
   if (*p)
     *p++= 0;
   command->last_argument= p;
-  strmake(dest, name, dest_max_len);
+  strmake(dest, name, dest_max_len - 1);
 }
 
 
@@ -6908,7 +6908,7 @@ int main(int argc, char **argv)
 
 	if (save_file[0])
 	{
-	  strmake(command->require_file, save_file, sizeof(save_file));
+	  strmake(command->require_file, save_file, sizeof(save_file) - 1);
 	  save_file[0]= 0;
 	}
 	run_query(cur_con, command, flags);