2004-04-14 10:53:21 +02:00
|
|
|
/* Copyright (C) 2003 MySQL AB
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
|
2004-05-07 08:39:42 +02:00
|
|
|
#include <ndb_global.h>
|
2004-04-14 10:53:21 +02:00
|
|
|
|
|
|
|
#include <NdbOut.hpp>
|
|
|
|
#include <NdbApi.hpp>
|
|
|
|
#include <NDBT.hpp>
|
|
|
|
|
|
|
|
#include <getarg.h>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int main(int argc, const char** argv){
|
2004-09-15 11:49:18 +02:00
|
|
|
ndb_init();
|
2004-04-14 10:53:21 +02:00
|
|
|
|
|
|
|
int _temp = false;
|
|
|
|
int _help = 0;
|
|
|
|
int _all = 0;
|
|
|
|
int _print = 0;
|
|
|
|
const char* _connectstr = NULL;
|
|
|
|
|
|
|
|
struct getargs args[] = {
|
|
|
|
{ "all", 'a', arg_flag, &_all, "Create/print all tables" },
|
|
|
|
{ "print", 'p', arg_flag, &_print, "Print table(s) instead of creating it"},
|
|
|
|
{ "temp", 't', arg_flag, &_temp, "Temporary table", "temp" },
|
|
|
|
{ "connstr", 'c', arg_string, &_connectstr, "connect string",
|
|
|
|
"How to connect to NDB"},
|
|
|
|
{ "usage", '?', arg_flag, &_help, "Print help", "" }
|
|
|
|
};
|
|
|
|
int num_args = sizeof(args) / sizeof(args[0]);
|
|
|
|
int optind = 0;
|
|
|
|
char desc[] =
|
|
|
|
"tabname\n"\
|
|
|
|
"This program will create one table in Ndb.\n"\
|
|
|
|
"The tables may be selected from a fixed list of tables\n"\
|
|
|
|
"defined in NDBT_Tables class\n";
|
|
|
|
|
|
|
|
if(getarg(args, num_args, argc, argv, &optind) || _help){
|
|
|
|
arg_printusage(args, num_args, argv[0], desc);
|
|
|
|
return NDBT_ProgramExit(NDBT_WRONGARGS);
|
|
|
|
}
|
|
|
|
|
|
|
|
if(argv[optind] == NULL && !_all){
|
|
|
|
arg_printusage(args, num_args, argv[0], desc);
|
|
|
|
return NDBT_ProgramExit(NDBT_WRONGARGS);
|
|
|
|
}
|
|
|
|
|
|
|
|
int res = 0;
|
|
|
|
if(_print){
|
|
|
|
/**
|
|
|
|
* Print instead of creating
|
|
|
|
*/
|
2004-08-11 08:21:31 +02:00
|
|
|
if(optind < argc){
|
|
|
|
for(int i = optind; i<argc; i++){
|
2004-04-14 10:53:21 +02:00
|
|
|
NDBT_Tables::print(argv[i]);
|
2004-08-11 08:21:31 +02:00
|
|
|
}
|
2004-04-14 10:53:21 +02:00
|
|
|
} else {
|
|
|
|
NDBT_Tables::printAll();
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/**
|
|
|
|
* Creating
|
|
|
|
*/
|
|
|
|
|
|
|
|
// Connect to Ndb
|
BUG#10365 Cluster handler uses non-standard error codes
- Added better error messages when trying to open a table that can't be discovered or unpacked. The most likely cause of this is that it does not have any frm data, probably since it has been created from NdbApi or is a NDB system table.
- Separated functionality that was in ha_create_table_from_engine into two functions. One that checks if the table exists and another one that tries to create the table from the engine.
mysql-test/r/ndb_autodiscover.result:
Add tests for reading from a table that can't be discovered(SYSTAB_0)
Discovery is not performed during create table anymore.
mysql-test/t/ndb_autodiscover.test:
Add tests for reading from a table that can't be discovered(SYSTAB_0)
Discovery is not performed during create table anymore.
ndb/test/ndbapi/create_tab.cpp:
Set connectstring before creating Ndb object.
sql/ha_ndbcluster.cc:
Rename and use the function ndbcluster_table_exists_in_engine.
Correct return valu from ndbcluster_discover
Remove old code "ndb_discover_tables"
sql/ha_ndbcluster.h:
Rename function ndbcluster_table_exists to ndb ndbcluster_table_exists_in_engine
sql/handler.cc:
Update comment of ha_create_table_from_engine
Remove parameter create_if_found from ha_create_table_from_engine, the function ha_table_exists_in_engine is now used toi check if table is found in engine.
Cleanup return codes from ha_create_table_from_engine.
Change name of ha_table_exists to ha_table_exists_in_engine, update comment and returne codes.
sql/handler.h:
Remove paramter create_if_cound from ha_create_table_from_engine
Rename ha_table_exists to ha_table_exists_in_engine
sql/sql_base.cc:
Use the function ha_table_exists_in_engine to detect if table exists in enegine.
If it exists, call function ha_create_table_from_engine to try and create it.
If create of table fails, set correct error message.
sql/sql_table.cc:
Add comments, remove parameter create_if_found to ha_create_table_from_engine.
When dropping a table, try to discover it from engine. If discover fails, use same error message as if the table didn't exists.
Maybe another message should be displayed here, ex: "Table could not be dropped, unpack failed"
When creating a new table, use ha_table_exists_in_engine to check if a table with the given name already exists.
2005-06-08 13:31:59 +02:00
|
|
|
Ndb::setConnectString(_connectstr);
|
2004-04-14 10:53:21 +02:00
|
|
|
Ndb MyNdb( "TEST_DB" );
|
|
|
|
|
|
|
|
if(MyNdb.init() != 0){
|
|
|
|
ERR(MyNdb.getNdbError());
|
|
|
|
return NDBT_ProgramExit(NDBT_FAILED);
|
|
|
|
}
|
|
|
|
|
|
|
|
while(MyNdb.waitUntilReady() != 0)
|
|
|
|
ndbout << "Waiting for ndb to become ready..." << endl;
|
|
|
|
|
|
|
|
if(_all){
|
|
|
|
res = NDBT_Tables::createAllTables(&MyNdb, _temp);
|
|
|
|
} else {
|
|
|
|
int tmp;
|
|
|
|
for(int i = optind; i<argc; i++){
|
|
|
|
ndbout << "Trying to create " << argv[i] << endl;
|
|
|
|
if((tmp = NDBT_Tables::createTable(&MyNdb, argv[i], _temp)) != 0)
|
|
|
|
res = tmp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(res != 0)
|
|
|
|
return NDBT_ProgramExit(NDBT_FAILED);
|
|
|
|
else
|
|
|
|
return NDBT_ProgramExit(NDBT_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
|