List:Commits« Previous MessageNext Message »
From:<jpipes Date:December 7 2006 1:49pm
Subject:bk commit into 5.0 tree (jpipes:1.2342)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of jpipes. When jpipes 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@stripped, 2006-12-07 08:49:53-05:00, jpipes@shakedown.(none) +1 -0
  Merge shakedown.(none):/home/jpipes/dev/bug20246/my41-bug20246
  into  shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
  MERGE: 1.1616.2867.25

  include/mysql.h@stripped, 2006-12-07 08:49:50-05:00, jpipes@shakedown.(none) +0 -0
    Auto merged
    MERGE: 1.135.1.11

# 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:	jpipes
# Host:	shakedown.(none)
# Root:	/home/jpipes/dev/mysql-5.0-maint/RESYNC

--- 1.166/include/mysql.h	2006-12-07 08:49:59 -05:00
+++ 1.167/include/mysql.h	2006-12-07 08:49:59 -05:00
@@ -65,9 +65,9 @@ typedef int my_socket;
 #endif /* my_socket_defined */
 #endif /* _global_h */
 
+#include "mysql_version.h"
 #include "mysql_com.h"
 #include "mysql_time.h"
-#include "mysql_version.h"
 #include "typelib.h"
 
 #include "my_list.h" /* for LISTs used in 'MYSQL' and 'MYSQL_STMT' */
Thread
bk commit into 5.0 tree (jpipes:1.2342)jpipes7 Dec