diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-10-06 19:07:59 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-10-06 19:07:59 -0600 |
| commit | aaea3431d33c9b66c6b01a31ffcd4e85a28800ee (patch) | |
| tree | bc9e2b024b26fefae6cc9d3d07f17e6f2aa96100 | |
| parent | dbde9337c201b7a53357d3904c7f0ac5b046ed85 (diff) | |
| parent | 98d6bfaf06f148fede8555e468df06dee40cb4a5 (diff) | |
| download | mariadb-git-aaea3431d33c9b66c6b01a31ffcd4e85a28800ee.tar.gz | |
Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | sql/log.cc | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 2d75ea486ef..eb16f398308 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,2 +1,3 @@ monty@tramp.mysql.fi monty@donna.mysql.com +sasha@mysql.sashanet.com diff --git a/sql/log.cc b/sql/log.cc index bef7fd14b8d..c5e5c8ff7a1 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -475,6 +475,25 @@ void MYSQL_LOG::write(Query_log_event* event_info) goto err; } } + + if(thd->convert_set) + { + char buf[1024] = "SET CHARACTER SET "; + char* p = strend(buf); + p = strmov(p, thd->convert_set->name); + int save_query_length = thd->query_length; + // just in case somebody wants it later + thd->query_length = (uint)(p - buf); + Query_log_event e(thd, buf); + if(e.write(file)) + { + sql_print_error(ER(ER_ERROR_ON_WRITE), name, errno); + goto err; + } + + thd->query_length = save_query_length; // clean up + + } if (event_info->write(file)) { |