Commit fa942cf8 authored by tnurnberg@sin.intern.azundris.com's avatar tnurnberg@sin.intern.azundris.com
Browse files

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 

into  sin.intern.azundris.com:/home/tnurnberg/30821/50-30821
parents 97927cfe 5c21619b

sql/mysqld.cc

+2 −0
Original line number Diff line number Diff line
@@ -7172,6 +7172,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
      have_merge_db= SHOW_OPTION_YES;

    else

      have_merge_db= SHOW_OPTION_DISABLED;

    break;

#ifdef HAVE_BERKELEY_DB

  case OPT_BDB_NOSYNC:

    /* Deprecated option */
@@ -7311,6 +7312,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
      fprintf(stderr, "Unknown option to tc-heuristic-recover: %s\n",argument);

      exit(1);

    }

    break;

  }

  case OPT_MYISAM_STATS_METHOD:

  {