diff options
author | unknown <gshchepa/uchum@gleb.loc> | 2007-06-24 03:35:27 +0500 |
---|---|---|
committer | unknown <gshchepa/uchum@gleb.loc> | 2007-06-24 03:35:27 +0500 |
commit | 26b526dc608ffb16e46729de6638d1ee9d668907 (patch) | |
tree | d8246af6017c853cb8d2e86ed1cc7972bf2bd9ea /sql/log_event.cc | |
parent | fdbefa8d528faf8e1d99d251c23c8a77f14b1aa2 (diff) | |
parent | d37471b4ef931a0b945e20753203dbc3a266bcd5 (diff) | |
download | mariadb-git-26b526dc608ffb16e46729de6638d1ee9d668907.tar.gz |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into gleb.loc:/home/uchum/work/bk/5.1-opt
libmysql/libmysql.c:
Merge with 5.0-opt.
mysql-test/r/insert_select.result:
Merge with 5.0-opt.
mysql-test/r/mysqlbinlog.result:
Merge with 5.0-opt.
mysql-test/r/rpl_change_master.result:
Merge with 5.0-opt.
mysql-test/r/view.result:
Merge with 5.0-opt.
mysql-test/t/insert_select.test:
Merge with 5.0-opt.
mysql-test/t/mysqlbinlog.test:
Merge with 5.0-opt.
mysql-test/t/rpl_change_master.test:
Merge with 5.0-opt.
mysql-test/t/view.test:
Merge with 5.0-opt.
sql/item.cc:
Merge with 5.0-opt.
sql/item.h:
Merge with 5.0-opt.
sql/log_event.cc:
Merge with 5.0-opt.
sql/sql_select.cc:
Merge with 5.0-opt.
Diffstat (limited to 'sql/log_event.cc')
-rw-r--r-- | sql/log_event.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 4878994d0a7..b7493e9df66 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1133,7 +1133,6 @@ void Log_event::print_header(IO_CACHE* file, } *c= '\0'; - /* Non-full last line */ if (hex_string[0]) { char emit_buf[256]; |