Merge paul@work.mysql.com:/home/bk/mysql-4.0

into teton.kitebird.com:/home/paul/mysql-4.0

BitKeeper/etc/logging_ok

@@ -48,3 +48,4 @@ venu@work.mysql.com
 zak@linux.local
 jcole@mugatu.spaceapes.com
 arjen@fred.bitbike.com
+zak@balfor.local

Docs/Support/colspec-fix.pl

@@ -29,7 +29,8 @@ sub msg {
 
 sub rel2abs {
     my $str = shift;
-
+    my $colnum = 1;
+    
     my @widths = ();
     my $total  = 0;
     my $output = '';
@@ -45,7 +46,8 @@ sub rel2abs {
     my $unit = ($table_width - ($#widths * $gutter_width)) / ($total);
 
     foreach (@widths) {
-        $output .= $ws . '<colspec colwidth="'. sprintf ("%0.2f", $_ * $unit) .'cm" />' . "\n";
+        $output .= $ws . '<colspec colnum="'. $colnum .'" colwidth="'. sprintf ("%0.2f", $_ * $unit) .'cm" />' . "\n";
+        ++$colnum;
     }
     
     return $output . "\n$ws";

sql/sql_class.h

@@ -492,7 +492,10 @@ public:
   CHANGED_TABLE_LIST * changed_table_dup(TABLE *table);
 };
 
-
+/*
+  Used to hold information about file and file structure in exchainge 
+  via non-DB file (...INTO OUTFILE..., ...LOAD DATA...)
+*/
 class sql_exchange :public Sql_alloc
 {
 public:

sql/table.h

@@ -112,7 +112,7 @@ struct st_table {
   char		*table_name,*real_name,*path;
   uint		key_length;		/* Length of key */
   uint		tablenr,used_fields,null_bytes;
-  table_map	map;
+  table_map	map;                    /* ID bit of table (1,2,4,8,16...) */
   ulong		version,flush_version;
   uchar		*null_flags;
   IO_CACHE	*io_cache;			/* If sorted trough file*/
@@ -141,13 +141,14 @@ typedef struct st_table_list {
   uint32        db_length, real_name_length;
   Item		*on_expr;			/* Used with outer join */
   struct st_table_list *natural_join;		/* natural join on this table*/
-  List<String>	*use_index,*ignore_index;
+  /* ... join ... USE INDEX ... IGNORE INDEX */
+  List<String>	*use_index,*ignore_index; 
   TABLE		*table;
   GRANT_INFO	grant;
   thr_lock_type lock_type;
   uint		outer_join;			/* Which join type */
   bool		straight;			/* optimize with prev table */
-  bool          updating;     /* for replicate-do/ignore table */
+  bool          updating;                   /* for replicate-do/ignore table */
   bool		shared;				/* Used twice in union */
 } TABLE_LIST;