bk commit into 5.0 tree (msvensson:1.1974)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.1974 05/11/04 12:15:49 msvensson@neptunus.(none) +1 -0
  Formatting improved

  client/mysqltest.c
    1.179 05/11/04 12:15:43 msvensson@neptunus.(none) +13 -17
    Remove unused function safe_str_append
    Fix formatting

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/wl2930/my50-wl2930

--- 1.178/client/mysqltest.c	2005-11-04 12:00:28 +01:00
+++ 1.179/client/mysqltest.c	2005-11-04 12:15:43 +01:00
@@ -2912,15 +2912,6 @@
   return 0;
 }
 
-char* safe_str_append(char *buf, const char *str, int size)
-{
-  int i,c ;
-  for (i = 0; (c = *str++) &&  i < size - 1; i++)
-    *buf++ = c;
-  *buf = 0;
-  return buf;
-}
-
 
 /*
    Write the content of str into file
@@ -2931,6 +2922,7 @@
    str - content to write to file
    size - size of content witten to file
 */
+
 static void str_to_file(const char *fname, char *str, int size)
 {
   int fd;
@@ -2938,11 +2930,11 @@
   if (!test_if_hard_path(fname))
   {
     strxmov(buff, opt_basedir, fname, NullS);
-    fname=buff;
+    fname= buff;
   }
   fn_format(buff,fname,"","",4);
 
-  if ((fd = my_open(buff, O_WRONLY | O_CREAT | O_TRUNC,
+  if ((fd= my_open(buff, O_WRONLY | O_CREAT | O_TRUNC,
 		    MYF(MY_WME | MY_FFNF))) < 0)
     die("Could not open %s: errno = %d", buff, errno);
   if (my_write(fd, (byte*)str, size, MYF(MY_WME|MY_FNABP)))
@@ -2950,6 +2942,7 @@
   my_close(fd, MYF(0));
 }
 
+
 void dump_result_to_reject_file(const char *record_file, char *buf, int size)
 {
   char reject_file[FN_REFLEN];
@@ -2972,6 +2965,7 @@
   dynstr_append_mem(ds, val, len);
 }
 
+
 /* Append zero-terminated string to ds, with optional replace */
 
 static void replace_dynstr_append(DYNAMIC_STRING *ds, const char *val)
@@ -3036,8 +3030,8 @@
   with '\t'. Values may be converted with 'replace_column'
 */
 
-static void append_stmt_result(DYNAMIC_STRING *ds, MYSQL_STMT* stmt,
-			       MYSQL_FIELD* field, uint num_fields)
+static void append_stmt_result(DYNAMIC_STRING *ds, MYSQL_STMT *stmt,
+			       MYSQL_FIELD *field, uint num_fields)
 {
   MYSQL_BIND *bind;
   my_bool *is_null;
@@ -3198,12 +3192,13 @@
   }
 }
 
+
 /*
   Append affected row count and other info to output
 */
 
-static void append_info(DYNAMIC_STRING* ds, ulong affected_rows,
-			const char* info)
+static void append_info(DYNAMIC_STRING *ds, ulong affected_rows,
+			const char *info)
 {
   char buf[40];
   sprintf(buf,"affected rows: %lu\n", affected_rows);
@@ -3220,8 +3215,9 @@
 /*
    Display the table headings with the names tab separated
 */
-static void append_table_headings(DYNAMIC_STRING* ds,
-				  MYSQL_FIELD* field,
+
+static void append_table_headings(DYNAMIC_STRING *ds,
+				  MYSQL_FIELD *field,
 				  uint num_fields)
 {
   uint col_idx;