output symbolic errno for 'SHOW SLAVE STATUS'

Summary: Instead of just showing the errno when running SHOW SLAVE STATUS command, also printing the error name so that user won't have misunderstanding

Reviewed By: gunnarku

Differential Revision: D4445585

fbshipit-source-id: 36baa9e

Author: liuxuli

include/my_sys.h

@@ -652,6 +652,7 @@ extern void     my_osmaperr(unsigned long last_error);
 #endif
 
 extern void init_glob_errs(void);
+extern void init_glob_err_names(void);
 extern const char** get_global_errmsgs();
 extern void wait_for_free_space(const char *filename, int errors);
 extern FILE *my_fopen(const char *FileName,int Flags,myf MyFlags);

include/mysys_err.h

@@ -22,8 +22,10 @@ extern "C" {
 
 #define GLOBERRS (EE_ERROR_LAST - EE_ERROR_FIRST + 1) /* Nr of global errors */
 #define EE(X)    (globerrs[(X) - EE_ERROR_FIRST])
+#define EE_NAME(X) (globerrnames[(X) - EE_ERROR_FIRST])
 
 extern const char *globerrs[];  /* my_error_messages is here */
+extern const char *globerrnames[];  /* symbolic_errno is here */
 
 /* Error message numbers in global map */
 /*

mysql-test/include/check-testcase.test

@@ -43,6 +43,7 @@ if ($tmp)
   --echo Replicate_Wild_Do_Table	#
   --echo Replicate_Wild_Ignore_Table	#
   --echo Last_Errno	0
+  --echo Last_Symbolic_Errno	
   --echo Last_Error	
   --echo Skip_Counter	0
   --echo Exec_Master_Log_Pos	#
@@ -85,11 +86,10 @@ if ($tmp)
 }
 if (!$tmp) {
   # Note: after WL#5177, fields 13-18 shall not be filtered-out.
-  --replace_column 4 # 5 # 6 # 7 # 8 # 9 # 10 # 13 # 14 # 15 # 16 # 17 # 18 # 22 # 23 # 24 # 25 # 26 # 41 # 42 # 43 # 47 # 53 # 54 # 56 # 57 # 58 #
+  --replace_column 4 # 5 # 6 # 7 # 8 # 9 # 10 # 13 # 14 # 15 # 16 # 17 # 18 # 23 # 24 # 25 # 26 # 27 # 42 # 43 # 44 # 48 # 54 # 55 # 57 # 58 # 59 #
   query_vertical
   SHOW SLAVE STATUS;
 }
 
 call mtr.check_testcase();
 --enable_query_log
-

mysys/errors.c

@@ -56,11 +56,54 @@ const char *globerrs[GLOBERRS]=
   "Memory capacity exceeded (capacity %llu bytes)"
 };
 
+const char *globerrnames[GLOBERRS]=
+{
+  "EE_CANTCREATEFILE",
+  "EE_READ",
+  "EE_WRITE",
+  "EE_BADCLOSE",
+  "EE_OUTOFMEMORY",
+  "EE_DELETE",
+  "EE_LINK",
+  "",
+  "EE_EOFERR",
+  "EE_CANTLOCK",
+  "EE_CANTUNLOCK",
+  "EE_DIR",
+  "EE_STAT",
+  "EE_CANT_CHSIZE",
+  "EE_CANT_OPEN_STREAM",
+  "EE_GETWD",
+  "EE_SETWD",
+  "EE_LINK_WARNING",
+  "EE_OPEN_WARNING",
+  "EE_DISK_FULL",
+  "EE_CANT_MKDIR",
+  "EE_UNKNOWN_CHARSET",
+  "EE_OUT_OF_FILERESOURCES",
+  "EE_CANT_READLINK",
+  "EE_CANT_SYMLINK",
+  "EE_REALPATH",
+  "EE_SYNC",
+  "EE_UNKNOWN_COLLATION",
+  "EE_FILENOTFOUND",
+  "EE_FILE_NOT_CLOSED",
+  "EE_CHANGE_OWNERSHIP",
+  "EE_CHANGE_PERMISSIONS",
+  "EE_CANT_SEEK",
+  "EE_CAPACITY_EXCEEDED"
+};
+
 void init_glob_errs(void)
 {
   /* This is now done statically. */
 }
 
+void init_glob_err_names(void)
+{
+  /* This is now done statically. */
+}
+
 #else
 
 void init_glob_errs()
@@ -98,6 +141,42 @@ void init_glob_errs()
   EE(EE_CHANGE_PERMISSIONS) = "Can't change permissions of the file '%s' (Errcode: %d - %s)";
   EE(EE_CANT_SEEK)      = "Can't seek in file '%s' (Errcode: %d - %s)";
 }
+
+void init_glob_err_names()
+{
+  EE_NAME(EE_CANTCREATEFILE) = "EE_CANTCREATEFILE";
+  EE_NAME(EE_READ)		= "EE_READ";
+  EE_NAME(EE_WRITE)		= "EE_WRITE";
+  EE_NAME(EE_BADCLOSE)	= "EE_BADCLOSE";
+  EE_NAME(EE_OUTOFMEMORY)	= "EE_OUTOFMEMORY";
+  EE_NAME(EE_DELETE)		= "EE_DELETE";
+  EE_NAME(EE_LINK)		= "EE_LINK";
+  EE_NAME(EE_EOFERR)		= "EE_EOFERR";
+  EE_NAME(EE_CANTLOCK)	= "EE_CANTLOCK";
+  EE_NAME(EE_CANTUNLOCK)	= "EE_CANTUNLOCK";
+  EE_NAME(EE_DIR)		= "EE_DIR";
+  EE_NAME(EE_STAT)		= "EE_STAT";
+  EE_NAME(EE_CANT_CHSIZE)	= "EE_CANT_CHSIZE";
+  EE_NAME(EE_CANT_OPEN_STREAM)= "EE_CANT_OPEN_STREAM";
+  EE_NAME(EE_GETWD)		= "EE_GETWD";
+  EE_NAME(EE_SETWD)		= "EE_SETWD";
+  EE_NAME(EE_LINK_WARNING)	= "EE_LINK_WARNING";
+  EE_NAME(EE_OPEN_WARNING)	= "EE_OPEN_WARNING";
+  EE_NAME(EE_DISK_FULL)	= "EE_DISK_FULL";
+  EE_NAME(EE_CANT_MKDIR)	="EE_CANT_MKDIR";
+  EE_NAME(EE_UNKNOWN_CHARSET)= "EE_UNKNOWN_CHARSET";
+  EE_NAME(EE_OUT_OF_FILERESOURCES)="EE_OUT_OF_FILERESOURCES";
+  EE_NAME(EE_CANT_READLINK)=	"EE_CANT_READLINK";
+  EE_NAME(EE_CANT_SYMLINK)=	"EE_CANT_SYMLINK";
+  EE_NAME(EE_REALPATH)=	"EE_REALPATH";
+  EE_NAME(EE_SYNC)=		"EE_SYNC";
+  EE_NAME(EE_UNKNOWN_COLLATION)= "EE_UNKNOWN_COLLATION";
+  EE_NAME(EE_FILENOTFOUND)	= "EE_FILENOTFOUND";
+  EE_NAME(EE_FILE_NOT_CLOSED) = "EE_FILE_NOT_CLOSED";
+  EE_NAME(EE_CHANGE_OWNERSHIP)   = "EE_CHANGE_OWNERSHIP";
+  EE_NAME(EE_CHANGE_PERMISSIONS) = "EE_CHANGE_PERMISSIONS";
+  EE_NAME(EE_CANT_SEEK)      = "EE_CANT_SEEK";
+}
 #endif
 
 /*

mysys/my_init.c

@@ -82,6 +82,7 @@ my_bool my_init(void)
     my_umask_dir= (int) (atoi_octal(str) | 0700);
 
   init_glob_errs();
+  init_glob_err_names();
 
   instrumented_stdin.m_file= stdin;
   instrumented_stdin.m_psi= NULL;       /* not yet instrumented */

sql/rpl_slave.cc

@@ -2975,6 +2975,7 @@ bool show_slave_status(THD* thd, Master_info* mi)
   field_list.push_back(new Item_empty_string("Replicate_Wild_Ignore_Table",
                                              28));
   field_list.push_back(new Item_return_int("Last_Errno", 4, MYSQL_TYPE_LONG));
+  field_list.push_back(new Item_empty_string("Last_Symbolic_Errno", 20));
   field_list.push_back(new Item_empty_string("Last_Error", 20));
   field_list.push_back(new Item_return_int("Skip_Counter", 10,
                                            MYSQL_TYPE_LONG));
@@ -3107,6 +3108,21 @@ bool show_slave_status(THD* thd, Master_info* mi)
     protocol->store(&tmp);
 
     protocol->store(mi->rli->last_error().number);
+
+    if (mi->rli->last_error().number == 0)
+    {
+      protocol->store("", &my_charset_bin);
+    }
+    else if (mi->rli->last_error().number >= EE_ERROR_FIRST &&
+      mi->rli->last_error().number <= EE_ERROR_LAST)
+    {
+      protocol->store(EE_NAME(mi->rli->last_error().number), &my_charset_bin);
+    }
+    else
+    {
+      protocol->store("regular sql errno", &my_charset_bin);
+    }
+
     protocol->store(mi->rli->last_error().message, &my_charset_bin);
     protocol->store((uint32) mi->rli->slave_skip_counter);
     protocol->store((ulonglong) mi->rli->get_group_master_log_pos());