bk commit into 5.0 tree (kent:1.1944)

[kent]

Below is the list of changes that have just been committed into a local
5.0 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.1944 05/09/13 10:15:48 kent@stripped +1 -0
  sql_prepare.cc:
    VC6 can't handle initializing const in declaration

  sql/sql_prepare.cc
    1.152 05/09/13 10:15:33 kent@stripped +9 -0
    VC6 can't handle initializing const in declaration

# 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-724072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.0

--- 1.151/sql/sql_prepare.cc	2005-09-03 01:13:10 +02:00
+++ 1.152/sql/sql_prepare.cc	2005-09-13 10:15:33 +02:00
@@ -118,8 +118,17 @@
   bool deallocate();
 
   /* Possible values of flags */
+#if defined(_MSC_VER) && _MSC_VER < 1300
+  static const int IS_IN_USE;
+#else
   static const int IS_IN_USE= 1;
+#endif
 };
+
+/* VC6 can't handle initializing in declaration */
+#if defined(_MSC_VER) && _MSC_VER < 1300
+const int Prepared_statement::IS_IN_USE= 1;
+#endif
 
 /******************************************************************************
   Implementation