diff options
| author | Sujatha Sivakumar <sujatha.sivakumar@oracle.com> | 2012-07-10 14:37:35 +0530 |
|---|---|---|
| committer | Sujatha Sivakumar <sujatha.sivakumar@oracle.com> | 2012-07-10 14:37:35 +0530 |
| commit | 94d68d30bf45f14f7cfc56fd67f196821019efd1 (patch) | |
| tree | afa3cece38781f7a02d767695e524a0b1229c945 /client/mysqlbinlog.cc | |
| parent | 556a508f4a2335798a912a4028adc3fdf93bc908 (diff) | |
| parent | cf858b71ce0cc18909983d7f928a6961a580d77b (diff) | |
| download | mariadb-git-94d68d30bf45f14f7cfc56fd67f196821019efd1.tar.gz | |
merge from 5.1 to 5.5
Diffstat (limited to 'client/mysqlbinlog.cc')
| -rw-r--r-- | client/mysqlbinlog.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 1353e852926..389d31816ab 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -792,8 +792,11 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev, goto end; } else + { ce->print(result_file, print_event_info, TRUE); - + if (head->error == -1) + goto err; + } // If this binlog is not 3.23 ; why this test?? if (glob_description_event->binlog_version >= 3) { @@ -844,6 +847,8 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev, ce->print(result_file, print_event_info, TRUE); my_free((void*)ce->fname); delete ce; + if (head->error == -1) + goto err; } else warning("Ignoring Execute_load_log_event as there is no " @@ -904,6 +909,12 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev, { convert_path_to_forward_slashes(fname); exlq->print(result_file, print_event_info, fname); + if (head->error == -1) + { + if (fname) + my_free(fname); + goto err; + } } else warning("Ignoring Execute_load_query since there is no " |