Below is the list of changes that have just been committed into a local
5.1 repository of baker. When baker 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-11-22 05:54:30+01:00, baker@stripped +6 -0
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
MERGE: 1.2353.1.17
configure.in@stripped, 2006-11-22 05:54:23+01:00, baker@stripped +0 -0
Auto merged
MERGE: 1.396.1.3
sql/field.cc@stripped, 2006-11-22 05:54:24+01:00, baker@stripped +0 -0
Auto merged
MERGE: 1.349.1.1
sql/field.h@stripped, 2006-11-22 05:54:24+01:00, baker@stripped +0 -0
Auto merged
MERGE: 1.190.1.1
sql/mysql_priv.h@stripped, 2006-11-22 05:54:24+01:00, baker@stripped +0 -0
Auto merged
MERGE: 1.455.1.1
sql/mysqld.cc@stripped, 2006-11-22 05:54:24+01:00, baker@stripped +0 -0
Auto merged
MERGE: 1.589.1.1
storage/federated/ha_federated.cc@stripped, 2006-11-22 05:54:24+01:00, baker@stripped +0 -0
Auto merged
MERGE: 1.84.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: baker
# Host: bk-internal.mysql.com
# Root: /data0/bk/mysql-5.1-arch/RESYNC
--- 1.398/configure.in 2006-11-22 05:54:37 +01:00
+++ 1.399/configure.in 2006-11-22 05:54:37 +01:00
@@ -15,7 +15,6 @@
# 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.352/sql/field.cc 2006-11-22 05:54:37 +01:00
+++ 1.353/sql/field.cc 2006-11-22 05:54:37 +01:00
@@ -6658,9 +6658,9 @@
}
-uint32 Field_varstring::data_length(const char *from)
+uint32 Field_varstring::data_length()
{
- return length_bytes == 1 ? (uint) (uchar) *ptr : uint2korr(ptr);
+ return length_bytes == 1 ? (uint32) (uchar) *ptr : uint2korr(ptr);
}
/*
--- 1.191/sql/field.h 2006-11-22 05:54:37 +01:00
+++ 1.192/sql/field.h 2006-11-22 05:54:37 +01:00
@@ -153,7 +153,7 @@
/*
data_length() return the "real size" of the data in memory.
*/
- virtual uint32 data_length(const char *from) { return pack_length(); }
+ virtual uint32 data_length() { return pack_length(); }
virtual uint32 sort_length() const { return pack_length(); }
virtual void reset(void) { bzero(ptr,pack_length()); }
virtual void reset_fields() {}
@@ -239,7 +239,7 @@
*/
my_size_t last_null_byte() const {
my_size_t bytes= do_last_null_byte();
- DBUG_PRINT("debug", ("last_null_byte() ==> %d", bytes));
+ DBUG_PRINT("debug", ("last_null_byte() ==> %d", (uint32)bytes));
DBUG_ASSERT(bytes <= table->s->null_bytes);
return bytes;
}
@@ -1174,7 +1174,7 @@
int key_cmp(const byte *str, uint length);
uint packed_col_length(const char *to, uint length);
uint max_packed_col_length(uint max_length);
- uint32 data_length(const char *from);
+ uint32 data_length();
uint size_of() const { return sizeof(*this); }
enum_field_types real_type() const { return MYSQL_TYPE_VARCHAR; }
bool has_charset(void) const
--- 1.457/sql/mysql_priv.h 2006-11-22 05:54:37 +01:00
+++ 1.458/sql/mysql_priv.h 2006-11-22 05:54:37 +01:00
@@ -1651,14 +1651,9 @@
/* optional things, have_* variables */
extern SHOW_COMP_OPTION have_innodb;
-extern SHOW_COMP_OPTION have_example_db;
-extern SHOW_COMP_OPTION have_archive_db;
extern SHOW_COMP_OPTION have_csv_db;
-extern SHOW_COMP_OPTION have_federated_db;
-extern SHOW_COMP_OPTION have_blackhole_db;
extern SHOW_COMP_OPTION have_ndbcluster;
extern SHOW_COMP_OPTION have_partition_db;
-extern SHOW_COMP_OPTION have_merge_db;
extern handlerton *partition_hton;
extern handlerton *myisam_hton;
--- 1.591/sql/mysqld.cc 2006-11-22 05:54:37 +01:00
+++ 1.592/sql/mysqld.cc 2006-11-22 05:54:37 +01:00
@@ -3149,11 +3149,6 @@
}
if (global_system_variables.binlog_format == BINLOG_FORMAT_UNSPEC)
{
-#if defined(HAVE_NDB_BINLOG) && defined(HAVE_ROW_BASED_REPLICATION)
- if (opt_bin_log && have_ndbcluster == SHOW_OPTION_YES)
- global_system_variables.binlog_format= BINLOG_FORMAT_ROW;
- else
-#endif
#if defined(HAVE_ROW_BASED_REPLICATION)
global_system_variables.binlog_format= BINLOG_FORMAT_MIXED;
#else
--- 1.85/storage/federated/ha_federated.cc 2006-11-22 05:54:37 +01:00
+++ 1.86/storage/federated/ha_federated.cc 2006-11-22 05:54:37 +01:00
@@ -350,7 +350,6 @@
/* Variables for federated share methods */
static HASH federated_open_tables; // To track open tables
pthread_mutex_t federated_mutex; // To init the hash
-static int federated_init= FALSE; // Checking the state of hash
/* Variables used when chopping off trailing characters */
static const uint sizeof_trailing_comma= sizeof(", ") - 1;
@@ -365,7 +364,6 @@
static int federated_commit(handlerton *hton, THD *thd, bool all);
static int federated_rollback(handlerton *hton, THD *thd, bool all);
static int federated_db_init(void);
-static int federated_db_end(handlerton *hton, ha_panic_function type);
/* Federated storage engine handlerton */
@@ -408,7 +406,6 @@
federated_hton->commit= federated_commit;
federated_hton->rollback= federated_rollback;
federated_hton->create= federated_create_handler;
- federated_hton->panic= federated_db_end;
federated_hton->flags= HTON_ALTER_NOT_SUPPORTED;
if (pthread_mutex_init(&federated_mutex, MY_MUTEX_INIT_FAST))
@@ -416,13 +413,11 @@
if (!hash_init(&federated_open_tables, &my_charset_bin, 32, 0, 0,
(hash_get_key) federated_get_key, 0, 0))
{
- federated_init= TRUE;
DBUG_RETURN(FALSE);
}
VOID(pthread_mutex_destroy(&federated_mutex));
error:
- have_federated_db= SHOW_OPTION_DISABLED; // If we couldn't use handler
DBUG_RETURN(TRUE);
}
@@ -437,14 +432,11 @@
FALSE OK
*/
-int federated_db_end(handlerton *hton, ha_panic_function type)
+int federated_done(void *p)
{
- if (federated_init)
- {
- hash_free(&federated_open_tables);
- VOID(pthread_mutex_destroy(&federated_mutex));
- }
- federated_init= 0;
+ hash_free(&federated_open_tables);
+ VOID(pthread_mutex_destroy(&federated_mutex));
+
return 0;
}
@@ -2897,7 +2889,7 @@
"Federated MySQL storage engine",
PLUGIN_LICENSE_GPL,
federated_db_init, /* Plugin Init */
- NULL, /* Plugin Deinit */
+ federated_done, /* Plugin Deinit */
0x0100 /* 1.0 */,
NULL, /* status variables */
NULL, /* system variables */
| Thread |
|---|
| • bk commit into 5.1 tree (baker:1.2359) | Brian Aker | 22 Nov |
