1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

after pull fixes

Browse Source
This commit is contained in:
serg@serg.mylan 2005-12-29 21:29:02 +01:00
parent 49e294de70
commit a2689bae45
5 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/mysqlslap.c
View File

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

9
include/plugin.h
View File

@ -138,10 +138,13 @@ enum enum_ft_token_type
and 0 means neither operator was used. and 0 means neither operator was used.
weight_adjust: A weighting factor that determines how much a match 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 for the word counts. Positive values increase, negative - decrease the
importance. 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 trunc: Corresponds to the '*' operator in the default setting of the
ft_boolean_syntax system variable. ft_boolean_syntax system variable.

14
sql/sql_plugin.cc
View File

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

2
sql/sql_plugin.h
View File

@ -53,7 +53,7 @@ struct st_plugin_int
extern char *opt_plugin_dir_ptr; extern char *opt_plugin_dir_ptr;
extern char opt_plugin_dir[FN_REFLEN]; 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 int plugin_init(void);
extern void plugin_load(void); extern void plugin_load(void);
extern void plugin_free(void); extern void plugin_free(void);

4
sql/sql_show.cc
View File

@ -135,7 +135,9 @@ static my_bool show_plugins(THD *thd, st_plugin_int *plugin,
DBUG_ASSERT(0); 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, 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); *(uint *)plug->info), cs);