diff options
| author | unknown <lzhou/root@dev3-138.dev.cn.tlan> | 2006-08-15 19:32:35 +0000 |
|---|---|---|
| committer | unknown <lzhou/root@dev3-138.dev.cn.tlan> | 2006-08-15 19:32:35 +0000 |
| commit | 1b0a7c4dc122f7f99726490bd46541080291b0cc (patch) | |
| tree | 0f2876a7f0df9f6ded43dadb30a4ec8283fc2418 /storage/ndb/src/ndbapi/ndberror.c | |
| parent | bea213ff81a1dd129e7f28e9532a69dcddca278e (diff) | |
| parent | 3d3641a86ab38ca50556123e68b5ad0c933f78e1 (diff) | |
| download | mariadb-git-1b0a7c4dc122f7f99726490bd46541080291b0cc.tar.gz | |
Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21052
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21052
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Manual 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 d0d26c19cfa..e6f27328cc5 100644 --- a/storage/ndb/src/ndbapi/ndberror.c +++ b/storage/ndb/src/ndbapi/ndberror.c @@ -439,7 +439,7 @@ ErrorBundle ErrorCodes[] = { { 1305, DMEC, IE, "Backup definition not implemented" }, { 1306, DMEC, AE, "Backup not supported in diskless mode (change Diskless)" }, - { 1321, DMEC, IE, "Backup aborted by application" }, + { 1321, DMEC, UD, "Backup aborted by user request" }, { 1322, DMEC, IE, "Backup already completed" }, { 1323, DMEC, IE, "1323" }, { 1324, DMEC, IE, "Backup log buffer full" }, |