bk commit into 5.1 tree (cmiller:1.2189)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller 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.2189 06/06/13 16:06:35 cmiller@zippy.(none) +7 -0
  Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
  into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new

  sql/table.cc
    1.220 06/06/13 16:06:29 cmiller@zippy.(none) +0 -8
    Null-merged, as this doesn't apply after 5.1.4 .  -cm

  mysql-test/t/create.test
    1.81 06/06/13 15:58:39 cmiller@zippy.(none) +0 -0
    Auto merged

  mysql-test/r/create.result
    1.120 06/06/13 15:58:39 cmiller@zippy.(none) +0 -0
    Auto merged

  include/my_global.h
    1.135 06/06/13 15:58:38 cmiller@zippy.(none) +0 -0
    Auto merged

  include/config-win.h
    1.91 06/06/13 15:58:38 cmiller@zippy.(none) +0 -0
    Auto merged

  client/mysql.cc
    1.214 06/06/13 15:58:38 cmiller@zippy.(none) +0 -0
    Auto merged

  BitKeeper/etc/ignore
    1.245 06/06/13 15:58:27 cmiller@zippy.(none) +2 -11
    auto-union

# 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:	cmiller
# Host:	zippy.(none)
# Root:	/home/cmiller/work/mysql/merge/mysql-5.1-new/RESYNC

--- 1.213/client/mysql.cc	2006-05-19 18:08:48 -04:00
+++ 1.214/client/mysql.cc	2006-06-13 15:58:38 -04:00
@@ -852,6 +852,7 @@ get_one_option(int optid, const struct m
   case OPT_NOPAGER:
     printf("WARNING: option deprecated; use --disable-pager instead.\n");
     opt_nopager= 1;
+    break;
   case OPT_MYSQL_PROTOCOL:
   {
     if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)

--- 1.90/include/config-win.h	2006-05-24 13:42:56 -04:00
+++ 1.91/include/config-win.h	2006-06-13 15:58:38 -04:00
@@ -400,6 +400,7 @@ inline double ulonglong2double(ulonglong
 
 #define FN_LIBCHAR	'\\'
 #define FN_ROOTDIR	"\\"
+#define FN_DEVCHAR	':'
 #define FN_NETWORK_DRIVES	/* Uses \\ to indicate network drives */
 #define FN_NO_CASE_SENCE	/* Files are not case-sensitive */
 #define OS_FILE_LIMIT	2048

--- 1.134/include/my_global.h	2006-06-01 06:23:09 -04:00
+++ 1.135/include/my_global.h	2006-06-13 15:58:38 -04:00
@@ -681,7 +681,6 @@ typedef SOCKET_SIZE_TYPE size_socket;
 #define FN_HOMELIB	'~'	/* ~/ is used as abbrev for home dir */
 #define FN_CURLIB	'.'	/* ./ is used as abbrev for current dir */
 #define FN_PARENTDIR	".."	/* Parent directory; Must be a string */
-#define FN_DEVCHAR	':'
 
 #ifndef FN_LIBCHAR
 #define FN_LIBCHAR	'/'

--- 1.244/BitKeeper/etc/ignore	2006-06-04 11:56:20 -04:00
+++ 1.245/BitKeeper/etc/ignore	2006-06-13 15:58:27 -04:00
@@ -278,6 +278,7 @@ bkpush.log
 bkpush.log*
 build.log
 build_tags.sh
+client/#mysql.cc#
 client/*.ds?
 client/*.vcproj
 client/completion_hash.cpp
@@ -1181,7 +1182,9 @@ sql/pack.c
 sql/safe_to_cache_query.txt
 sql/share/*.sys
 sql/share/charsets/gmon.out
+sql/share/fixerrmsg.pl
 sql/share/gmon.out
+sql/share/iso639-2.txt
 sql/share/mysql
 sql/share/norwegian-ny/errmsg.sys
 sql/share/norwegian/errmsg.sys