summaryrefslogtreecommitdiff
path: root/client/mysqlbinlog.cc
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2003-08-19 15:46:47 +0200
committerunknown <guilhem@mysql.com>2003-08-19 15:46:47 +0200
commitfe0e54643492c6b689664ed09206db58dca29967 (patch)
tree96fc3e34d0ad8c0c6612d46fb6ce4ffa5977b7ab /client/mysqlbinlog.cc
parent4392456beab4790ac14a05862fd85aec592fba10 (diff)
downloadmariadb-git-fe0e54643492c6b689664ed09206db58dca29967.tar.gz
Fix for BUG#1096 which is:
"mysqlbinlog does not comment the original LOAD DATA INFILE if it has a "use xx"" client/mysqlbinlog.cc: a comment sql/log_event.cc: in mysqlbinlog we want to have a leading '#' before LOAD DATA INFILE when we print a Create_file event. This was not done properly when the query had *2* lines: only the "use db" got commented. To fix this I had to add an argument to Load_log_event::print, it could not be handled in Create_file_log_event::print alone. sql/log_event.h: prototype
Diffstat (limited to 'client/mysqlbinlog.cc')
-rw-r--r--client/mysqlbinlog.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 954e9290a76..a454d6a859f 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -613,7 +613,13 @@ Could not read entry at offset %s : Error in log format or read error",
continue; // next
}
}
- ce->print(result_file, short_form, last_db,true);
+ /*
+ We print the event, but with a leading '#': this is just to inform the
+ user of the original command; the command we want to execute will be a
+ derivation of this original command (we will change the filename and
+ use LOCAL), prepared in the 'case EXEC_LOAD_EVENT' below.
+ */
+ ce->print(result_file, short_form, last_db, true);
load_processor.process(ce);
ev= 0;
break;