bk commit into 5.0-fulltext tree (svoj:1.2043)

[svoj]

Below is the list of changes that have just been committed into a local
5.0-fulltext repository of svoj. When svoj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2043 05/12/02 15:35:20 svoj@stripped +3 -0
  After merge fixes.

  sql/unireg.cc
    1.75 05/12/02 15:31:32 svoj@stripped +5 -6
    After merge fix.

  sql/table.cc
    1.197 05/12/02 15:31:32 svoj@stripped +25 -52
    After merge fix.

  mysql-test/r/mysqlcheck.result
    1.2 05/12/02 15:31:32 svoj@stripped +2 -0
    After merge fix.

# 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:	svoj
# Host:	svoj-laptop.mysql.com
# Root:	/home/svoj/devel/mysql/CNET/merge/mysql-5.0-cnet

--- 1.196/sql/table.cc	2005-12-02 10:43:43 +04:00
+++ 1.197/sql/table.cc	2005-12-02 15:31:32 +04:00
@@ -335,6 +335,30 @@
                            next_chunk + 2));
       next_chunk+= str_db_type_length + 2;
     }
+    keyinfo= outparam->key_info;
+    for (i= 0; i < keys; i++, keyinfo++)
+    {
+      if (keyinfo->flags & HA_USES_PARSER)
+      {
+	LEX_STRING parser_name;
+	if (next_chunk >= buff_end)
+	{
+	  my_free(buff, MYF(0));
+	  goto err;
+	}
+	parser_name.str= next_chunk;
+	parser_name.length= strlen(next_chunk);
+	keyinfo->parser= plugin_lock(&parser_name, MYSQL_FTPARSER_PLUGIN);
+	if (! keyinfo->parser)
+	{
+	  my_free(buff, MYF(0));
+	  my_error(ER_PLUGIN_IS_NOT_LOADED, MYF(0), parser_name.str);
+	  error_reported= 1;
+	  goto err;
+	}
+	next_chunk+= parser_name.length + 1;
+      }
+    }
     my_free(buff, MYF(0));
   }
   /* Allocate handler */
@@ -377,58 +401,7 @@
     else
       outparam->record[1]= outparam->record[0];   // Safety
   }
-
-  if ((n_length= uint2korr(head+55)))
-  {
-    /* Read extra data segment */
-    char *buff, *next_chunk, *buff_end;
-    if (!(next_chunk= buff= my_malloc(n_length, MYF(MY_WME))))
-      goto err;
-    if (my_pread(file, (byte*)buff, n_length, record_offset + share->reclength,
-                 MYF(MY_NABP)))
-    {
-      my_free(buff, MYF(0));
-      goto err;
-    }
-    if (share->db_type == DB_TYPE_FEDERATED_DB)
-    {
-      share->connect_string.length= uint2korr(buff);
-      if (! (share->connect_string.str= strmake_root(&outparam->mem_root,
-              next_chunk + 2, share->connect_string.length)))
-      {
-        my_free(buff, MYF(0));
-        goto err;
-      }
-      next_chunk+= share->connect_string.length + 2;
-    }
-    buff_end= buff + n_length;
-    keyinfo= outparam->key_info;
-    for (i= 0; i < keys; i++, keyinfo++)
-    {
-      if (keyinfo->flags & HA_USES_PARSER)
-      {
-	LEX_STRING parser_name;
-	if (next_chunk >= buff_end)
-	{
-	  my_free(buff, MYF(0));
-	  goto err;
-	}
-	parser_name.str= next_chunk;
-	parser_name.length= strlen(next_chunk);
-	keyinfo->parser= plugin_lock(&parser_name, MYSQL_FTPARSER_PLUGIN);
-	if (! keyinfo->parser)
-	{
-	  my_free(buff, MYF(0));
-	  my_error(ER_PLUGIN_IS_NOT_LOADED, MYF(0), parser_name.str);
-	  error_reported= 1;
-	  goto err;
-	}
-	next_chunk+= parser_name.length + 1;
-      }
-    }
-    my_free(buff, MYF(0));
-  }
-
+ 
 #ifdef HAVE_purify
   /*
     We need this because when we read var-length rows, we are not updating

--- 1.74/sql/unireg.cc	2005-12-02 10:43:43 +04:00
+++ 1.75/sql/unireg.cc	2005-12-02 15:31:32 +04:00
@@ -167,6 +167,11 @@
       my_write(file, (const byte*)create_info->connect_string.str,
                create_info->connect_string.length, MYF(MY_NABP)))
       goto err;
+  int2store(buff, str_db_type.length);
+  if (my_write(file, (const byte*)buff, sizeof(buff), MYF(MY_NABP)) ||
+      my_write(file, (const byte*)str_db_type.str,
+               str_db_type.length, MYF(MY_NABP)))
+    goto err;
   for (i= 0; i < keys; i++)
   {
     if (key_info[i].parser_name)
@@ -177,12 +182,6 @@
     }
   }
 
-  int2store(buff, str_db_type.length);
-  if (my_write(file, (const byte*)buff, sizeof(buff), MYF(MY_NABP)) ||
-      my_write(file, (const byte*)str_db_type.str,
-               str_db_type.length, MYF(MY_NABP)))
-    goto err;
- 
   VOID(my_seek(file,filepos,MY_SEEK_SET,MYF(0)));
   if (my_write(file,(byte*) forminfo,288,MYF_RW) ||
       my_write(file,(byte*) screen_buff,info_length,MYF_RW) ||

--- 1.1/mysql-test/r/mysqlcheck.result	2005-10-18 14:24:53 +05:00
+++ 1.2/mysql-test/r/mysqlcheck.result	2005-12-02 15:31:32 +04:00
@@ -6,6 +6,7 @@
 mysql.help_relation                                OK
 mysql.help_topic                                   OK
 mysql.host                                         OK
+mysql.plugin                                       OK
 mysql.proc                                         OK
 mysql.procs_priv                                   OK
 mysql.tables_priv                                  OK
@@ -23,6 +24,7 @@
 mysql.help_relation                                OK
 mysql.help_topic                                   OK
 mysql.host                                         OK
+mysql.plugin                                       OK
 mysql.proc                                         OK
 mysql.procs_priv                                   OK
 mysql.tables_priv                                  OK