Commit fbaede45 authored by unknown's avatar unknown

Fixed bug in binary log when using LOAD DATA INFILE without active database.


Docs/manual.texi:
  Changelog and fix of typo
parent 088bc46c
...@@ -46927,7 +46927,10 @@ not yet 100% confident in this code. ...@@ -46927,7 +46927,10 @@ not yet 100% confident in this code.
@node News-3.23.52, News-3.23.51, News-3.23.x, News-3.23.x @node News-3.23.52, News-3.23.51, News-3.23.x, News-3.23.x
@appendixsubsec Changes in release 3.23.52 @appendixsubsec Changes in release 3.23.52
@itemize @bullet @itemize @bullet
@code @item
Fixed bug when logging @code{LOAD DATA INFILE} to binary log with no
active database.
@item
Fixed a bug in range optimiser (causing crashes). Fixed a bug in range optimiser (causing crashes).
@item @item
Fixed possible problem in replication when doing @code{DROP DATABASE} on a Fixed possible problem in replication when doing @code{DROP DATABASE} on a
...@@ -234,8 +234,8 @@ public: ...@@ -234,8 +234,8 @@ public:
List<Item>& fields_arg, enum enum_duplicates handle_dup ): List<Item>& fields_arg, enum enum_duplicates handle_dup ):
Log_event(thd->start_time),data_buf(0),thread_id(thd->thread_id), Log_event(thd->start_time),data_buf(0),thread_id(thd->thread_id),
num_fields(0),fields(0),field_lens(0),field_block_len(0), num_fields(0),fields(0),field_lens(0),field_block_len(0),
table_name(table_name_arg), table_name(table_name_arg ? table_name_arg : ""),
db(db_arg), db(db_arg ? db_arg : ""),
fname(ex->file_name), fname(ex->file_name),
thd(thd) thd(thd)
{ {
...@@ -243,8 +243,8 @@ public: ...@@ -243,8 +243,8 @@ public:
time(&end_time); time(&end_time);
exec_time = (ulong) (end_time - thd->start_time); exec_time = (ulong) (end_time - thd->start_time);
valid_exec_time = 1; valid_exec_time = 1;
db_len = (db) ? (uint32) strlen(db) : 0; db_len = (uint32) strlen(db);
table_name_len = (table_name) ? (uint32) strlen(table_name) : 0; table_name_len = (uint32) strlen(table_name);
fname_len = (fname) ? (uint) strlen(fname) : 0; fname_len = (fname) ? (uint) strlen(fname) : 0;
sql_ex.field_term = (*ex->field_term)[0]; sql_ex.field_term = (*ex->field_term)[0];
sql_ex.enclosed = (*ex->enclosed)[0]; sql_ex.enclosed = (*ex->enclosed)[0];
...@@ -259,8 +259,7 @@ public: ...@@ -259,8 +259,7 @@ public:
sql_ex.empty_flags = 0; sql_ex.empty_flags = 0;
switch(handle_dup) switch(handle_dup) {
{
case DUP_IGNORE: sql_ex.opt_flags |= IGNORE_FLAG; break; case DUP_IGNORE: sql_ex.opt_flags |= IGNORE_FLAG; break;
case DUP_REPLACE: sql_ex.opt_flags |= REPLACE_FLAG; break; case DUP_REPLACE: sql_ex.opt_flags |= REPLACE_FLAG; break;
case DUP_ERROR: break; case DUP_ERROR: break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment