Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
885a9d6e
Commit
885a9d6e
authored
Dec 07, 2004
by
mskold@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed getTableForAlteration
parent
36a16ffb
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
31 deletions
+4
-31
ndb/include/ndbapi/NdbDictionary.hpp
ndb/include/ndbapi/NdbDictionary.hpp
+0
-14
ndb/src/ndbapi/NdbDictionary.cpp
ndb/src/ndbapi/NdbDictionary.cpp
+0
-13
ndb/test/ndbapi/testDict.cpp
ndb/test/ndbapi/testDict.cpp
+3
-3
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+1
-1
No files found.
ndb/include/ndbapi/NdbDictionary.hpp
View file @
885a9d6e
...
@@ -982,20 +982,6 @@ public:
...
@@ -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
...
...
ndb/src/ndbapi/NdbDictionary.cpp
View file @
885a9d6e
...
@@ -773,19 +773,6 @@ NdbDictionary::Dictionary::removeCachedTable(const char * name){
...
@@ -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
)
{
{
...
...
ndb/test/ndbapi/testDict.cpp
View file @
885a9d6e
...
@@ -1211,7 +1211,7 @@ runTableRename(NDBT_Context* ctx, NDBT_Step* step){
...
@@ -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){
...
@@ -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){
...
@@ -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"
);
...
...
sql/ha_ndbcluster.cc
View file @
885a9d6e
...
@@ -3670,7 +3670,7 @@ int ha_ndbcluster::alter_table_name(const char *to)
...
@@ -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
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment