bk commit into 5.0 tree (joerg:1.1914)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.0 repository of joerg. When joerg 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.1914 05/05/26 12:58:55 joerg@stripped +1 -0
  Correction of merge mishandling in 'client/client_priv.h'.

  client/client_priv.h
    1.37 05/05/26 12:58:50 joerg@stripped +1 -1
    Correction of merge mishandling.

# 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:	joerg
# Host:	trift2.
# Root:	/M50/merge-5.0

--- 1.36/client/client_priv.h	Thu May 26 12:51:40 2005
+++ 1.37/client/client_priv.h	Thu May 26 12:58:50 2005
@@ -49,5 +49,5 @@
 #ifdef HAVE_NDBCLUSTER_DB
   OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING,
 #endif
-  ,OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_DROP_DATABASE,OPT_DROP_DATABASE
+  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE
 };