List:Commits« Previous MessageNext Message »
From:Sergei Golubchik Date:December 29 2005 8:29pm
Subject:bk commit into 5.1 tree (serg:1.2009)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of serg. When serg 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.2009 05/12/29 21:29:02 serg@stripped +5 -0
  after pull fixes

  sql/sql_show.cc
    1.292 05/12/29 21:24:07 serg@stripped +6 -4
    LEX_STRING instead of char*.
    STRING_WITH_LEN works only on string literals, not on expressions

  sql/sql_plugin.h
    1.4 05/12/29 21:24:07 serg@stripped +1 -1
    LEX_STRING instead of char*

  sql/sql_plugin.cc
    1.7 05/12/29 21:24:06 serg@stripped +7 -7
    LEX_STRING instead of char*,
    MYSQL_HANDLERTON_INTERFACE_VERSION instead of 0x0000

  include/plugin.h
    1.5 05/12/29 21:24:06 serg@stripped +6 -3
    comments corrected

  client/mysqlslap.c
    1.9 05/12/29 21:24:06 serg@stripped +2 -2
    compilation errors

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-5.1

--- 1.291/sql/sql_show.cc	Wed Dec 28 13:05:20 2005
+++ 1.292/sql/sql_show.cc	Thu Dec 29 21:24:07 2005
@@ -135,18 +135,20 @@ static my_bool show_plugins(THD *thd, st
     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();

--- 1.4/include/plugin.h	Wed Dec 28 13:05:20 2005
+++ 1.5/include/plugin.h	Thu Dec 29 21:24:06 2005
@@ -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.

--- 1.6/sql/sql_plugin.cc	Wed Dec 28 13:05:20 2005
+++ 1.7/sql/sql_plugin.cc	Thu Dec 29 21:24:06 2005
@@ -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_ver
 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 *na
       {
         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)

--- 1.3/sql/sql_plugin.h	Wed Dec 28 13:05:20 2005
+++ 1.4/sql/sql_plugin.h	Thu Dec 29 21:24:07 2005
@@ -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);

--- 1.8/client/mysqlslap.c	Thu Dec 29 13:37:33 2005
+++ 1.9/client/mysqlslap.c	Thu Dec 29 21:24:06 2005
@@ -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;
 
Thread
bk commit into 5.1 tree (serg:1.2009)Sergei Golubchik29 Dec