diff options
27 files changed, 122 insertions, 78 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 2ccd8196d40..f341041fc75 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -312,6 +312,6 @@ #define ER_TOO_MUCH_AUTO_TIMESTAMP_COLS 1293 #define ER_INVALID_ON_UPDATE 1294 #define ER_UNSUPPORTED_PS 1295 -#define ER_NDB_ERROR 1296 -#define ER_NDB_TEMPORARY_ERROR 1297 -#define ER_ERROR_MESSAGES 296 +#define ER_GET_ERRMSG 1296 +#define ER_GET_TEMPORARY_ERRMSG 1297 +#define ER_ERROR_MESSAGES 298 diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 5ef47e084c1..903e04754de 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -41,6 +41,14 @@ static const int parallelism= 240; #define NDB_HIDDEN_PRIMARY_KEY_LENGTH 8 + +/* + All error messages returned from ha_ndbcluster that are + not mapped to the corresponding handler(HA_ERR_*) error code + have NDB_ERR_CODE_OFFSET added to it so that it does not clash with + the handler error codes. The error number is then "restored" + to the original error number when get_error_message is called. +*/ #define NDB_ERR_CODE_OFFSET 30000 #define ERR_PRINT(err) \ @@ -161,27 +169,28 @@ int ha_ndbcluster::ndb_err(NdbConnection *trans) /* - Override the default print_error in order to add the + Override the default get_error_message in order to add the error message of NDB */ -void ha_ndbcluster::print_error(int error, myf errflag) +const char* ha_ndbcluster::get_error_message(int *org_error, + bool *temporary) { - DBUG_ENTER("ha_ndbcluster::print_error"); - DBUG_PRINT("enter", ("error: %d, errflag: %d", error, errflag)); + DBUG_ENTER("ha_ndbcluster::get_error_message"); + DBUG_PRINT("enter", ("error: %d", *org_error)); - 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; + int error= *org_error; + if (error < NDB_ERR_CODE_OFFSET) + DBUG_RETURN(NULL); + + error-= NDB_ERR_CODE_OFFSET; + DBUG_ASSERT(m_ndb); // What should be done if not m_ndb is available? + const NdbError err= m_ndb->getNdbError(error); + *temporary= (err.status==NdbError::TemporaryError); + + *org_error= error; + DBUG_PRINT("exit", ("error: %d, msg: %s", error, err.message)); + DBUG_RETURN(err.message); } @@ -756,8 +765,8 @@ inline int ha_ndbcluster::next_result(byte *buf) } while (check == 2); table->status= STATUS_NOT_FOUND; - if (ndb_err(trans)) - ERR_RETURN(trans->getNdbError()); + if (check == -1) + DBUG_RETURN(ndb_err(trans)); // No more records DBUG_PRINT("info", ("No more records")); @@ -1499,28 +1508,26 @@ int ha_ndbcluster::index_read(byte *buf, switch (get_index_type(active_index)){ case PRIMARY_KEY_INDEX: -#ifdef USE_EXTRA_ORDERED_INDEX key_info= table->key_info + active_index; - if (key_len < key_info->key_length || - find_flag != HA_READ_KEY_EXACT) + if (key_len == key_info->key_length && + find_flag == HA_READ_KEY_EXACT) + error= pk_read(key, key_len, buf); + else { key_range start_key; start_key.key= key; start_key.length= key_len; start_key.flag= find_flag; - error= ordered_index_scan(&start_key, 0, false, buf); - break; - + error= ordered_index_scan(&start_key, 0, false, buf); } -#endif - error= pk_read(key, key_len, buf); break; case UNIQUE_INDEX: -#ifdef USE_EXTRA_ORDERED_INDEX key_info= table->key_info + active_index; - if (key_len < key_info->key_length || - find_flag != HA_READ_KEY_EXACT) + if (key_len == key_info->key_length && + find_flag == HA_READ_KEY_EXACT) + error= unique_index_read(key, key_len, buf); + else { key_range start_key; start_key.key= key; @@ -1529,8 +1536,6 @@ int ha_ndbcluster::index_read(byte *buf, error= ordered_index_scan(&start_key, 0, false, buf); break; } -#endif - error= unique_index_read(key, key_len, buf); break; case ORDERED_INDEX: @@ -3105,6 +3110,13 @@ ha_ndbcluster::records_in_range(int inx, I.e. the ordered index are used instead of the hash indexes for these queries. */ + NDB_INDEX_TYPE idx_type= get_index_type(inx); + if ((idx_type == UNIQUE_INDEX || idx_type == PRIMARY_KEY_INDEX) && + start_key_len == key_length) + { + // this is a "const" table which returns only one record! + records= 1; + } #endif DBUG_RETURN(records); } diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index 677064a73dc..459b0db14bb 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); + const char* get_error_message(int *error, bool *temporary); void info(uint); int extra(enum ha_extra_function operation); int extra_opt(enum ha_extra_function operation, ulong cache_size); diff --git a/sql/handler.cc b/sql/handler.cc index 7374242ebf8..615e2515824 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1120,7 +1120,20 @@ void handler::print_error(int error, myf errflag) break; default: { - my_error(ER_GET_ERRNO,errflag,error); + /* The error was "unknown" to this function. + Ask handler if it has got a message for this error */ + bool temporary= FALSE; + const char* msg= get_error_message(&error, &temporary); + if (msg) + { + const char* engine= ha_get_storage_engine(table->db_type); + if (temporary) + my_error(ER_GET_TEMPORARY_ERRMSG,error,msg,engine); + else + my_error(ER_GET_ERRMSG,error,msg,engine); + } + else + my_error(ER_GET_ERRNO,errflag,error); DBUG_VOID_RETURN; } } @@ -1129,6 +1142,22 @@ void handler::print_error(int error, myf errflag) } +/* + Return an error message specific to this handler + + SYNOPSIS + error [in/out] error code previously returned by handler + temporary [out] temporary error, transaction should be retried if true + + The returned pointer to error message should not be freed. + */ + +const char* handler::get_error_message(int *error, bool *temporary) +{ + return NULL; +} + + /* Return key if error because of duplicated keys */ uint handler::get_dup_key(int error) diff --git a/sql/handler.h b/sql/handler.h index 4f721a01412..ddf7d94c547 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -295,6 +295,7 @@ public: void update_timestamp(byte *record); void update_auto_increment(); virtual void print_error(int error, myf errflag); + virtual const char* get_error_message(int *error, bool *temporary); uint get_dup_key(int error); void change_table_ptr(TABLE *table_arg) { table=table_arg; } virtual double scan_time() diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt index 01beba7e6de..20a162a8080 100644 --- a/sql/share/czech/errmsg.txt +++ b/sql/share/czech/errmsg.txt @@ -310,3 +310,5 @@ character-set=latin2 "This command is not supported in the prepared statement protocol yet", "Got NDB error %d '%-.100s'", "Got temporary NDB error %d '%-.100s'", +"Got error %d '%-.100s' from %s", +"Got temporary error %d '%-.100s' from %s", diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt index 212bfefa4bb..4fe51036579 100644 --- a/sql/share/danish/errmsg.txt +++ b/sql/share/danish/errmsg.txt @@ -302,5 +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'", +"Modtog fejl %d '%-.100s' fra %s", +"Modtog temporary fejl %d '%-.100s' fra %s", diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt index ab9e52fe689..6b318256cd8 100644 --- a/sql/share/dutch/errmsg.txt +++ b/sql/share/dutch/errmsg.txt @@ -310,5 +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'", +"Got error %d '%-.100s' from %s", +"Got temporary error %d '%-.100s' from %s", diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index e8eab1e2a8e..61558f7fae5 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -299,5 +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'", +"Got error %d '%-.100s' from %s", +"Got temporary error %d '%-.100s' from %s", diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt index 207a774c1b5..28da38a3691 100644 --- a/sql/share/estonian/errmsg.txt +++ b/sql/share/estonian/errmsg.txt @@ -304,5 +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'", +"Got error %d '%-.100s' from %s", +"Got temporary error %d '%-.100s' from %s", diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt index f73687a960d..697cf5f7233 100644 --- a/sql/share/french/errmsg.txt +++ b/sql/share/french/errmsg.txt @@ -299,5 +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'", +"Got error %d '%-.100s' from %s", +"Got temporary error %d '%-.100s' from %s", diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt index 962e42367fc..3dc6aa34b5e 100644 --- a/sql/share/german/errmsg.txt +++ b/sql/share/german/errmsg.txt @@ -311,5 +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'", +"Got error %d '%-.100s' from %s", +"Got temporary error %d '%-.100s' from %s", diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt index 943db97e355..c5f122a2a49 100644 --- a/sql/share/greek/errmsg.txt +++ b/sql/share/greek/errmsg.txt @@ -299,5 +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'", +"Got error %d '%-.100s' from %s", +"Got temporary error %d '%-.100s' from %s", diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt index 23b000edecd..e83f4ca5ca3 100644 --- a/sql/share/hungarian/errmsg.txt +++ b/sql/share/hungarian/errmsg.txt @@ -301,5 +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'", +"Got error %d '%-.100s' from %s", +"Got temporary error %d '%-.100s' from %s", diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt index f00d3fa102c..294ff333e66 100644 --- a/sql/share/italian/errmsg.txt +++ b/sql/share/italian/errmsg.txt @@ -299,5 +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'", +"Got error %d '%-.100s' from %s", +"Got temporary error %d '%-.100s' from %s", diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt index ea83dc3870c..132d4f121b2 100644 --- a/sql/share/korean/errmsg.txt +++ b/sql/share/korean/errmsg.txt @@ -299,5 +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'", +"Got error %d '%-.100s' from %s", +"Got temporary error %d '%-.100s' from %s", diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt index 6ea3b6453a6..0416c4be926 100644 --- a/sql/share/norwegian-ny/errmsg.txt +++ b/sql/share/norwegian-ny/errmsg.txt @@ -301,5 +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'", +"Mottok feil %d '%-.100s' fra %s", +"Mottok temporary feil %d '%-.100s' fra %s", diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt index 2b79fdb223a..ef6c2ee05b2 100644 --- a/sql/share/norwegian/errmsg.txt +++ b/sql/share/norwegian/errmsg.txt @@ -301,5 +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'", +"Mottok feil %d '%-.100s' fa %s", +"Mottok temporary feil %d '%-.100s' fra %s", diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt index 79805a71917..348c9a07b8c 100644 --- a/sql/share/polish/errmsg.txt +++ b/sql/share/polish/errmsg.txt @@ -303,5 +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'", +"Got error %d '%-.100s' from %s", +"Got temporary error %d '%-.100s' from %s", diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt index 9daaf5e7c4d..3fe753a71cc 100644 --- a/sql/share/portuguese/errmsg.txt +++ b/sql/share/portuguese/errmsg.txt @@ -300,5 +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'", +"Got error %d '%-.100s' from %s", +"Got temporary error %d '%-.100s' from %s", diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt index 5e917c08181..e9aa81717cb 100644 --- a/sql/share/romanian/errmsg.txt +++ b/sql/share/romanian/errmsg.txt @@ -303,5 +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'", +"Got error %d '%-.100s' from %s", +"Got temporary error %d '%-.100s' from %s", diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt index d2b3b996331..8ed8aa03efb 100644 --- a/sql/share/russian/errmsg.txt +++ b/sql/share/russian/errmsg.txt @@ -301,5 +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'", +"Got error %d '%-.100s' from %s", +"Got temporary error %d '%-.100s' from %s", diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt index 6dee9bb8705..b3718012ac3 100644 --- a/sql/share/serbian/errmsg.txt +++ b/sql/share/serbian/errmsg.txt @@ -293,5 +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'", +"Got error %d '%-.100s' from %s", +"Got temporary error %d '%-.100s' from %s", diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt index 72c9b4b4cf2..274f5ffa428 100644 --- a/sql/share/slovak/errmsg.txt +++ b/sql/share/slovak/errmsg.txt @@ -307,5 +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'", +"Got error %d '%-.100s' from %s", +"Got temporary error %d '%-.100s' from %s", diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt index dded345828a..5e3007d2b4e 100644 --- a/sql/share/spanish/errmsg.txt +++ b/sql/share/spanish/errmsg.txt @@ -301,5 +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'", +"Got error %d '%-.100s' from %s", +"Got temporary error %d '%-.100s' from %s", diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt index ee9f97a4369..516e53fe34d 100644 --- a/sql/share/swedish/errmsg.txt +++ b/sql/share/swedish/errmsg.txt @@ -299,5 +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'", +"Fick felkod %d '%-.100s' från %s", +"Fick tilfällig felkod %d '%-.100s' från %s", diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt index b5e7f646112..cf81afa8a5b 100644 --- a/sql/share/ukrainian/errmsg.txt +++ b/sql/share/ukrainian/errmsg.txt @@ -304,5 +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'", +"Got error %d '%-.100s' from %s", +"Got temporary error %d '%-.100s' from %s", |