diff options
| author | unknown <gni/root@ts3-168.ts.cn.tlan> | 2006-12-01 11:35:05 +0800 |
|---|---|---|
| committer | unknown <gni/root@ts3-168.ts.cn.tlan> | 2006-12-01 11:35:05 +0800 |
| commit | 02818a0020dd02e2a90a3fa8672693cad26897a6 (patch) | |
| tree | 2d210d7ba7c5b7b685586322a29bac3a241fb78e /sql/sql_repl.cc | |
| parent | bae9fc077ca178a63f7d97e4b161c35a3e63b85d (diff) | |
| parent | eab917dba64eada12cb4001aca7720da31201b08 (diff) | |
| download | mariadb-git-02818a0020dd02e2a90a3fa8672693cad26897a6.tar.gz | |
Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log.h:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/table.cc:
Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.cpp:
Auto merged
BitKeeper/deleted/.del-OSE_Receiver.cpp:
Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
storage/ndb/src/common/util/File.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
Auto merged
storage/ndb/tools/restore/restore_main.cpp:
Auto merged
sql/share/errmsg.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index d4f6288c298..92c8aca0e0c 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -239,6 +239,7 @@ bool purge_error_message(THD* thd, int res) case LOG_INFO_MEM: errmsg= ER_OUT_OF_RESOURCES; break; case LOG_INFO_FATAL: errmsg= ER_BINLOG_PURGE_FATAL_ERR; break; case LOG_INFO_IN_USE: errmsg= ER_LOG_IN_USE; break; + case LOG_INFO_EMFILE: errmsg= ER_BINLOG_PURGE_EMFILE; break; default: errmsg= ER_LOG_PURGE_UNKNOWN_ERR; break; } |