bk commit into 4.1 tree (tomas:1.2126)

[tomas]

Below is the list of changes that have just been committed into a local
4.1 repository of tomas. When tomas 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2126 04/12/21 18:33:41 tomas@stripped +1 -0
  main.cpp:
    ifdef on version prior to 5.0

  ndb/src/mgmsrv/main.cpp
    1.34 04/12/21 18:32:46 tomas@stripped +2 -0
    ifdef on version prior to 5.0

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-4.1

--- 1.33/ndb/src/mgmsrv/main.cpp	2004-12-20 12:36:03 +01:00
+++ 1.34/ndb/src/mgmsrv/main.cpp	2004-12-21 18:32:46 +01:00
@@ -161,9 +161,11 @@
   case 'V':
     print_version();
     exit(0);
+#if NDB_VERSION_MAJOR <= 4
   case 'c':
     printf("Warning: -c will be removed in 5.0, use -f instead\n");
     break;
+#endif
   case OPT_NDB_SHM:
 #ifndef NDB_SHM_TRANSPORTER
     printf("Warning: binary not compiled with shared memory support,\n"