database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Removed getTableForAlteration

Browse Source
This commit is contained in:
unknown
2004-12-07 10:27:22 +01:00
parent e2d4dc23c4
commit a700754e71
4 changed files with 4 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ndb/include/ndbapi/NdbDictionary.hpp
View File

@ -982,20 +982,6 @@ public:
*/ */
const Table * getTable(const char * name); const Table * getTable(const char * name);
/**
* Get table with given name for alteration.
* @param name Name of table to alter
* @return table if successful. NULL if undefined
*/
Table getTableForAlteration(const char * name);
/**
* Get copy a copy of a table for alteration.
* @param table Table object to alter
* @return table if successful. NULL if undefined
*/
Table getTableForAlteration(const Table &);
#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL #ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
/** /**
* Invalidate cached table object * Invalidate cached table object

13
ndb/src/ndbapi/NdbDictionary.cpp
View File

@ -773,19 +773,6 @@ NdbDictionary::Dictionary::removeCachedTable(const char * name){
m_impl.removeCachedObject(* t); m_impl.removeCachedObject(* t);
} }
NdbDictionary::Table
NdbDictionary::Dictionary::getTableForAlteration(const char * name){
const Table * oldTable = getTable(name);
return (oldTable) ?
NdbDictionary::Table(*oldTable)
: NdbDictionary::Table();
}
NdbDictionary::Table
NdbDictionary::Dictionary::getTableForAlteration(const Table & tab){
return NdbDictionary::Table(tab);
}
int int
NdbDictionary::Dictionary::createIndex(const Index & ind) NdbDictionary::Dictionary::createIndex(const Index & ind)
{ {

6
ndb/test/ndbapi/testDict.cpp
View File

@ -1211,7 +1211,7 @@ runTableRename(NDBT_Context* ctx, NDBT_Step* step){
const NdbDictionary::Table * oldTable = dict->getTable(pTabName.c_str()); const NdbDictionary::Table * oldTable = dict->getTable(pTabName.c_str());
if (oldTable) { if (oldTable) {
NdbDictionary::Table newTable = dict->getTableForAlteration(pTabName.c_str()); NdbDictionary::Table newTable = *oldTable;
newTable.setName(pTabNewName.c_str()); newTable.setName(pTabNewName.c_str());
CHECK2(dict->alterTable(newTable) == 0, CHECK2(dict->alterTable(newTable) == 0,
"TableRename failed"); "TableRename failed");
@ -1280,7 +1280,7 @@ runTableRenameNF(NDBT_Context* ctx, NDBT_Step* step){
const NdbDictionary::Table * oldTable = dict->getTable(pTabName.c_str()); const NdbDictionary::Table * oldTable = dict->getTable(pTabName.c_str());
if (oldTable) { if (oldTable) {
NdbDictionary::Table newTable = dict->getTableForAlteration(pTabName.c_str()); NdbDictionary::Table newTable = *oldTable;
newTable.setName(pTabNewName.c_str()); newTable.setName(pTabNewName.c_str());
CHECK2(dict->alterTable(newTable) == 0, CHECK2(dict->alterTable(newTable) == 0,
"TableRename failed"); "TableRename failed");
@ -1377,7 +1377,7 @@ runTableRenameSR(NDBT_Context* ctx, NDBT_Step* step){
const NdbDictionary::Table * oldTable = dict->getTable(pTabName.c_str()); const NdbDictionary::Table * oldTable = dict->getTable(pTabName.c_str());
if (oldTable) { if (oldTable) {
NdbDictionary::Table newTable = dict->getTableForAlteration(pTabName.c_str()); NdbDictionary::Table newTable = *oldTable;
newTable.setName(pTabNewName.c_str()); newTable.setName(pTabNewName.c_str());
CHECK2(dict->alterTable(newTable) == 0, CHECK2(dict->alterTable(newTable) == 0,
"TableRename failed"); "TableRename failed");

2
sql/ha_ndbcluster.cc
View File

@ -3670,7 +3670,7 @@ int ha_ndbcluster::alter_table_name(const char *to)
int ret; int ret;
DBUG_ENTER("alter_table_name_table"); DBUG_ENTER("alter_table_name_table");
NdbDictionary::Table new_tab= dict->getTableForAlteration(*orig_tab); NdbDictionary::Table new_tab= *orig_tab;
new_tab.setName(to); new_tab.setName(to);
if (dict->alterTable(new_tab) != 0) if (dict->alterTable(new_tab) != 0)
ERR_RETURN(dict->getNdbError()); ERR_RETURN(dict->getNdbError());