WL# 1729 Handler: error text for NDB errors

- Close an open scan if index_read is called without closing the previous one.
- Removed some errors that occured during previous merge


include/mysqld_error.h:
  Added two new error messages for NDB
sql/ha_ndbcluster.cc:
  Added more error code mappings, from NDB code to MySQL 
  Added function to print out the error message when an NDB error occurs.
  Added two new error codes, which will represent either a permanent or temporary NDB error.
  Modev get_ndb_lock_type from class to local function
  Removed some merge errors
  New function close_scan, to close an open scan.
sql/ha_ndbcluster.h:
  Added print_error function, overrides handler::print_error
  Added close_scan
  Moved get_ndb_lock_type from class to local function
sql/share/czech/errmsg.txt:
  Added two new error messages for NDB
sql/share/danish/errmsg.txt:
  Added two new error messages for NDB
sql/share/dutch/errmsg.txt:
  Added two new error messages for NDB
sql/share/english/errmsg.txt:
  Added two new error messages for NDB
sql/share/estonian/errmsg.txt:
  Added two new error messages for NDB
sql/share/french/errmsg.txt:
  Added two new error messages for NDB
sql/share/german/errmsg.txt:
  Added two new error messages for NDB
sql/share/greek/errmsg.txt:
  Added two new error messages for NDB
sql/share/hungarian/errmsg.txt:
  Added two new error messages for NDB
sql/share/italian/errmsg.txt:
  Added two new error messages for NDB
sql/share/japanese/errmsg.txt:
  Added two new error messages for NDB
sql/share/korean/errmsg.txt:
  Added two new error messages for NDB
sql/share/norwegian-ny/errmsg.txt:
  Added two new error messages for NDB
sql/share/norwegian/errmsg.txt:
  Added two new error messages for NDB
sql/share/polish/errmsg.txt:
  Added two new error messages for NDB
sql/share/portuguese/errmsg.txt:
  Added two new error messages for NDB
sql/share/romanian/errmsg.txt:
  Added two new error messages for NDB
sql/share/russian/errmsg.txt:
  Added two new error messages for NDB
sql/share/serbian/errmsg.txt:
  Added two new error messages for NDB
sql/share/slovak/errmsg.txt:
  Added two new error messages for NDB
sql/share/spanish/errmsg.txt:
  Added two new error messages for NDB
sql/share/swedish/errmsg.txt:
  Added two new error messages for NDB
sql/share/ukrainian/errmsg.txt:
  Added two new error messages for NDB

25 files changed, 116 insertions, 61 deletions

diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 2c474c161d5..5ef47e084c1 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -41,6 +41,7 @@
 static const int parallelism= 240;
 
 #define NDB_HIDDEN_PRIMARY_KEY_LENGTH 8
+#define NDB_ERR_CODE_OFFSET 30000
 
 #define ERR_PRINT(err) \
   DBUG_PRINT("error", ("Error: %d  message: %s", err.code, err.message))
@@ -63,6 +64,8 @@ bool ndbcluster_inited= false;
 static const char* unique_suffix= "$unique";
 #endif
 
+static Ndb* g_ndb= NULL;
+
 // Handler synchronization
 pthread_mutex_t ndbcluster_mutex;
 
@@ -96,6 +99,20 @@ static const err_code_mapping err_map[]=
   { 721, HA_ERR_TABLE_EXIST },
   { 4244, HA_ERR_TABLE_EXIST },
   { 241, HA_ERR_OLD_METADATA },
+
+  { 266, HA_ERR_LOCK_WAIT_TIMEOUT },
+  { 274, HA_ERR_LOCK_WAIT_TIMEOUT },
+  { 296, HA_ERR_LOCK_WAIT_TIMEOUT },
+  { 297, HA_ERR_LOCK_WAIT_TIMEOUT },
+  { 237, HA_ERR_LOCK_WAIT_TIMEOUT },
+
+  { 623, HA_ERR_RECORD_FILE_FULL },
+  { 624, HA_ERR_RECORD_FILE_FULL },
+  { 625, HA_ERR_RECORD_FILE_FULL },
+  { 826, HA_ERR_RECORD_FILE_FULL },
+  { 827, HA_ERR_RECORD_FILE_FULL },
+  { 832, HA_ERR_RECORD_FILE_FULL },
+
   { -1, -1 }
 };
 
@@ -106,7 +123,7 @@ static int ndb_to_mysql_error(const NdbError *err)
   for (i=0 ; err_map[i].ndb_err != err->code ; i++)
   {
     if (err_map[i].my_err == -1)
-      return err->code;
+      return err->code+NDB_ERR_CODE_OFFSET;
   }
   return err_map[i].my_err;
 }
@@ -144,6 +161,31 @@ int ha_ndbcluster::ndb_err(NdbConnection *trans)
 
 
 /*
+  Override the default print_error in order to add the 
+  error message of NDB 
+ */
+
+void ha_ndbcluster::print_error(int error, myf errflag)
+{
+  DBUG_ENTER("ha_ndbcluster::print_error");
+  DBUG_PRINT("enter", ("error: %d, errflag: %d", error, errflag));
+
+  if (error >= NDB_ERR_CODE_OFFSET)
+  {
+    error-= NDB_ERR_CODE_OFFSET;
+    const NdbError err= g_ndb->getNdbError(error);
+    int textno= (err.status==NdbError::TemporaryError) ?
+      ER_NDB_TEMPORARY_ERROR : ER_NDB_ERROR;
+    my_error(textno,MYF(0),error,err.message);
+    DBUG_VOID_RETURN;
+  }
+    
+  handler::print_error(error, errflag);
+  DBUG_VOID_RETURN;
+}
+
+
+/*
   Instruct NDB to set the value of the hidden primary key
 */
 
@@ -418,11 +460,10 @@ void ha_ndbcluster::release_metadata()
   DBUG_VOID_RETURN;
 }
 
-
-inline int ha_ndbcluster::get_ndb_lock_type()
+NdbCursorOperation::LockMode get_ndb_lock_type(enum thr_lock_type type)
 {
-  return (int)((m_lock.type == TL_WRITE_ALLOW_WRITE) ? 
-	       NdbCursorOperation::LM_Exclusive : NdbCursorOperation::LM_Read);
+  return (type == TL_WRITE_ALLOW_WRITE) ? 
+    NdbCursorOperation::LM_Exclusive : NdbCursorOperation::LM_Read;
 }
 
 static const ulong index_type_flags[]=
@@ -804,9 +845,7 @@ int ha_ndbcluster::ordered_index_scan(const key_range *start_key,
   index_name= get_index_name(active_index);
   if (!(op= trans->getNdbScanOperation(index_name, m_tabname)))
     ERR_RETURN(trans->getNdbError());
-  if (!(cursor= 
-	op->readTuples(parallelism, 
-		       (NdbCursorOperation::LockMode)get_ndb_lock_type())))
+  if (!(cursor= op->readTuples(parallelism, get_ndb_lock_type(m_lock.type))))
     ERR_RETURN(trans->getNdbError());
   m_active_cursor= cursor;
 
@@ -822,47 +861,15 @@ int ha_ndbcluster::ordered_index_scan(const key_range *start_key,
   if (end_key)
   {
     if (start_key && start_key->flag == HA_READ_KEY_EXACT)
+    {
       DBUG_PRINT("info", ("start_key is HA_READ_KEY_EXACT ignoring end_key"));
+    }
     else if (set_bounds(op, end_key, 
 			(end_key->flag == HA_READ_AFTER_KEY) ? 
 			NdbOperation::BoundGE : 
 			NdbOperation::BoundGT))
       DBUG_RETURN(1);    
   }
-  // Define attributes to read
-  for (i= 0; i < no_fields; i++) 
-  {
-    Field *field= table->field[i];
-    if ((thd->query_id == field->query_id) ||
-	(field->flags & PRI_KEY_FLAG) || 
-	retrieve_all_fields)
-    {      
-      if (get_ndb_value(op, i, field->ptr))
-	ERR_RETURN(op->getNdbError());
-    } 
-    else 
-    {
-      m_value[i]= NULL;
-    }
-  }
-    
-  if (table->primary_key == MAX_KEY) 
-  {
-    DBUG_PRINT("info", ("Getting hidden key"));
-    // Scanning table with no primary key
-    int hidden_no= no_fields;      
-#ifndef DBUG_OFF
-    const NDBTAB *tab= (NDBTAB *) m_table;    
-    if (!tab->getColumn(hidden_no))
-      DBUG_RETURN(1);
-#endif
-    if (get_ndb_value(op, hidden_no, NULL))
-      ERR_RETURN(op->getNdbError());
-  }
-
-  if (trans->execute(NoCommit) != 0)
-    DBUG_RETURN(ndb_err(trans));
-  DBUG_PRINT("exit", ("Scan started successfully"));
   DBUG_RETURN(define_read_attrs(buf, op));
 } 
 
@@ -898,9 +905,7 @@ int ha_ndbcluster::filtered_scan(const byte *key, uint key_len,
 
   if (!(op= trans->getNdbScanOperation(m_tabname)))
     ERR_RETURN(trans->getNdbError());
-  if (!(cursor= 
-	op->readTuples(parallelism, 
-		       (NdbCursorOperation::LockMode)get_ndb_lock_type())))
+  if (!(cursor= op->readTuples(parallelism, get_ndb_lock_type(m_lock.type))))
     ERR_RETURN(trans->getNdbError());
   m_active_cursor= cursor;
 
@@ -969,9 +974,7 @@ int ha_ndbcluster::full_table_scan(byte *buf)
 
   if (!(op=trans->getNdbScanOperation(m_tabname)))
     ERR_RETURN(trans->getNdbError());  
-  if (!(cursor= 
-	op->readTuples(parallelism, 
-		       (NdbCursorOperation::LockMode)get_ndb_lock_type())))
+  if (!(cursor= op->readTuples(parallelism, get_ndb_lock_type(m_lock.type))))
     ERR_RETURN(trans->getNdbError());
   m_active_cursor= cursor;
   DBUG_RETURN(define_read_attrs(buf, op));
@@ -1475,7 +1478,7 @@ int ha_ndbcluster::index_init(uint index)
 int ha_ndbcluster::index_end()
 {
   DBUG_ENTER("index_end");
-  DBUG_RETURN(rnd_end());
+  DBUG_RETURN(close_scan());
 }
 
 
@@ -1491,6 +1494,9 @@ int ha_ndbcluster::index_read(byte *buf,
   int error= 1;
   statistic_increment(ha_read_key_count, &LOCK_status);
 
+  if (m_active_cursor)
+    close_scan();
+    
   switch (get_index_type(active_index)){    
   case PRIMARY_KEY_INDEX:
 #ifdef USE_EXTRA_ORDERED_INDEX
@@ -1644,19 +1650,23 @@ int ha_ndbcluster::rnd_init(bool scan)
   DBUG_RETURN(0);
 }
 
+int ha_ndbcluster::close_scan()
+{
+  NdbResultSet *cursor= m_active_cursor;
+  DBUG_ENTER("close_scan");
+
+  if (!cursor)
+    DBUG_RETURN(1);
+
+  cursor->close();
+  m_active_cursor= NULL;
+  DBUG_RETURN(0)
+}
 
 int ha_ndbcluster::rnd_end()
 {
-  NdbResultSet *cursor= m_active_cursor;
   DBUG_ENTER("rnd_end");
-    
-  if (cursor)
-  {
-    DBUG_PRINT("info", ("Closing the cursor"));
-    cursor->close();
-    m_active_cursor= NULL;
-  }
-  DBUG_RETURN(0);
+  DBUG_RETURN(close_scan());
 }
 
 
@@ -2870,7 +2880,6 @@ int ndbcluster_discover(const char *dbname, const char *name,
   DBUG_RETURN(0);
 }
 
-static Ndb* g_ndb= NULL;
 
 #ifdef USE_DISCOVER_ON_STARTUP
 /*
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
index 35b62689924..677064a73dc 100644
--- a/sql/ha_ndbcluster.h
+++ b/sql/ha_ndbcluster.h
@@ -81,7 +81,7 @@ class ha_ndbcluster: public handler
 		       bool sorted);
   int read_range_next(bool eq_range);
 
-
+  void print_error(int error, myf errflag);
   void info(uint);
   int extra(enum ha_extra_function operation);
   int extra_opt(enum ha_extra_function operation, ulong cache_size);
@@ -152,7 +152,6 @@ class ha_ndbcluster: public handler
   const char* get_unique_index_name(uint idx_no) const;
   NDB_INDEX_TYPE get_index_type(uint idx_no) const;
   NDB_INDEX_TYPE get_index_type_from_table(uint index_no) const;
-  int get_ndb_lock_type();
   
   int pk_read(const byte *key, uint key_len, 
 	      byte *buf);
@@ -167,6 +166,7 @@ class ha_ndbcluster: public handler
   int filtered_scan(const byte *key, uint key_len, 
 		    byte *buf,
 		    enum ha_rkey_function find_flag);
+  int close_scan();
   void unpack_record(byte *buf);
 
   void set_dbname(const char *pathname);
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index f3a0c5e0eec..01beba7e6de 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -308,3 +308,5 @@ character-set=latin2
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
 "Invalid ON UPDATE clause for '%-.64s' field",
 "This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index 195e48faf82..212bfefa4bb 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -302,3 +302,5 @@ character-set=latin1
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
 "Invalid ON UPDATE clause for '%-.64s' field",
 "This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 9d9dfb14a89..ab9e52fe689 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -310,3 +310,5 @@ character-set=latin1
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
 "Invalid ON UPDATE clause for '%-.64s' field",
 "This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 14a854fbafb..e8eab1e2a8e 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -299,3 +299,5 @@ character-set=latin1
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
 "Invalid ON UPDATE clause for '%-.64s' field",
 "This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index 5d0f34fd4b2..207a774c1b5 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -304,3 +304,5 @@ character-set=latin7
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
 "Invalid ON UPDATE clause for '%-.64s' field",
 "This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index adc9f66e96b..f73687a960d 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -299,3 +299,5 @@ character-set=latin1
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
 "Invalid ON UPDATE clause for '%-.64s' field",
 "This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 0b732ba48f8..962e42367fc 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -311,3 +311,5 @@ character-set=latin1
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
 "Invalid ON UPDATE clause for '%-.64s' field",
 "This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index f96c10b0e65..943db97e355 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -299,3 +299,5 @@ character-set=greek
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
 "Invalid ON UPDATE clause for '%-.64s' field",
 "This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index a26790a4ef9..23b000edecd 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -301,3 +301,5 @@ character-set=latin2
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
 "Invalid ON UPDATE clause for '%-.64s' field",
 "This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 7c519e4e4bf..f00d3fa102c 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -299,3 +299,5 @@ character-set=latin1
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
 "Invalid ON UPDATE clause for '%-.64s' field",
 "This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index f973f84d2a4..7969c3b35b8 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -301,3 +301,5 @@ character-set=ujis
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
 "Invalid ON UPDATE clause for '%-.64s' field",
 "This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 8b5d318ab19..ea83dc3870c 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -299,3 +299,5 @@ character-set=euckr
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
 "Invalid ON UPDATE clause for '%-.64s' field",
 "This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index c0a7d736e1f..6ea3b6453a6 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -301,3 +301,5 @@ character-set=latin1
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
 "Invalid ON UPDATE clause for '%-.64s' field",
 "This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index fc9b5d2f6da..2b79fdb223a 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -301,3 +301,5 @@ character-set=latin1
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
 "Invalid ON UPDATE clause for '%-.64s' field",
 "This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 36b7d67d134..79805a71917 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -303,3 +303,5 @@ character-set=latin2
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
 "Invalid ON UPDATE clause for '%-.64s' field",
 "This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index d4ffa2d5ef5..9daaf5e7c4d 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -300,3 +300,5 @@ character-set=latin1
 "Incorreta definição de tabela; Pode ter somente uma coluna TIMESTAMP com CURRENT_TIMESTAMP em DEFAULT ou ON UPDATE cláusula"
 "Inválida cláusula ON UPDATE para campo '%-.64s'",
 "This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 4918a6e1a10..5e917c08181 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -303,3 +303,5 @@ character-set=latin2
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
 "Invalid ON UPDATE clause for '%-.64s' field",
 "This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index dbc93306a38..d2b3b996331 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -301,3 +301,5 @@ character-set=koi8r
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
 "Invalid ON UPDATE clause for '%-.64s' field",
 "This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index df157566aea..6dee9bb8705 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -293,3 +293,5 @@ character-set=cp1250
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
 "Invalid ON UPDATE clause for '%-.64s' field",
 "This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 80d21f8e31f..72c9b4b4cf2 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -307,3 +307,5 @@ character-set=latin2
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
 "Invalid ON UPDATE clause for '%-.64s' field",
 "This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 512f06c8c50..dded345828a 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -301,3 +301,5 @@ character-set=latin1
 "Incorrecta definición de tabla; Solamente debe haber una columna TIMESTAMP con CURRENT_TIMESTAMP en DEFAULT o ON UPDATE cláusula"
 "Inválido ON UPDATE cláusula para campo '%-.64s'",
 "This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 22e7cb786b5..ee9f97a4369 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -299,3 +299,5 @@ character-set=latin1
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
 "Invalid ON UPDATE clause for '%-.64s' field",
 "This command is not supported in the prepared statement protocol yet",
+"Fick NDB felkod %d '%-.100s'",
+"Fick tilfällig NDB felkod %d '%-.100s'",
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index 3149d58b413..b5e7f646112 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -304,3 +304,5 @@ character-set=koi8u
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
 "Invalid ON UPDATE clause for '%-.64s' field",
 "This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",