Commit 5b1e452d authored by unknown's avatar unknown
Browse files

Merge mysql.com:/M51/tmp-5.1 into mysql.com:/M51/clone-5.1 


sql/mysqld.cc:
  Auto merged
parents 1111a529 17c70d0e

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -5111,7 +5111,7 @@ Disable with --skip-ndbcluster (will save memory).", 
   (gptr*) &global_system_variables.ndb_autoincrement_prefetch_sz,

   (gptr*) &global_system_variables.ndb_autoincrement_prefetch_sz,

   0, GET_ULONG, REQUIRED_ARG, 32, 1, 256, 0, 0, 0},

  {"ndb-distibution", OPT_NDB_DISTRIBUTION,

  {"ndb-distribution", OPT_NDB_DISTRIBUTION,

   "Default distribution for new tables in ndb",

   (gptr*) &opt_ndb_distribution,

   (gptr*) &opt_ndb_distribution,