Below is the list of changes that have just been committed into a local
5.1 repository of root. When root 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-08-28 16:26:36+00:00, lzhou@stripped +7 -0
Merge lzhou@stripped:/home/bk/mysql-5.1-ndb
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/mysql-5.1-ndb-bj
MERGE: 1.2273.1.23
sql/ha_ndbcluster.cc@stripped, 2006-08-28 16:26:30+00:00, lzhou@stripped +0 -0
Auto merged
MERGE: 1.348.4.7
sql/sql_base.cc@stripped, 2006-08-28 16:26:31+00:00, lzhou@stripped +0 -0
Auto merged
MERGE: 1.342.1.5
sql/sql_view.cc@stripped, 2006-08-28 16:26:31+00:00, lzhou@stripped +0 -0
Auto merged
MERGE: 1.101.4.1
sql/table.cc@stripped, 2006-08-28 16:26:31+00:00, lzhou@stripped +0 -0
Auto merged
MERGE: 1.239.1.1
storage/ndb/src/mgmclient/CommandInterpreter.cpp@stripped, 2006-08-28 16:26:31+00:00, lzhou@stripped +0 -0
Auto merged
MERGE: 1.64.2.1
storage/ndb/src/mgmsrv/ConfigInfo.cpp@stripped, 2006-08-28 16:26:31+00:00, lzhou@stripped +0 -0
Auto merged
MERGE: 1.85.4.1
storage/ndb/src/ndbapi/ndberror.c@stripped, 2006-08-28 16:26:31+00:00, lzhou@stripped +0 -0
Auto merged
MERGE: 1.69.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: lzhou
# Host: dev3-138.dev.cn.tlan
# Root: /home/zhl/mysql/mysql-5.1/mysql-5.1-ndb-bj/RESYNC
--- 1.240/sql/table.cc 2006-08-28 16:26:42 +00:00
+++ 1.241/sql/table.cc 2006-08-28 16:26:42 +00:00
@@ -456,8 +456,10 @@
share->frm_version= FRM_VER_TRUE_VARCHAR;
#ifdef WITH_PARTITION_STORAGE_ENGINE
- share->default_part_db_type=
- ha_checktype(thd, (enum legacy_db_type) (uint) *(head+61), 0, 0);
+ if (*(head+61) &&
+ !(share->default_part_db_type=
+ ha_checktype(thd, (enum legacy_db_type) (uint) *(head+61), 1, 0)))
+ goto err;
DBUG_PRINT("info", ("default_part_db_type = %u", head[61]));
#endif
legacy_db_type= (enum legacy_db_type) (uint) *(head+3);
--- 1.105/sql/sql_view.cc 2006-08-28 16:26:42 +00:00
+++ 1.106/sql/sql_view.cc 2006-08-28 16:26:42 +00:00
@@ -1001,7 +1001,8 @@
}
}
else if (!table->prelocking_placeholder &&
- old_lex->sql_command == SQLCOM_SHOW_CREATE)
+ old_lex->sql_command == SQLCOM_SHOW_CREATE &&
+ !table->belong_to_view)
{
if (check_table_access(thd, SHOW_VIEW_ACL, table, 0))
goto err;
--- 1.70/storage/ndb/src/mgmclient/CommandInterpreter.cpp 2006-08-28 16:26:42 +00:00
+++ 1.71/storage/ndb/src/mgmclient/CommandInterpreter.cpp 2006-08-28 16:26:42 +00:00
@@ -1498,6 +1498,7 @@
if(it == 0){
ndbout_c("Unable to create config iterator");
+ ndb_mgm_destroy_configuration(conf);
return;
}
NdbAutoPtr<ndb_mgm_configuration_iterator> ptr(it);
@@ -1542,6 +1543,7 @@
print_nodes(state, it, "ndb_mgmd", mgm_nodes, NDB_MGM_NODE_TYPE_MGM, 0);
print_nodes(state, it, "mysqld", api_nodes, NDB_MGM_NODE_TYPE_API, 0);
// ndbout << helpTextShow;
+ ndb_mgm_destroy_configuration(conf);
return;
} else if (strcasecmp(parameters, "PROPERTIES") == 0 ||
strcasecmp(parameters, "PROP") == 0) {
--- 1.352/sql/ha_ndbcluster.cc 2006-08-28 16:26:42 +00:00
+++ 1.353/sql/ha_ndbcluster.cc 2006-08-28 16:26:42 +00:00
@@ -47,6 +47,7 @@
// options from from mysqld.cc
extern my_bool opt_ndb_optimized_node_selection;
extern const char *opt_ndbcluster_connectstring;
+extern ulong opt_ndb_cache_check_time;
const char *ndb_distribution_names[]= {"KEYHASH", "LINHASH", NullS};
TYPELIB ndb_distribution_typelib= { array_elements(ndb_distribution_names)-1,
@@ -256,7 +257,7 @@
}
inline
-int execute_no_commit(ha_ndbcluster *h, NdbTransaction *trans,
+int execute_no_commit(ha_ndbcluster *h, NdbTransaction *trans,
bool force_release)
{
#ifdef NOT_USED
@@ -299,7 +300,7 @@
}
inline
-int execute_no_commit_ie(ha_ndbcluster *h, NdbTransaction *trans,
+int execute_no_commit_ie(ha_ndbcluster *h, NdbTransaction *trans,
bool force_release)
{
#ifdef NOT_USED
@@ -6468,6 +6469,7 @@
pthread_cond_init(&COND_ndb_util_thread, NULL);
+ ndb_cache_check_time = opt_ndb_cache_check_time;
// Create utility thread
pthread_t tmp;
if (pthread_create(&tmp, &connection_attrib, ndb_util_thread_func, 0))
@@ -7585,6 +7587,30 @@
DBUG_RETURN(error);
}
+void
+ha_ndbcluster::release_completed_operations(NdbTransaction *trans,
+ bool force_release)
+{
+ if (trans->hasBlobOperation())
+ {
+ /* We are reading/writing BLOB fields,
+ releasing operation records is unsafe
+ */
+ return;
+ }
+ if (!force_release)
+ {
+ if (get_thd_ndb(current_thd)->query_state & NDB_QUERY_MULTI_READ_RANGE)
+ {
+ /* We are batching reads and have not consumed all fetched
+ rows yet, releasing operation records is unsafe
+ */
+ return;
+ }
+ }
+ trans->releaseCompletedOperations();
+}
+
int
ha_ndbcluster::read_multi_range_first(KEY_MULTI_RANGE **found_range_p,
KEY_MULTI_RANGE *ranges,
@@ -9585,24 +9611,6 @@
}
DBUG_RETURN(0);
-}
-
-
-void
-ha_ndbcluster::release_completed_operations(NdbTransaction *trans,
- bool force_release)
-{
- if (!force_release)
- {
- if (get_thd_ndb(current_thd)->query_state & NDB_QUERY_MULTI_READ_RANGE)
- {
- /* We are batching reads and have not consumed all fetched
- rows yet, releasing operation records is unsafe
- */
- return;
- }
- }
- trans->releaseCompletedOperations();
}
/*
--- 1.71/storage/ndb/src/ndbapi/ndberror.c 2006-08-28 16:26:42 +00:00
+++ 1.72/storage/ndb/src/ndbapi/ndberror.c 2006-08-28 16:26:42 +00:00
@@ -439,7 +439,7 @@
{ 1305, DMEC, IE, "Backup definition not implemented" },
{ 1306, DMEC, AE, "Backup not supported in diskless mode (change Diskless)" },
- { 1321, DMEC, IE, "Backup aborted by application" },
+ { 1321, DMEC, UD, "Backup aborted by user request" },
{ 1322, DMEC, IE, "Backup already completed" },
{ 1323, DMEC, IE, "1323" },
{ 1324, DMEC, IE, "Backup log buffer full" },
| Thread |
|---|
| • bk commit into 5.1 tree (lzhou:1.2282) | lzhou | 28 Aug |
