summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorserg@serg.mylan <>2006-06-15 12:21:34 +0200
committerserg@serg.mylan <>2006-06-15 12:21:34 +0200
commita06dda12fdc2dcb301ffb5169d49f8712ed990d2 (patch)
tree96dbc5428e82a7b7ba89ef282af2f5b7f29e2f1d
parent03a80df34533bdafd131e0b0cb9fef54e36b4ac1 (diff)
parent32c45f92099bae2980904eb4498ed351e9a5654d (diff)
downloadmariadb-git-a06dda12fdc2dcb301ffb5169d49f8712ed990d2.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into serg.mylan:/usr/home/serg/Abk/m51
-rw-r--r--sql/mysqld.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 851c3111a79..ad6f7401965 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -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,