database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb

Browse Source 
into mc05.(none):/space2/tomas/mysql-4.1


ndb/include/ndbapi/Ndb.hpp:
  Auto merged
ndb/src/kernel/blocks/backup/restore/Restore.hpp:
  Auto merged
ndb/src/kernel/blocks/backup/restore/main.cpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/test/ndbapi/testGrepVerify.cpp:
  Auto merged
ndb/tools/listTables.cpp:
  Auto merged
This commit is contained in:
unknown
2004-05-27 11:36:09 +02:00
parent 94fc67f54f a22a7fda0d
commit 9b2682e65e
14 changed files with 117 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ndb/include/ndbapi/Ndb.hpp
View File

@ -1361,9 +1361,9 @@ public:
* index names as DATABASENAME/SCHEMANAME/TABLENAME/INDEXNAME
* @param turnNamingOn bool true - turn naming on, false - turn naming off
*/
static void useFullyQualifiedNames(bool turnNamingOn = true);
void useFullyQualifiedNames(bool turnNamingOn = true);
static bool usingFullyQualifiedNames();
bool usingFullyQualifiedNames();
/** @} *********************************************************************/
@ -1542,10 +1542,12 @@ private:
void abortTransactionsAfterNodeFailure(Uint16 aNodeId);
static
const char * externalizeTableName(const char * internalTableName, bool fullyQualifiedNames);
const char * externalizeTableName(const char * internalTableName);
const char * internalizeTableName(const char * externalTableName);
static
const char * externalizeIndexName(const char * internalIndexName, bool fullyQualifiedNames);
const char * externalizeIndexName(const char * internalIndexName);
const char * internalizeIndexName(const NdbTableImpl * table,
const char * externalIndexName);
@ -1582,6 +1584,8 @@ private:
NdbWaiter theWaiter;
bool fullyQualifiedNames;
// Ndb database name.
char theDataBase[NDB_MAX_DATABASE_NAME_SIZE];
// Ndb database schema name.