bk commit into 5.0 tree (kostja:1.2256)

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja 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-08-31 12:34:06+04:00, kostja@stripped +15 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  bodhi.local:/opt/local/work/mysql-5.0-14897
  MERGE: 1.2254.1.1

  configure.in@stripped, 2006-08-31 12:33:57+04:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.396.1.1

  include/mysql_com.h@stripped, 2006-08-31 12:33:57+04:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.104.1.1

  mysql-test/r/grant.result@stripped, 2006-08-31 12:33:57+04:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.57.1.1

  mysql-test/r/sp.result@stripped, 2006-08-31 12:33:57+04:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.206.1.1

  mysql-test/r/trigger.result@stripped, 2006-08-31 12:33:57+04:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.43.1.1

  mysql-test/r/view.result@stripped, 2006-08-31 12:33:57+04:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.171.1.1

  mysql-test/t/grant.test@stripped, 2006-08-31 12:33:57+04:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.45.1.1

  mysql-test/t/sp.test@stripped, 2006-08-31 12:33:57+04:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.194.1.1

  mysql-test/t/trigger.test@stripped, 2006-08-31 12:33:57+04:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.49.1.1

  mysql-test/t/view.test@stripped, 2006-08-31 12:33:58+04:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.158.1.1

  sql/mysql_priv.h@stripped, 2006-08-31 12:33:58+04:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.406.1.1

  sql/share/errmsg.txt@stripped, 2006-08-31 12:34:00+04:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.68.1.1

  sql/sql_acl.cc@stripped, 2006-08-31 12:33:58+04:00, kostja@stripped +0 -33
    Auto merged
    MERGE: 1.204.1.1

  sql/sql_parse.cc@stripped, 2006-08-31 12:33:58+04:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.563.1.2

  sql/sql_yacc.yy@stripped, 2006-08-31 12:34:00+04:00, kostja@stripped +0 -8
    Auto merged
    MERGE: 1.480.1.1

# 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:	kostja
# Host:	bodhi.local
# Root:	/opt/local/work/mysql-5.0-14897/RESYNC

--- 1.105/include/mysql_com.h	2006-08-31 12:34:15 +04:00
+++ 1.106/include/mysql_com.h	2006-08-31 12:34:15 +04:00
@@ -134,8 +134,10 @@ enum enum_server_command
 #define CLIENT_TRANSACTIONS	8192	/* Client knows about transactions */
 #define CLIENT_RESERVED         16384   /* Old flag for 4.1 protocol  */
 #define CLIENT_SECURE_CONNECTION 32768  /* New 4.1 authentication */
-#define CLIENT_MULTI_STATEMENTS 65536   /* Enable/disable multi-stmt support */
-#define CLIENT_MULTI_RESULTS    131072  /* Enable/disable multi-results */
+#define CLIENT_MULTI_STATEMENTS (((ulong) 1) << 16)   /* Enable/disable multi-stmt support */
+#define CLIENT_MULTI_RESULTS    (((ulong) 1) << 17)  /* Enable/disable multi-results */
+
+#define CLIENT_SSL_VERIFY_SERVER_CERT	(((ulong) 1) << 30)
 #define CLIENT_REMEMBER_OPTIONS	(((ulong) 1) << 31)
 
 #define SERVER_STATUS_IN_TRANS     1	/* Transaction has started */