MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:kent Date:April 10 2006 10:17pm
Subject:bk commit into 5.1 tree (kent:1.2314)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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.2314 06/04/11 00:17:06 kent@stripped +1 -0
  mysql_upgrade.c:
    No declarations after first expression in block

  client/mysql_upgrade.c
    1.3 06/04/11 00:11:37 kent@stripped +3 -3
    No declarations after first expression in block

# 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:	kent
# Host:	c-534072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-new

--- 1.2/client/mysql_upgrade.c	2006-04-10 16:54:44 +02:00
+++ 1.3/client/mysql_upgrade.c	2006-04-11 00:11:37 +02:00
@@ -144,7 +144,7 @@
 static int create_defaults_file(const char *path, const char *our_defaults_path)
 {
   uint b_read;
-  File our_defaults_file;
+  File our_defaults_file, defaults_file;
   char buffer[512];
   char *buffer_end;
   int error;
@@ -153,8 +153,8 @@
   if (!opt_password)
     return 0;
 
-  File defaults_file= my_open(path, O_BINARY | O_CREAT | O_WRONLY,
-                              MYF(MY_FAE | MY_WME));
+  defaults_file= my_open(path, O_BINARY | O_CREAT | O_WRONLY,
+                         MYF(MY_FAE | MY_WME));
 
   if (defaults_file < 0)
     return 1;
Thread
bk commit into 5.1 tree (kent:1.2314)kent11 Apr