diff options
| author | unknown <monty@mishka.local> | 2004-09-09 15:58:55 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2004-09-09 15:58:55 +0300 |
| commit | b15004a800770c3bdfc85f69c86629573669e1d0 (patch) | |
| tree | 368687b45835bc7b5a71ef90de23cb752f4a1865 /sql/log_event.cc | |
| parent | ac473c38136ea8fed453e316b052819cd86d08a8 (diff) | |
| parent | bc787254247cb66a5e1adc0af6834c10737ecc6e (diff) | |
| download | mariadb-git-b15004a800770c3bdfc85f69c86629573669e1d0.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 2f3471fee17..0c3b36c37b5 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1266,6 +1266,8 @@ void Query_log_event::print(FILE* file, bool short_form, { // TODO: print the catalog ?? char buff[40],*end; // Enough for SET TIMESTAMP + bool different_db= 1; + if (!short_form) { print_header(file); @@ -1273,9 +1275,7 @@ void Query_log_event::print(FILE* file, bool short_form, (ulong) thread_id, (ulong) exec_time, error_code); } - bool different_db= 1; - - if (db && last_event_info->db) + if (db) { if ((different_db = memcmp(last_event_info->db, db, db_len + 1))) memcpy(last_event_info->db, db, db_len + 1); @@ -1540,10 +1540,6 @@ end: thd->query= 0; // just to be sure thd->query_length= 0; VOID(pthread_mutex_unlock(&LOCK_thread_count)); - // assume no convert for next query unless set explictly -#ifdef TO_BE_REMOVED - thd->variables.convert_set = 0; -#endif close_thread_tables(thd); free_root(&thd->mem_root,MYF(MY_KEEP_PREALLOC)); return (thd->query_error ? thd->query_error : Log_event::exec_event(rli)); @@ -2304,7 +2300,7 @@ void Load_log_event::print(FILE* file, bool short_form, LAST_EVENT_INFO* last_ev } bool different_db= 1; - if (db && last_event_info->db) + if (db) { /* If the database is different from the one of the previous statement, we @@ -2849,7 +2845,8 @@ int Intvar_log_event::write_data(IO_CACHE* file) */ #ifdef MYSQL_CLIENT -void Intvar_log_event::print(FILE* file, bool short_form, LAST_EVENT_INFO* last_event_info) +void Intvar_log_event::print(FILE* file, bool short_form, + LAST_EVENT_INFO* last_event_info) { char llbuff[22]; const char *msg; |