Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into mysql.com:/M51/mysql-5.1

client/mysqlslap.c

@@ -220,6 +220,7 @@ int main(int argc, char **argv)
   int client_flag= 0;
   double load_difference;
   double query_difference;
+  statement *eptr;
   int x;
 
   DBUG_ENTER("main");
@@ -278,7 +279,6 @@ int main(int argc, char **argv)
   }
 
   // Main interations loop
-  statement *eptr;
   for (eptr= engine_statements; eptr; eptr= eptr->next)
   {
     if (!opt_silent)
@@ -1069,11 +1069,11 @@ run_scheduler(statement *stmts,
   ulonglong client_limit= 0;
   File lock_file;
   struct timeval start_time, end_time;
+  DBUG_ENTER("run_scheduler");
 
   if (limit)
     client_limit=  limit / concur;
 
-  DBUG_ENTER("run_scheduler");
   /* reset to 0 */
   children_spawned= 0;
 

include/plugin.h

@@ -138,10 +138,13 @@ enum enum_ft_token_type
   and 0 means neither operator was used.
 
   weight_adjust: A weighting factor that determines how much a match
-  for the word counts.  Can be used to increase or decrease the word's
-  importance.
+  for the word counts.  Positive values increase, negative - decrease the
+  relative word's importance in the query.
 
-  wasign: The sign of the weight_adjust value.
+  wasign: The sign of the word's weight in the query. If it's non-negative
+  the match for the word will increase document relevance, if it's
+  negative - decrease (the word becomes a "noise word", the less of it the
+  better).
 
   trunc: Corresponds to the '*' operator in the default setting of the
   ft_boolean_syntax system variable.

sql/sql_plugin.cc

@@ -21,11 +21,11 @@
 
 char *opt_plugin_dir_ptr;
 char opt_plugin_dir[FN_REFLEN];
-const char *plugin_type_names[]=
+LEX_STRING plugin_type_names[]=
 {
-  "UDF",
-  "STORAGE ENGINE",
-  "FTPARSER"
+  { STRING_WITH_LEN("UDF") },
+  { STRING_WITH_LEN("STORAGE ENGINE") },
+  { STRING_WITH_LEN("FTPARSER") }
 };
 static const char *plugin_interface_version_sym=
                    "_mysql_plugin_interface_version_";
@@ -43,7 +43,7 @@ static int min_plugin_info_interface_version[MYSQL_MAX_PLUGIN_TYPE_NUM]=
 static int cur_plugin_info_interface_version[MYSQL_MAX_PLUGIN_TYPE_NUM]=
 {
   0x0000, /* UDF: not implemented */
-  0x0000, /* STORAGE ENGINE: not implemented */
+  MYSQL_HANDLERTON_INTERFACE_VERSION,
   MYSQL_FTPARSER_INTERFACE_VERSION
 };
 static DYNAMIC_ARRAY plugin_dl_array;
@@ -343,8 +343,8 @@ static my_bool plugin_add(LEX_STRING *name, LEX_STRING *dl, int report)
       {
         char buf[256];
         strxnmov(buf, sizeof(buf) - 1, "API version for ",
-                 plugin_type_names[plugin->type], " plugin is too different",
-                 NullS);
+                 plugin_type_names[plugin->type].str,
+                 " plugin is too different", NullS);
         if (report & REPORT_TO_USER)
           my_error(ER_CANT_OPEN_LIBRARY, MYF(0), dl->str, 0, buf);
         if (report & REPORT_TO_LOG)

sql/sql_plugin.h

@@ -53,7 +53,7 @@ struct st_plugin_int
 
 extern char *opt_plugin_dir_ptr;
 extern char opt_plugin_dir[FN_REFLEN];
-extern const char *plugin_type_names[];
+extern LEX_STRING plugin_type_names[];
 extern int plugin_init(void);
 extern void plugin_load(void);
 extern void plugin_free(void);

sql/sql_show.cc

@@ -135,18 +135,20 @@ static my_bool show_plugins(THD *thd, st_plugin_int *plugin,
     DBUG_ASSERT(0);
   }
 
-  table->field[3]->store(STRING_WITH_LEN(plugin_type_names[plug->type]), cs);
+  table->field[3]->store(plugin_type_names[plug->type].str,
+                         plugin_type_names[plug->type].length,
+                         cs);
   table->field[4]->store(version_buf,
-        make_version_string(version_buf, sizeof(version_buf), 
+        make_version_string(version_buf, sizeof(version_buf),
                             *(uint *)plug->info), cs);
 
   if (plugin->plugin_dl)
   {
-    table->field[5]->store(plugin->plugin_dl->dl.str, 
+    table->field[5]->store(plugin->plugin_dl->dl.str,
                            plugin->plugin_dl->dl.length, cs);
     table->field[5]->set_notnull();
     table->field[6]->store(version_buf,
-          make_version_string(version_buf, sizeof(version_buf), 
+          make_version_string(version_buf, sizeof(version_buf),
                               plugin->plugin_dl->version),
           cs);
     table->field[6]->set_notnull();