Commit 09617144 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.1--main 

into  mysql.com:/home/mydev/mysql-5.1-amerge
parents 6bc99731 ed849efc

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ DOT_FRM_VERSION=6 
# See the libtool docs for information on how to do shared lib versions.

SHARED_LIB_MAJOR_VERSION=15

SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0

}



# Set all version vars based on $VERSION. How do we do this more elegant ?

# Remember that regexps needs to quote [ and ] since this is run through m4

MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"`

sql/mysqld.cc

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

   0, GET_ULONG, OPT_ARG, 20, 0, ~0L, 0, 0, 0},

#endif

  {"nb-use-copying-alter-table",

  {"ndb-use-copying-alter-table",

   OPT_NDB_USE_COPYING_ALTER_TABLE,

   "Force ndbcluster to always copy tables at alter table (should only be used if on-line alter table fails).",

   (gptr*) &global_system_variables.ndb_use_copying_alter_table,