diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2003-12-08 09:44:04 +0400 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2003-12-08 09:44:04 +0400 |
| commit | c335939203ee910c378438198a0a363789772310 (patch) | |
| tree | 3688e3403fa27b743b4827b14a5d5c1097db47f4 /sql/sql_show.cc | |
| parent | 0ff62350f61f3a79e9a34ccff40fc935dc2c0b24 (diff) | |
| parent | a0e4a6de568f11f437ed8509f8f748923332c716 (diff) | |
| download | mariadb-git-c335939203ee910c378438198a0a363789772310.tar.gz | |
post-merge fixes
sql/protocol.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 15 |
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 */ |