Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony 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-12-01 21:08:56-08:00, antony@stripped +8 -0
Merge ppcg5.local:/Users/antony/Work/mysql-5.1-engines
into ppcg5.local:/Users/antony/Work/mysql-5.1-engines-merge
MERGE: 1.2303.28.4
BitKeeper/deleted/.del-CMakeLists.txt~1@stripped, 2006-12-01 21:07:06-08:00, antony@stripped +0 -2
Auto merged
MERGE: 1.3.1.1
BitKeeper/deleted/.del-make_win_bin_dist@stripped, 2006-12-01 21:07:06-08:00, antony@stripped +0 -0
Auto merged
MERGE: 1.2.1.1
configure.in@stripped, 2006-12-01 21:08:52-08:00, antony@stripped +1 -0
auto merge didn't work here
MERGE: 1.385.3.2
include/mysql.h@stripped, 2006-12-01 21:07:06-08:00, antony@stripped +0 -0
Auto merged
MERGE: 1.167.3.1
libmysqld/lib_sql.cc@stripped, 2006-12-01 21:07:06-08:00, antony@stripped +0 -0
Auto merged
MERGE: 1.120.3.1
sql/sql_insert.cc@stripped, 2006-12-01 21:07:07-08:00, antony@stripped +0 -0
Auto merged
MERGE: 1.230.5.1
sql/sql_plugin.cc@stripped, 2006-12-01 21:07:07-08:00, antony@stripped +0 -0
Auto merged
MERGE: 1.36.1.4
storage/myisam/mi_dynrec.c@stripped, 2006-12-01 21:07:07-08:00, antony@stripped +0 -0
Auto merged
MERGE: 1.49.1.1
# 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: antony
# Host: ppcg5.local
# Root: /Users/antony/Work/mysql-5.1-engines-merge/RESYNC
--- 1.401/configure.in 2006-12-01 21:09:05 -08:00
+++ 1.402/configure.in 2006-12-01 21:09:05 -08:00
@@ -15,6 +15,7 @@
# See the libtool docs for information on how to do shared lib versions.
SHARED_LIB_MAJOR_VERSION=15
SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0
+
# Set all version vars based on $VERSION. How do we do this more elegant ?
# Remember that regexps needs to quote [ and ] since this is run through m4
MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"`
--- 1.50/storage/myisam/mi_dynrec.c 2006-12-01 21:09:05 -08:00
+++ 1.51/storage/myisam/mi_dynrec.c 2006-12-01 21:09:05 -08:00
@@ -1242,8 +1242,8 @@
err:
my_errno= HA_ERR_WRONG_IN_RECORD;
- DBUG_PRINT("error",("to_end: %lx -> %lx from_end: %lx -> %lx",
- to,to_end,from,from_end));
+ DBUG_PRINT("error",("to_end: 0x%lx -> 0x%lx from_end: 0x%lx -> 0x%lx",
+ (long) to, (long) to_end, (long) from, (long) from_end));
DBUG_DUMP("from",(byte*) info->rec_buff,info->s->base.min_pack_length);
DBUG_RETURN(MY_FILE_ERROR);
} /* _mi_rec_unpack */
--- 1.235/sql/sql_insert.cc 2006-12-01 21:09:05 -08:00
+++ 1.236/sql/sql_insert.cc 2006-12-01 21:09:05 -08:00
@@ -1808,8 +1808,6 @@
delayed_insert *tmp;
while ((tmp=it++))
{
- /* Ensure that the thread doesn't kill itself while we are looking at it */
- pthread_mutex_lock(&tmp->mutex);
tmp->thd.killed= THD::KILL_CONNECTION;
if (tmp->thd.mysys_var)
{
@@ -1828,7 +1826,6 @@
}
pthread_mutex_unlock(&tmp->thd.mysys_var->mutex);
}
- pthread_mutex_unlock(&tmp->mutex);
}
VOID(pthread_mutex_unlock(&LOCK_delayed_insert)); // For unlink from list
}
--- 1.37/sql/sql_plugin.cc 2006-12-01 21:09:05 -08:00
+++ 1.38/sql/sql_plugin.cc 2006-12-01 21:09:05 -08:00
@@ -23,21 +23,26 @@
char *opt_plugin_dir_ptr;
char opt_plugin_dir[FN_REFLEN];
+/*
+ When you ad a new plugin type, add both a string and make sure that the
+ init and deinit array are correctly updated.
+*/
const LEX_STRING plugin_type_names[MYSQL_MAX_PLUGIN_TYPE_NUM]=
{
{ C_STRING_WITH_LEN("UDF") },
{ C_STRING_WITH_LEN("STORAGE ENGINE") },
- { C_STRING_WITH_LEN("FTPARSER") }
+ { C_STRING_WITH_LEN("FTPARSER") },
+ { C_STRING_WITH_LEN("DAEMON") }
};
plugin_type_init plugin_type_initialize[MYSQL_MAX_PLUGIN_TYPE_NUM]=
{
- 0,ha_initialize_handlerton,0
+ 0,ha_initialize_handlerton,0,0
};
plugin_type_init plugin_type_deinitialize[MYSQL_MAX_PLUGIN_TYPE_NUM]=
{
- 0,ha_finalize_handlerton,0
+ 0,ha_finalize_handlerton,0,0
};
static const char *plugin_interface_version_sym=
@@ -53,13 +58,15 @@
{
0x0000,
MYSQL_HANDLERTON_INTERFACE_VERSION,
- MYSQL_FTPARSER_INTERFACE_VERSION
+ MYSQL_FTPARSER_INTERFACE_VERSION,
+ MYSQL_DAEMON_INTERFACE_VERSION
};
static int cur_plugin_info_interface_version[MYSQL_MAX_PLUGIN_TYPE_NUM]=
{
0x0000, /* UDF: not implemented */
MYSQL_HANDLERTON_INTERFACE_VERSION,
- MYSQL_FTPARSER_INTERFACE_VERSION
+ MYSQL_FTPARSER_INTERFACE_VERSION,
+ MYSQL_DAEMON_INTERFACE_VERSION
};
static DYNAMIC_ARRAY plugin_dl_array;
@@ -502,13 +509,13 @@
if ((*plugin_type_deinitialize[plugin->plugin->type])(plugin))
{
sql_print_error("Plugin '%s' of type %s failed deinitialization",
- plugin->name.str, plugin_type_names[plugin->plugin->type]);
+ plugin->name.str, plugin_type_names[plugin->plugin->type].str);
}
}
else if (plugin->plugin->deinit)
{
DBUG_PRINT("info", ("Deinitializing plugin: '%s'", plugin->name.str));
- if (plugin->plugin->deinit(NULL))
+ if (plugin->plugin->deinit(plugin))
{
DBUG_PRINT("warning", ("Plugin '%s' deinit function returned error.",
plugin->name.str));
@@ -562,13 +569,13 @@
if ((*plugin_type_initialize[plugin->plugin->type])(plugin))
{
sql_print_error("Plugin '%s' registration as a %s failed.",
- plugin->name.str, plugin_type_names[plugin->plugin->type]);
+ plugin->name.str, plugin_type_names[plugin->plugin->type].str);
goto err;
}
}
else if (plugin->plugin->init)
{
- if (plugin->plugin->init(NULL))
+ if (plugin->plugin->init(plugin))
{
sql_print_error("Plugin '%s' init function returned error.",
plugin->name.str);
@@ -727,7 +734,7 @@
TABLE_LIST tables;
TABLE *table;
READ_RECORD read_record_info;
- int error, i;
+ int error;
MEM_ROOT mem;
THD *new_thd;
DBUG_ENTER("plugin_load");
| Thread |
|---|
| • bk commit into 5.1 tree (antony:1.2370) | antony | 2 Dec |
