diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-16 11:33:54 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-16 11:33:54 +0300 |
| commit | 980e8b413e89175d8fc7f867415712589bead9ff (patch) | |
| tree | 765dbf44bc16c28e3d63a3439bed89b86e4b92fc /sql/sql_test.cc | |
| parent | d1dfce06b254548e108deabfe8a7e6b759984d5d (diff) | |
| parent | 376cf4275f28f6b8167eaf19b2c66dee41fbc5c5 (diff) | |
| download | mariadb-git-980e8b413e89175d8fc7f867415712589bead9ff.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/sql_test.cc')
| -rw-r--r-- | sql/sql_test.cc | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc index 3907aa6a5ae..72b6e483d35 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -55,19 +55,18 @@ static const char *lock_descriptions[] = void print_where(COND *cond,const char *info, enum_query_type query_type) { + char buff[256]; + String str(buff,(uint32) sizeof(buff), system_charset_info); + str.length(0); if (cond) - { - char buff[256]; - String str(buff,(uint32) sizeof(buff), system_charset_info); - str.length(0); cond->print(&str, query_type); - str.append('\0'); - DBUG_LOCK_FILE; - (void) fprintf(DBUG_FILE,"\nWHERE:(%s) ",info); - (void) fputs(str.ptr(),DBUG_FILE); - (void) fputc('\n',DBUG_FILE); - DBUG_UNLOCK_FILE; - } + str.append('\0'); + + DBUG_LOCK_FILE; + (void) fprintf(DBUG_FILE,"\nWHERE:(%s) %p ", info, cond); + (void) fputs(str.ptr(),DBUG_FILE); + (void) fputc('\n',DBUG_FILE); + DBUG_UNLOCK_FILE; } /* This is for debugging purposes */ |