post-merge fixes

1 files changed, 9 insertions, 6 deletions

diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 4181075cb9f..ac193736be5 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1612,9 +1612,12 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables,
         break;
       }
       case SHOW_CHAR:
-	pos= value;
-	end= strend(pos);
+      {
+        if (!(pos= value))
+          pos= "";
+        end= strend(pos);
         break;
+       }
       case SHOW_STARTTIME:
 	nr= (long) (thd->query_start() - start_time);
 	end= int10_to_str(nr, buff, 10);
@@ -1640,10 +1643,10 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables,
         break;
       case SHOW_CHAR_PTR:
       {
-	if (!(pos= *(char**) value))
-	  pos= "";
-	end= strend(pos);
-	break;
+        if (!(pos= *(char**) value))
+          pos= "";
+        end= strend(pos);
+        break;
       }
 #ifdef HAVE_OPENSSL
 	/* First group - functions relying on CTX */