bk commit into 3.23 tree

Below is the list of changes that have just been commited into a local
3.23. repository of monty. When monty does a push, they will be
propogaged to the main repository and within 24 hours after the push into
the public repository. For information on how to access
the public repository see
http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1070 02/06/30 23:25:46 monty@xxxxxxxxxxxxxxx +2 -0
  Fixed bug in binary log when using LOAD DATA INFILE without active database.

  sql/log_event.h
    1.45 02/06/30 23:25:44 monty@xxxxxxxxxxxxxxx +9 -10
    Fixed bug in binary log when using LOAD DATA INFILE without active database.

  Docs/manual.texi
    1.797 02/06/30 23:25:43 monty@xxxxxxxxxxxxxxx +4 -1
    Changelog and fix of typo

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: monty
# Host: hundin.mysql.fi
# Root: /my/bk/mysql

--- 1.796/Docs/manual.texi      Sat Jun 29 01:07:08 2002
+++ 1.797/Docs/manual.texi      Sun Jun 30 23:25:43 2002
@@ -46927,7 +46927,10 @@
 @node News-3.23.52, News-3.23.51, News-3.23.x, News-3.23.x
 @appendixsubsec Changes in release 3.23.52
 @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).
 @item
 Fixed possible problem in replication when doing @code{DROP DATABASE} on a

--- 1.44/sql/log_event.h        Fri Mar 22 01:03:34 2002
+++ 1.45/sql/log_event.h        Sun Jun 30 23:25:44 2002
@@ -234,8 +234,8 @@
                 List<Item>& fields_arg, enum enum_duplicates handle_dup ):
     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),
-    table_name(table_name_arg),
-    db(db_arg),
+    table_name(table_name_arg ? table_name_arg : ""),
+    db(db_arg ? db_arg : ""),
     fname(ex->file_name),
     thd(thd)
   {
@@ -243,8 +243,8 @@
     time(&end_time);
     exec_time = (ulong) (end_time  - thd->start_time);
     valid_exec_time = 1;
-    db_len = (db) ? (uint32) strlen(db) : 0;
-    table_name_len = (table_name) ? (uint32) strlen(table_name) : 0;
+    db_len = (uint32) strlen(db);
+    table_name_len = (uint32) strlen(table_name);
     fname_len = (fname) ? (uint) strlen(fname) : 0;
     sql_ex.field_term = (*ex->field_term)[0];
     sql_ex.enclosed = (*ex->enclosed)[0];
@@ -259,12 +259,11 @@
 
     sql_ex.empty_flags = 0;
 
-    switch(handle_dup)
-      {
-      case DUP_IGNORE: sql_ex.opt_flags |= IGNORE_FLAG; break;
-      case DUP_REPLACE: sql_ex.opt_flags |= REPLACE_FLAG; break;
-      case DUP_ERROR: break;   
-      }
+    switch(handle_dup) {
+    case DUP_IGNORE:  sql_ex.opt_flags |= IGNORE_FLAG;  break;
+    case DUP_REPLACE: sql_ex.opt_flags |= REPLACE_FLAG; break;
+    case DUP_ERROR: break;     
+    }
 
     if(!ex->field_term->length())
       sql_ex.empty_flags |= FIELD_TERM_EMPTY;

---------------------------------------------------------------------
Before posting, please check:
   http://www.mysql.com/manual.php   (the manual)
   http://lists.mysql.com/           (the list archive)

To request this thread, e-mail internals-thread3998@xxxxxxxxxxxxxxx
To unsubscribe, e-mail <internals-unsubscribe@xxxxxxxxxxxxxxx>