bzr commit into mysql-6.0 branch (hakan:2730)

[Hakan Kuecuekyilmaz]

#At file:///home/hakan/work/mysql/mysql-6.0-falcon-to-merge/

 2730 Hakan Kuecuekyilmaz	2008-07-03 [merge]
      Merge
modified:
  .bzr-mysql/default.conf
  client/mysqltest.c

=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2008-06-30 20:21:41 +0000
+++ b/.bzr-mysql/default.conf	2008-07-02 20:30:16 +0000
@@ -1,6 +1,5 @@
 [MYSQL]
-tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-falcon/
+tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0/
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-post_commit_url = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-falcon/
-tree_name = mysql-6.0-falcon
+tree_name = mysql-6.0

=== modified file 'client/mysqltest.c'
--- a/client/mysqltest.c	2008-06-26 18:21:15 +0000
+++ b/client/mysqltest.c	2008-07-01 13:14:22 +0000
@@ -2271,7 +2271,7 @@ void do_source(struct st_command *comman
   }
 
   dynstr_free(&ds_filename);
-  return;
+  DBUG_VOID_RETURN;
 }
 
 
@@ -6902,6 +6902,7 @@ static void init_signal_handling(void)
 #endif
   sigaction(SIGILL, &sa, NULL);
   sigaction(SIGFPE, &sa, NULL);
+  DBUG_VOID_RETURN;
 }
 
 #endif /* !__WIN__ */