bk commit into 5.1 tree (svoj:1.2004) BUG#16068

[svoj]

Below is the list of changes that have just been committed into a local
5.1 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.2004 05/12/29 17:28:59 svoj@april.(none) +2 -0
  BUG#16068: Plugin related bugs
  Fixed that --plugin_dir option doesn't work.
  Fixed that parser name is not restored correctly from the table.

  sql/table.cc
    1.197 05/12/29 17:27:44 svoj@april.(none) +2 -2
    Partition saves at least 5 bytes in .frm.

  sql/mysqld.cc
    1.509 05/12/29 17:27:44 svoj@april.(none) +2 -3
    Overwrite opt_plugin_dir_ptr _after_ loading the path.

# 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:	april.(none)
# Root:	/home/svoj/devel/mysql/mysql-5.1-new

--- 1.508/sql/mysqld.cc	2005-12-28 06:55:55 +04:00
+++ 1.509/sql/mysqld.cc	2005-12-29 17:27:44 +04:00
@@ -7448,10 +7448,9 @@
   (void) my_load_path(mysql_home,mysql_home,""); // Resolve current dir
   (void) my_load_path(mysql_real_data_home,mysql_real_data_home,mysql_home);
   (void) my_load_path(pidfile_name,pidfile_name,mysql_real_data_home);
-  strmake(opt_plugin_dir, get_relative_path(LIBDIR),
-          sizeof(opt_plugin_dir) - 1);
+  (void) my_load_path(opt_plugin_dir, opt_plugin_dir_ptr ? opt_plugin_dir_ptr :
+                                      get_relative_path(LIBDIR), mysql_home);
   opt_plugin_dir_ptr= opt_plugin_dir;
-  (void) my_load_path(opt_plugin_dir, opt_plugin_dir_ptr, mysql_home);
 
   char *sharedir=get_relative_path(SHAREDIR);
   if (test_if_hard_path(sharedir))

--- 1.196/sql/table.cc	2005-12-22 08:10:56 +04:00
+++ 1.197/sql/table.cc	2005-12-29 17:27:44 +04:00
@@ -538,7 +538,7 @@
 #endif
       next_chunk+= str_db_type_length + 2;
     }
-    if (next_chunk + 4 < buff_end)
+    if (next_chunk + 5 < buff_end)
     {
       uint32 partition_info_len = uint4korr(next_chunk);
 #ifdef WITH_PARTITION_STORAGE_ENGINE
@@ -561,7 +561,7 @@
         goto err;
       }
 #endif
-      next_chunk+= 4 + partition_info_len;
+      next_chunk+= 5 + partition_info_len;
     }
     keyinfo= share->key_info;
     for (i= 0; i < keys; i++, keyinfo++)