bk commit into 5.1 tree (msvensson:1.2312)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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@stripped, 2006-09-08 16:01:51+02:00, msvensson@shellback.(none) +7 -0
  Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
  into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
  MERGE: 1.2302.1.4

  mysql-test/mysql-test-run.pl@stripped, 2006-09-08 16:01:47+02:00,
msvensson@shellback.(none) +3 -4
    Merge
    MERGE: 1.150.3.7

  sql/ha_innodb.cc@stripped, 2006-09-08 15:58:17+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.284.4.3

  sql/handler.cc@stripped, 2006-09-08 15:58:18+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.262.1.1

  sql/log.cc@stripped, 2006-09-08 15:58:18+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.223.2.1

  sql/mysqld.cc@stripped, 2006-09-08 15:58:18+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.574.2.6

  sql/sql_show.cc@stripped, 2006-09-08 15:58:19+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.365.2.1

  storage/csv/ha_tina.cc@stripped, 2006-09-08 15:58:19+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.57.1.2

# 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:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint/RESYNC

--- 1.264/sql/handler.cc	2006-09-08 16:02:01 +02:00
+++ 1.265/sql/handler.cc	2006-09-08 16:02:01 +02:00
@@ -3567,7 +3567,7 @@
 int handler::ha_reset()
 {
   DBUG_ENTER("ha_reset");
-  /* Check that we have called all proper delallocation functions */
+  /* Check that we have called all proper deallocation functions */
   DBUG_ASSERT((byte*) table->def_read_set.bitmap +
               table->s->column_bitmap_size ==
               (byte*) table->def_write_set.bitmap);

--- 1.225/sql/log.cc	2006-09-08 16:02:01 +02:00
+++ 1.226/sql/log.cc	2006-09-08 16:02:01 +02:00
@@ -3968,6 +3968,12 @@
     return an error (e.g. logging to the log tables)
 */
 
+#ifdef EMBEDDED_LIBRARY
+int vprint_msg_to_log(enum loglevel level __attribute__((unused)),
+                       const char *format __attribute__((unused)),
+                       va_list argsi __attribute__((unused)))
+{}
+#else /*!EMBEDDED_LIBRARY*/
 int vprint_msg_to_log(enum loglevel level, const char *format, va_list args)
 {
   char   buff[1024];
@@ -3984,6 +3990,7 @@
 
   DBUG_RETURN(0);
 }
+#endif /*EMBEDDED_LIBRARY*/
 
 
 void sql_print_error(const char *format, ...) 

--- 1.580/sql/mysqld.cc	2006-09-08 16:02:01 +02:00
+++ 1.581/sql/mysqld.cc	2006-09-08 16:02:01 +02:00
@@ -1185,7 +1185,7 @@
     udf_free();
 #endif
   }
-  plugin_free();
+  plugin_shutdown();
   if (tc_log)
     tc_log->close();
   xid_cache_free();
@@ -2626,7 +2626,7 @@
   /*
     Add server status variables to the dynamic list of
     status variables that is shown by SHOW STATUS.
-    Later, in plugin_init, plugin_load, and mysql_install_plugin
+    Later, in plugin_init, and mysql_install_plugin
     new entries could be added to that list.
   */
   if (add_status_vars(status_vars))
@@ -3175,7 +3175,7 @@
     using_update_log=1;
   }
 
-  if (plugin_init())
+  if (plugin_init(0))
   {
     sql_print_error("Failed to init plugins.");
     return 1;
@@ -3607,7 +3607,6 @@
 
   if (!opt_noacl)
   {
-    plugin_load();
 #ifdef HAVE_DLOPEN
     udf_init();
 #endif

--- 1.367/sql/sql_show.cc	2006-09-08 16:02:01 +02:00
+++ 1.368/sql/sql_show.cc	2006-09-08 16:02:01 +02:00
@@ -220,9 +220,10 @@
   DBUG_ENTER("fill_plugins");
   TABLE *table= tables->table;
 
-  if (plugin_foreach(thd, show_plugins, MYSQL_ANY_PLUGIN, table))
+  if (plugin_foreach_with_mask(thd, show_plugins, MYSQL_ANY_PLUGIN,
+                               ~PLUGIN_IS_FREED, table))
     DBUG_RETURN(1);
-    
+
   DBUG_RETURN(0);
 }
 

--- 1.59/storage/csv/ha_tina.cc	2006-09-08 16:02:01 +02:00
+++ 1.60/storage/csv/ha_tina.cc	2006-09-08 16:02:01 +02:00
@@ -1529,7 +1529,9 @@
   tina_init_func, /* Plugin Init */
   tina_done_func, /* Plugin Deinit */
   0x0100 /* 1.0 */,
-  0
+  NULL,                       /* status variables                */
+  NULL,                       /* system variables                */
+  NULL                        /* config options                  */
 }
 mysql_declare_plugin_end;
 

--- 1.164/mysql-test/mysql-test-run.pl	2006-09-08 16:02:01 +02:00
+++ 1.165/mysql-test/mysql-test-run.pl	2006-09-08 16:02:01 +02:00
@@ -324,6 +324,8 @@
 our $exe_ndb_mgm;
 our $exe_ndb_waiter;
 our $path_ndb_tools_dir;
+our $path_ndb_examples_dir;
+our $exe_ndb_example;
 our $file_ndb_testrun_log;
 
 our @data_dir_lst;
@@ -1235,6 +1237,9 @@
       mtr_script_exists("$glob_basedir/scripts/mysql_fix_privilege_tables",
                         "/usr/bin/false");
     $path_ndb_tools_dir= mtr_path_exists("$glob_basedir/storage/ndb/tools");
+    $path_ndb_examples_dir= mtr_path_exists("$glob_basedir/storage/ndb/ndbapi-examples");
+    $exe_ndb_example=
mtr_exe_exists("$path_ndb_examples_dir/ndbapi_simple/ndbapi_simple",
+				    $exe_mysqld);
     $exe_ndb_mgm=        "$glob_basedir/storage/ndb/src/mgmclient/ndb_mgm";
     $exe_ndb_waiter=     "$glob_basedir/storage/ndb/tools/ndb_waiter";
     $exe_ndbd=           "$glob_basedir/storage/ndb/src/kernel/ndbd";
@@ -1299,6 +1304,7 @@
     }
 
     $path_ndb_tools_dir=  "$glob_basedir/bin";
+    $path_ndb_examples_dir=  "$glob_basedir/ndbapi-examples";
     $exe_ndb_mgm=         "$glob_basedir/bin/ndb_mgm";
     $exe_ndb_waiter=      "$glob_basedir/bin/ndb_waiter";
     $exe_ndbd=            "$glob_basedir/bin/ndbd";
@@ -1342,7 +1348,8 @@
   # --------------------------------------------------------------------------
   if ( $opt_source_dist )
   {
-    $extra_ld_library_paths= "$glob_basedir/libmysql/.libs/";
+    $extra_ld_library_paths= "$glob_basedir/libmysql/.libs/" .
+                             ":$glob_basedir/libmysql_r/.libs/";
   }
   else
   {
@@ -1355,6 +1362,14 @@
   $extra_ld_library_paths .= ":" .
     ($lib_udf_example ?  dirname($lib_udf_example) : "");
 
+  # --------------------------------------------------------------------------
+  # Add the path where libndbclient can be found
+  # --------------------------------------------------------------------------
+  if ( $opt_ndbcluster_supported )
+  {
+    $extra_ld_library_paths .= ":$glob_basedir/storage/ndb/src/.libs";
+  }
+
   $ENV{'LD_LIBRARY_PATH'}=
     "$extra_ld_library_paths" .
       ($ENV{'LD_LIBRARY_PATH'} ? ":$ENV{'LD_LIBRARY_PATH'}" : "");
@@ -1378,6 +1393,7 @@
   $ENV{'MASTER_MYSOCK1'}=     $master->[1]->{'path_sock'};
   $ENV{'MASTER_MYPORT'}=      $master->[0]->{'port'};
   $ENV{'MASTER_MYPORT1'}=     $master->[1]->{'port'};
+  $ENV{'SLAVE_MYSOCK'}=       $slave->[0]->{'path_sock'};
   $ENV{'SLAVE_MYPORT'}=       $slave->[0]->{'port'};
   $ENV{'SLAVE_MYPORT1'}=      $slave->[1]->{'port'};
   $ENV{'SLAVE_MYPORT2'}=      $slave->[2]->{'port'};
@@ -1402,6 +1418,9 @@
   $ENV{'NDB_TOOLS_OUTPUT'}=         $file_ndb_testrun_log;
   $ENV{'NDB_CONNECTSTRING'}=        $opt_ndbconnectstring;
 
+  $ENV{'NDB_EXAMPLES_DIR'}=         $path_ndb_examples_dir;
+  $ENV{'MY_NDB_EXAMPLES_BINARY'}=   ($exe_ndb_example eq
"$path_ndb_examples_dir/ndbapi_simple/ndbapi_simple")?$exe_ndb_example:"";
+  $ENV{'NDB_EXAMPLES_OUTPUT'}=      $file_ndb_testrun_log;
 
   # ----------------------------------------------------
   # Setup env for IM

--- 1.292/sql/ha_innodb.cc	2006-09-08 16:02:01 +02:00
+++ 1.293/sql/ha_innodb.cc	2006-09-08 16:02:01 +02:00
@@ -32,6 +32,8 @@
 #endif
 
 #include "mysql_priv.h"
+#ifdef WITH_INNOBASE_STORAGE_ENGINE
+
 #include "slave.h"
 
 #include <m_ctype.h>
@@ -7644,7 +7646,10 @@
   innobase_init, /* Plugin Init */
   NULL, /* Plugin Deinit */
   0x0100 /* 1.0 */,
-  innodb_status_variables_export
+  innodb_status_variables_export,/* status variables             */
+  NULL,                       /* system variables                */
+  NULL                        /* config options                  */
 }
 mysql_declare_plugin_end;
 
+#endif