diff options
author | unknown <gni/root@dev3-127.(none)> | 2006-08-29 11:04:51 +0800 |
---|---|---|
committer | unknown <gni/root@dev3-127.(none)> | 2006-08-29 11:04:51 +0800 |
commit | 52ac50b37bb71b3c900bdbcb5b51004f30325f71 (patch) | |
tree | 48297543cdc84831279258887f9e7e2f98c6500e /storage/ndb/src/ndbapi/ndberror.c | |
parent | fcee2eb36beb36015312e0964df146c25a9deaeb (diff) | |
parent | 42f74d76e9a9e146c2d6704d9a8d5205c79577f3 (diff) | |
download | mariadb-git-52ac50b37bb71b3c900bdbcb5b51004f30325f71.tar.gz |
Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-ndb-bj
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
Diffstat (limited to 'storage/ndb/src/ndbapi/ndberror.c')
-rw-r--r-- | storage/ndb/src/ndbapi/ndberror.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/ndb/src/ndbapi/ndberror.c b/storage/ndb/src/ndbapi/ndberror.c index e6f27328cc5..462f63d7ae1 100644 --- a/storage/ndb/src/ndbapi/ndberror.c +++ b/storage/ndb/src/ndbapi/ndberror.c @@ -376,7 +376,7 @@ ErrorBundle ErrorCodes[] = { { 752, DMEC, SE, "Invalid file format" }, { 753, IE, SE, "Invalid filegroup for file" }, { 754, IE, SE, "Invalid filegroup version when creating file" }, - { 755, DMEC, SE, "Invalid tablespace" }, + { 755, HA_WRONG_CREATE_OPTION, SE, "Invalid tablespace" }, { 756, DMEC, SE, "Index on disk column is not supported" }, { 757, DMEC, SE, "Varsize bitfield not supported" }, { 758, DMEC, SE, "Tablespace has changed" }, |