diff options
| author | unknown <tulin@dl145b.mysql.com> | 2005-07-20 07:53:10 +0200 |
|---|---|---|
| committer | unknown <tulin@dl145b.mysql.com> | 2005-07-20 07:53:10 +0200 |
| commit | 49e1bba3465a7af49b73225bf2d17e2ba5333e91 (patch) | |
| tree | 7f7a1503ba15f11a67dc0148085dd7ceb97e727d /extra/perror.c | |
| parent | ee7e3e710fb08ccb7c3ce701605fdb8e3cfba59d (diff) | |
| parent | f03607ea9e72f726ce11b60826bbf30ebabc2806 (diff) | |
| download | mariadb-git-49e1bba3465a7af49b73225bf2d17e2ba5333e91.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
extra/perror.c:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
BitKeeper/deleted/.del-var~62c955ccf2da1a21:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/field.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.hpp:
Auto merged
storage/ndb/src/mgmsrv/main.cpp:
Auto merged
Diffstat (limited to 'extra/perror.c')
| -rw-r--r-- | extra/perror.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/perror.c b/extra/perror.c index 283c3b0c107..551dc3096d4 100644 --- a/extra/perror.c +++ b/extra/perror.c @@ -41,7 +41,7 @@ static struct my_option my_long_options[] = {"info", 'I', "Synonym for --help.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, #ifdef HAVE_NDBCLUSTER_DB - {"ndb", 0, "Ndbcluster storage engine specific error codes.", (gptr*) &ndb_code, + {"ndb", 257, "Ndbcluster storage engine specific error codes.", (gptr*) &ndb_code, (gptr*) &ndb_code, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, #endif #ifdef HAVE_SYS_ERRLIST |