database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

remove HA_ERR_INFO, use ER_ALTER_INFO

Browse Source
This commit is contained in:
Sergei Golubchik
2015-12-23 15:59:56 +01:00
parent 8d9fbaaba6
commit 923b6dc888
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/my_base.h
View File

@@ -503,8 +503,7 @@ enum ha_base_keytype {
#define HA_ERR_FTS_TOO_MANY_WORDS_IN_PHRASE 191 /* Too many words in a phrase */ #define HA_ERR_FTS_TOO_MANY_WORDS_IN_PHRASE 191 /* Too many words in a phrase */
#define HA_ERR_DECRYPTION_FAILED 192 /* Table encrypted but #define HA_ERR_DECRYPTION_FAILED 192 /* Table encrypted but
decypt failed */ decypt failed */
#define HA_ERR_INFO 193 /* Information, not critical */ #define HA_ERR_LAST 192 /* Copy of last error nr */
#define HA_ERR_LAST 193 /* Copy of last error nr */
/* Number of different errors */ /* Number of different errors */
#define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1) #define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1)

3
include/my_handler_errors.h
View File

@@ -95,8 +95,7 @@ static const char *handler_error_messages[]=
"Disk full", "Disk full",
"Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine. You have to dump and restore the table to fix this", "Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine. You have to dump and restore the table to fix this",
"Too many words in a FTS phrase or proximity search", "Too many words in a FTS phrase or proximity search",
"Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.", "Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match."
"Information, not an error"
}; };
#endif /* MYSYS_MY_HANDLER_ERRORS_INCLUDED */ #endif /* MYSYS_MY_HANDLER_ERRORS_INCLUDED */

3
storage/myisam/mi_check.c
View File

@@ -51,6 +51,7 @@
#include <sys/mman.h> #include <sys/mman.h>
#endif #endif
#include "rt_index.h" #include "rt_index.h"
#include <mysqld_error.h>
/* Functions defined in this file */ /* Functions defined in this file */
@@ -4767,7 +4768,7 @@ static int replace_data_file(HA_CHECK *param, MI_INFO *info,
{ {
char buff[MY_BACKUP_NAME_EXTRA_LENGTH+1]; char buff[MY_BACKUP_NAME_EXTRA_LENGTH+1];
my_create_backup_name(buff, "", param->backup_time); my_create_backup_name(buff, "", param->backup_time);
my_printf_error(HA_ERR_INFO, /* No error, just info */ my_printf_error(ER_GET_ERRMSG,
"Making backup of data file %s with extension '%s'", "Making backup of data file %s with extension '%s'",
MYF(ME_JUST_INFO | ME_NOREFRESH), share->data_file_name, MYF(ME_JUST_INFO | ME_NOREFRESH), share->data_file_name,
buff); buff);