Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty 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-10-18 14:06:32+02:00, mskold@stripped +2 -0
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
MERGE: 1.2303.1.13
mysql-test/r/ndb_charset.result@stripped, 2006-10-18 14:06:25+02:00, mskold@stripped +0 -0
Auto merged
MERGE: 1.10.1.1
sql/ha_ndbcluster.cc@stripped, 2006-10-18 14:06:26+02:00, mskold@stripped +0 -0
Auto merged
MERGE: 1.358.2.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: mskold
# Host: linux.site
# Root: /windows/Linux_space/MySQL/mysql-5.1-new-ndb/RESYNC
--- 1.360/sql/ha_ndbcluster.cc 2006-10-18 14:06:42 +02:00
+++ 1.361/sql/ha_ndbcluster.cc 2006-10-18 14:06:42 +02:00
@@ -10505,7 +10505,7 @@ static int ndbcluster_fill_files_table(h
while ((id= g_ndb_cluster_connection->get_next_node(iter)))
{
- uint c= 0;
+ init_fill_schema_files_row(table);
NdbDictionary::Datafile df= dict->getDatafile(id, elt.name);
ndberr= dict->getNdbError();
if(ndberr.classification != NdbError::NoError)
@@ -10523,76 +10523,48 @@ static int ndbcluster_fill_files_table(h
ERR_RETURN(ndberr);
}
- table->field[c++]->set_null(); // FILE_ID
- table->field[c]->set_notnull();
- table->field[c++]->store(elt.name, strlen(elt.name),
- system_charset_info);
- table->field[c]->set_notnull();
- table->field[c++]->store("DATAFILE",8,system_charset_info);
- table->field[c]->set_notnull();
- table->field[c++]->store(df.getTablespace(), strlen(df.getTablespace()),
- system_charset_info);
- table->field[c++]->set_null(); // TABLE_CATALOG
- table->field[c++]->set_null(); // TABLE_SCHEMA
- table->field[c++]->set_null(); // TABLE_NAME
-
- // LOGFILE_GROUP_NAME
- table->field[c]->set_notnull();
- table->field[c++]->store(ts.getDefaultLogfileGroup(),
- strlen(ts.getDefaultLogfileGroup()),
- system_charset_info);
- table->field[c++]->set_null(); // LOGFILE_GROUP_NUMBER
- table->field[c]->set_notnull();
- table->field[c++]->store(ndbcluster_hton_name,
- ndbcluster_hton_name_length,
- system_charset_info); // ENGINE
-
- table->field[c++]->set_null(); // FULLTEXT_KEYS
- table->field[c++]->set_null(); // DELETED_ROWS
- table->field[c++]->set_null(); // UPDATE_COUNT
- table->field[c]->set_notnull();
- table->field[c++]->store(df.getFree() / ts.getExtentSize()); // FREE_EXTENTS
- table->field[c]->set_notnull();
- table->field[c++]->store(df.getSize() / ts.getExtentSize()); // TOTAL_EXTENTS
- table->field[c]->set_notnull();
- table->field[c++]->store(ts.getExtentSize()); // EXTENT_SIZE
-
- table->field[c]->set_notnull();
- table->field[c++]->store(df.getSize()); // INITIAL_SIZE
- table->field[c]->set_notnull();
- table->field[c++]->store(df.getSize()); // MAXIMUM_SIZE
- table->field[c++]->set_null(); // AUTOEXTEND_SIZE
-
- table->field[c++]->set_null(); // CREATION_TIME
- table->field[c++]->set_null(); // LAST_UPDATE_TIME
- table->field[c++]->set_null(); // LAST_ACCESS_TIME
- table->field[c++]->set_null(); // RECOVER_TIME
- table->field[c++]->set_null(); // TRANSACTION_COUNTER
-
- table->field[c]->set_notnull();
- table->field[c++]->store(df.getObjectVersion()); // VERSION
-
- table->field[c]->set_notnull();
- table->field[c++]->store("FIXED", 5, system_charset_info); // ROW_FORMAT
-
- table->field[c++]->set_null(); // TABLE_ROWS
- table->field[c++]->set_null(); // AVG_ROW_LENGTH
- table->field[c++]->set_null(); // DATA_LENGTH
- table->field[c++]->set_null(); // MAX_DATA_LENGTH
- table->field[c++]->set_null(); // INDEX_LENGTH
- table->field[c++]->set_null(); // DATA_FREE
- table->field[c++]->set_null(); // CREATE_TIME
- table->field[c++]->set_null(); // UPDATE_TIME
- table->field[c++]->set_null(); // CHECK_TIME
- table->field[c++]->set_null(); // CHECKSUM
+ table->field[IS_FILES_FILE_NAME]->set_notnull();
+ table->field[IS_FILES_FILE_NAME]->store(elt.name, strlen(elt.name),
+ system_charset_info);
+ table->field[IS_FILES_FILE_TYPE]->set_notnull();
+ table->field[IS_FILES_FILE_TYPE]->store("DATAFILE",8,
+ system_charset_info);
+ table->field[IS_FILES_TABLESPACE_NAME]->set_notnull();
+ table->field[IS_FILES_TABLESPACE_NAME]->store(df.getTablespace(),
+ strlen(df.getTablespace()),
+ system_charset_info);
+ table->field[IS_FILES_LOGFILE_GROUP_NAME]->set_notnull();
+ table->field[IS_FILES_LOGFILE_GROUP_NAME]->
+ store(ts.getDefaultLogfileGroup(),
+ strlen(ts.getDefaultLogfileGroup()),
+ system_charset_info);
+ table->field[IS_FILES_ENGINE]->set_notnull();
+ table->field[IS_FILES_ENGINE]->store(ndbcluster_hton_name,
+ ndbcluster_hton_name_length,
+ system_charset_info);
+
+ table->field[IS_FILES_FREE_EXTENTS]->set_notnull();
+ table->field[IS_FILES_FREE_EXTENTS]->store(df.getFree()
+ / ts.getExtentSize());
+ table->field[IS_FILES_TOTAL_EXTENTS]->set_notnull();
+ table->field[IS_FILES_TOTAL_EXTENTS]->store(df.getSize()
+ / ts.getExtentSize());
+ table->field[IS_FILES_EXTENT_SIZE]->set_notnull();
+ table->field[IS_FILES_EXTENT_SIZE]->store(ts.getExtentSize());
+ table->field[IS_FILES_INITIAL_SIZE]->set_notnull();
+ table->field[IS_FILES_INITIAL_SIZE]->store(df.getSize());
+ table->field[IS_FILES_MAXIMUM_SIZE]->set_notnull();
+ table->field[IS_FILES_MAXIMUM_SIZE]->store(df.getSize());
+ table->field[IS_FILES_VERSION]->set_notnull();
+ table->field[IS_FILES_VERSION]->store(df.getObjectVersion());
- table->field[c]->set_notnull();
- table->field[c++]->store("NORMAL", 6, system_charset_info);
+ table->field[IS_FILES_ROW_FORMAT]->set_notnull();
+ table->field[IS_FILES_ROW_FORMAT]->store("FIXED", 5, system_charset_info);
char extra[30];
int len= my_snprintf(extra, sizeof(extra), "CLUSTER_NODE=%u", id);
- table->field[c]->store(extra, len, system_charset_info);
- table->field[c]->set_notnull();
+ table->field[IS_FILES_EXTRA]->set_notnull();
+ table->field[IS_FILES_EXTRA]->store(extra, len, system_charset_info);
schema_table_store_record(thd, table);
}
}
@@ -10631,76 +10603,43 @@ static int ndbcluster_fill_files_table(h
ERR_RETURN(ndberr);
}
- int c= 0;
- table->field[c++]->set_null(); // FILE_ID
- table->field[c]->set_notnull();
- table->field[c++]->store(elt.name, strlen(elt.name),
- system_charset_info);
- table->field[c]->set_notnull();
- table->field[c++]->store("UNDO LOG", 8, system_charset_info);
- table->field[c++]->set_null(); // TABLESPACE NAME
- table->field[c++]->set_null(); // TABLE_CATALOG
- table->field[c++]->set_null(); // TABLE_SCHEMA
- table->field[c++]->set_null(); // TABLE_NAME
-
- // LOGFILE_GROUP_NAME
+ init_fill_schema_files_row(table);
+ table->field[IS_FILES_FILE_NAME]->set_notnull();
+ table->field[IS_FILES_FILE_NAME]->store(elt.name, strlen(elt.name),
+ system_charset_info);
+ table->field[IS_FILES_FILE_TYPE]->set_notnull();
+ table->field[IS_FILES_FILE_TYPE]->store("UNDO LOG", 8,
+ system_charset_info);
NdbDictionary::ObjectId objid;
uf.getLogfileGroupId(&objid);
- table->field[c]->set_notnull();
- table->field[c++]->store(uf.getLogfileGroup(),
- strlen(uf.getLogfileGroup()),
- system_charset_info);
- table->field[c]->set_notnull();
- table->field[c++]->store(objid.getObjectId()); // LOGFILE_GROUP_NUMBER
- table->field[c]->set_notnull();
- table->field[c++]->store(ndbcluster_hton_name,
- ndbcluster_hton_name_length,
- system_charset_info); // ENGINE
-
- table->field[c++]->set_null(); // FULLTEXT_KEYS
- table->field[c++]->set_null(); // DELETED_ROWS
- table->field[c++]->set_null(); // UPDATE_COUNT
- table->field[c++]->set_null(); // FREE_EXTENTS
- table->field[c]->set_notnull();
- table->field[c++]->store(uf.getSize()/4); // TOTAL_EXTENTS
- table->field[c]->set_notnull();
- table->field[c++]->store(4); // EXTENT_SIZE
-
- table->field[c]->set_notnull();
- table->field[c++]->store(uf.getSize()); // INITIAL_SIZE
- table->field[c]->set_notnull();
- table->field[c++]->store(uf.getSize()); // MAXIMUM_SIZE
- table->field[c++]->set_null(); // AUTOEXTEND_SIZE
-
- table->field[c++]->set_null(); // CREATION_TIME
- table->field[c++]->set_null(); // LAST_UPDATE_TIME
- table->field[c++]->set_null(); // LAST_ACCESS_TIME
- table->field[c++]->set_null(); // RECOVER_TIME
- table->field[c++]->set_null(); // TRANSACTION_COUNTER
-
- table->field[c]->set_notnull();
- table->field[c++]->store(uf.getObjectVersion()); // VERSION
-
- table->field[c++]->set_null(); // ROW FORMAT
-
- table->field[c++]->set_null(); // TABLE_ROWS
- table->field[c++]->set_null(); // AVG_ROW_LENGTH
- table->field[c++]->set_null(); // DATA_LENGTH
- table->field[c++]->set_null(); // MAX_DATA_LENGTH
- table->field[c++]->set_null(); // INDEX_LENGTH
- table->field[c++]->set_null(); // DATA_FREE
- table->field[c++]->set_null(); // CREATE_TIME
- table->field[c++]->set_null(); // UPDATE_TIME
- table->field[c++]->set_null(); // CHECK_TIME
- table->field[c++]->set_null(); // CHECKSUM
+ table->field[IS_FILES_LOGFILE_GROUP_NAME]->set_notnull();
+ table->field[IS_FILES_LOGFILE_GROUP_NAME]->store(uf.getLogfileGroup(),
+ strlen(uf.getLogfileGroup()),
+ system_charset_info);
+ table->field[IS_FILES_LOGFILE_GROUP_NUMBER]->set_notnull();
+ table->field[IS_FILES_LOGFILE_GROUP_NUMBER]->store(objid.getObjectId());
+ table->field[IS_FILES_ENGINE]->set_notnull();
+ table->field[IS_FILES_ENGINE]->store(ndbcluster_hton_name,
+ ndbcluster_hton_name_length,
+ system_charset_info);
+
+ table->field[IS_FILES_TOTAL_EXTENTS]->set_notnull();
+ table->field[IS_FILES_TOTAL_EXTENTS]->store(uf.getSize()/4);
+ table->field[IS_FILES_EXTENT_SIZE]->set_notnull();
+ table->field[IS_FILES_EXTENT_SIZE]->store(4);
+
+ table->field[IS_FILES_INITIAL_SIZE]->set_notnull();
+ table->field[IS_FILES_INITIAL_SIZE]->store(uf.getSize());
+ table->field[IS_FILES_MAXIMUM_SIZE]->set_notnull();
+ table->field[IS_FILES_MAXIMUM_SIZE]->store(uf.getSize());
- table->field[c]->set_notnull();
- table->field[c++]->store("NORMAL", 6, system_charset_info);
+ table->field[IS_FILES_VERSION]->set_notnull();
+ table->field[IS_FILES_VERSION]->store(uf.getObjectVersion());
char extra[100];
int len= my_snprintf(extra,sizeof(extra),"CLUSTER_NODE=%u;UNDO_BUFFER_SIZE=%lu",id,lfg.getUndoBufferSize());
- table->field[c]->set_notnull();
- table->field[c]->store(extra, len, system_charset_info);
+ table->field[IS_FILES_EXTRA]->set_notnull();
+ table->field[IS_FILES_EXTRA]->store(extra, len, system_charset_info);
schema_table_store_record(thd, table);
}
}
@@ -10726,69 +10665,36 @@ static int ndbcluster_fill_files_table(h
ERR_RETURN(ndberr);
}
- int c= 0;
- table->field[c++]->set_null(); // FILE_ID
- table->field[c++]->set_null(); // name
- table->field[c]->set_notnull();
- table->field[c++]->store("UNDO LOG", 8, system_charset_info);
- table->field[c++]->set_null(); // TABLESPACE NAME
- table->field[c++]->set_null(); // TABLE_CATALOG
- table->field[c++]->set_null(); // TABLE_SCHEMA
- table->field[c++]->set_null(); // TABLE_NAME
-
- // LOGFILE_GROUP_NAME
- table->field[c]->set_notnull();
- table->field[c++]->store(elt.name, strlen(elt.name),
- system_charset_info);
- table->field[c]->set_notnull();
- table->field[c++]->store(lfg.getObjectId()); // LOGFILE_GROUP_NUMBER
- table->field[c]->set_notnull();
- table->field[c++]->store(ndbcluster_hton_name,
- ndbcluster_hton_name_length,
- system_charset_info); // ENGINE
-
- table->field[c++]->set_null(); // FULLTEXT_KEYS
- table->field[c++]->set_null(); // DELETED_ROWS
- table->field[c++]->set_null(); // UPDATE_COUNT
- table->field[c]->set_notnull();
- table->field[c++]->store(lfg.getUndoFreeWords()); // FREE_EXTENTS
- table->field[c++]->set_null(); //store(uf.getSize()/4); // TOTAL_EXTENTS
- table->field[c]->set_notnull();
- table->field[c++]->store(4); // EXTENT_SIZE
-
- table->field[c++]->set_null();//store(uf.getSize()); // INITIAL_SIZE
- table->field[c++]->set_null(); //store(uf.getSize()); // MAXIMUM_SIZE
- table->field[c++]->set_null(); // AUTOEXTEND_SIZE
-
- table->field[c++]->set_null(); // CREATION_TIME
- table->field[c++]->set_null(); // LAST_UPDATE_TIME
- table->field[c++]->set_null(); // LAST_ACCESS_TIME
- table->field[c++]->set_null(); // RECOVER_TIME
- table->field[c++]->set_null(); // TRANSACTION_COUNTER
-
- table->field[c]->set_notnull();
- table->field[c++]->store(lfg.getObjectVersion()); // VERSION
-
- table->field[c++]->set_null(); // ROW FORMAT
-
- table->field[c++]->set_null(); // TABLE_ROWS
- table->field[c++]->set_null(); // AVG_ROW_LENGTH
- table->field[c++]->set_null(); // DATA_LENGTH
- table->field[c++]->set_null(); // MAX_DATA_LENGTH
- table->field[c++]->set_null(); // INDEX_LENGTH
- table->field[c++]->set_null(); // DATA_FREE
- table->field[c++]->set_null(); // CREATE_TIME
- table->field[c++]->set_null(); // UPDATE_TIME
- table->field[c++]->set_null(); // CHECK_TIME
- table->field[c++]->set_null(); // CHECKSUM
+ init_fill_schema_files_row(table);
+ table->field[IS_FILES_FILE_TYPE]->set_notnull();
+ table->field[IS_FILES_FILE_TYPE]->store("UNDO LOG", 8,
+ system_charset_info);
+
+ table->field[IS_FILES_LOGFILE_GROUP_NAME]->set_notnull();
+ table->field[IS_FILES_LOGFILE_GROUP_NAME]->store(elt.name,
+ strlen(elt.name),
+ system_charset_info);
+ table->field[IS_FILES_LOGFILE_GROUP_NUMBER]->set_notnull();
+ table->field[IS_FILES_LOGFILE_GROUP_NUMBER]->store(lfg.getObjectId());
+ table->field[IS_FILES_ENGINE]->set_notnull();
+ table->field[IS_FILES_ENGINE]->store(ndbcluster_hton_name,
+ ndbcluster_hton_name_length,
+ system_charset_info);
+
+ table->field[IS_FILES_FREE_EXTENTS]->set_notnull();
+ table->field[IS_FILES_FREE_EXTENTS]->store(lfg.getUndoFreeWords());
+ table->field[IS_FILES_EXTENT_SIZE]->set_notnull();
+ table->field[IS_FILES_EXTENT_SIZE]->store(4);
- table->field[c]->set_notnull();
- table->field[c++]->store("NORMAL", 6, system_charset_info);
+ table->field[IS_FILES_VERSION]->set_notnull();
+ table->field[IS_FILES_VERSION]->store(lfg.getObjectVersion());
char extra[100];
- int len= my_snprintf(extra,sizeof(extra),"UNDO_BUFFER_SIZE=%lu",id,lfg.getUndoBufferSize());
- table->field[c]->set_notnull();
- table->field[c]->store(extra, len, system_charset_info);
+ int len= my_snprintf(extra,sizeof(extra),
+ "UNDO_BUFFER_SIZE=%lu",
+ lfg.getUndoBufferSize());
+ table->field[IS_FILES_EXTRA]->set_notnull();
+ table->field[IS_FILES_EXTRA]->store(extra, len, system_charset_info);
schema_table_store_record(thd, table);
}
DBUG_RETURN(0);
--- 1.13/mysql-test/r/ndb_charset.result 2006-10-18 14:06:42 +02:00
+++ 1.14/mysql-test/r/ndb_charset.result 2006-10-18 14:06:42 +02:00
@@ -186,9 +186,6 @@ p a
4 aAa
5 aaa
6 AAA
-explain select * from t1 where a = 'zZz' order by p;
-id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 const a NULL NULL NULL 1
select * from t1 where a = 'aAa' order by p;
p a
1 aAa
@@ -223,9 +220,6 @@ p a
4 aAa
5 aaa
6 AAA
-explain select * from t1 where a = 'zZz' order by p;
-id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 const a NULL NULL NULL 1
select * from t1 where a = 'aAa' order by p;
p a
1 aAa
| Thread |
|---|
| • bk commit into 5.1 tree (mskold:1.2313) | Martin Skold | 18 Oct |
