#At file:///home/msvensson/mysql/tmp/O3FIJO8C9s/7.1-ndbinfo/ based on revid:magnus.blaudd@strippedm-20090709151131-rlwjuidxeyof48x9
2940 Magnus Blåudd 2009-07-10 [merge]
Merge
modified:
mysql-test/suite/ndb/r/ndbinfo.result
mysql-test/suite/ndb/t/ndbinfo.test
scripts/mysql_system_tables.sql
sql/ha_ndbinfo.cc
storage/ndb/src/kernel/vm/Ndbinfo.cpp
storage/ndb/src/ndbapi/NdbInfo.cpp
storage/ndb/src/ndbapi/NdbInfo.hpp
storage/ndb/test/ndbapi/testNdbinfo.cpp
=== modified file 'mysql-test/suite/ndb/r/ndbinfo.result'
--- a/mysql-test/suite/ndb/r/ndbinfo.result 2009-07-09 15:04:27 +0000
+++ b/mysql-test/suite/ndb/r/ndbinfo.result 2009-07-10 09:04:33 +0000
@@ -1,223 +1,106 @@
result_format: 2
-select * from information_schema.plugins where PLUGIN_NAME = 'ndbinfo';
+SELECT * FROM information_schema.plugins WHERE PLUGIN_NAME = 'ndbinfo';
PLUGIN_NAME PLUGIN_VERSION PLUGIN_STATUS PLUGIN_TYPE PLUGIN_TYPE_VERSION PLUGIN_LIBRARY PLUGIN_LIBRARY_VERSION PLUGIN_AUTHOR PLUGIN_DESCRIPTION PLUGIN_LICENSE
ndbinfo 0.1 ACTIVE STORAGE ENGINE 50135.0 NULL NULL Sun Microsystems Inc. Ndb system information storage engine GPL
-use ndb$info;
+USE ndb$info;
## Creation of temporary tables should not be supported
-CREATE TEMPORARY TABLE `TABLES` (
- `TABLE_ID` INT UNSIGNED,
- `TABLE_NAME` VARCHAR(512),
- `CREATE_SQL` VARCHAR(512)
+CREATE TEMPORARY TABLE `tables` (
+ `table_id` INT UNSIGNED,
+ `table_name` VARCHAR(512),
+ `create_sql` VARCHAR(512)
) ENGINE=NDBINFO;
ERROR HY000: Table storage engine 'ndbinfo' does not support the create option 'TEMPORARY'
-SHOW CREATE TABLE NDB$TABLES;
+SHOW CREATE TABLE ndb$tables;
Table Create Table
-NDB$TABLES CREATE TABLE `NDB$TABLES` (
- `TABLE_ID` int(10) unsigned DEFAULT NULL,
- `TABLE_NAME` varchar(512) DEFAULT NULL,
- `CREATE_SQL` varchar(512) DEFAULT NULL
+ndb$tables CREATE TABLE `ndb$tables` (
+ `table_id` int(10) unsigned DEFAULT NULL,
+ `table_name` varchar(512) DEFAULT NULL,
+ `create_sql` varchar(512) DEFAULT NULL
) ENGINE=NDBINFO DEFAULT CHARSET=latin1
-select * from NDB$TABLES;
-TABLE_ID TABLE_NAME CREATE_SQL
-0 TABLES CREATE TABLE `ndb$info`.`NDB$TABLES` (
- `TABLE_ID` INT UNSIGNED,
- `TABLE_NAME` VARCHAR(512),
- `CREATE_SQL` VARCHAR(512)
-) ENGINE=NDBINFO;
-1 COLUMNS CREATE TABLE `ndb$info`.`NDB$COLUMNS` (
- `TABLE_ID` INT UNSIGNED,
- `COLUMN_ID` INT UNSIGNED,
- `COLUMN_NAME` VARCHAR(512),
- `COLUMN_TYPE` VARCHAR(512)
-) ENGINE=NDBINFO;
-2 MEMUSAGE CREATE TABLE `ndb$info`.`NDB$MEMUSAGE` (
- `NODE_ID` INT UNSIGNED,
- `BLOCK_NUMBER` INT UNSIGNED,
- `BLOCK_INSTANCE` INT UNSIGNED,
- `RESOURCE_NAME` VARCHAR(512),
- `PAGE_SIZE` INT UNSIGNED,
- `PAGES_USED` INT UNSIGNED,
- `PAGES_TOTAL` INT UNSIGNED
-) ENGINE=NDBINFO;
-3 LOGDESTINATION CREATE TABLE `ndb$info`.`NDB$LOGDESTINATION` (
- `NODE_ID` INT UNSIGNED,
- `TYPE` VARCHAR(512),
- `PARAMS` VARCHAR(512),
- `CURRENT_SIZE` INT UNSIGNED,
- `MAX_SIZE` INT UNSIGNED
-) ENGINE=NDBINFO;
-4 BACKUP_RECORDS CREATE TABLE `ndb$info`.`NDB$BACKUP_RECORDS` (
- `NODE_ID` INT UNSIGNED,
- `BACKUP_RECORD` INT UNSIGNED,
- `BACKUP_ID` INT UNSIGNED,
- `MASTER_REF` INT UNSIGNED,
- `CLIENT_REF` INT UNSIGNED,
- `STATE` INT UNSIGNED,
- `BYTES` INT UNSIGNED,
- `RECORDS` INT UNSIGNED,
- `LOG_BYTES` INT UNSIGNED,
- `LOG_RECORDS` INT UNSIGNED,
- `ERROR_CODE` INT UNSIGNED
-) ENGINE=NDBINFO;
-5 BACKUP_PARAMETERS CREATE TABLE `ndb$info`.`NDB$BACKUP_PARAMETERS` (
- `NODE_ID` INT UNSIGNED,
- `CURRENT_DISK_WRITE_SPEED` INT UNSIGNED,
- `BYTES_WRITTEN_THIS_PERIOD` INT UNSIGNED,
- `OVERFLOW_DISK_WRITE` INT UNSIGNED,
- `RESET_DELAY_USED` INT UNSIGNED,
- `RESET_DISK_SPEED_TIME` INT UNSIGNED,
- `BACKUP_POOL_SIZE` INT UNSIGNED,
- `BACKUP_FILE_POOL_SIZE` INT UNSIGNED,
- `TABLE_POOL_SIZE` INT UNSIGNED,
- `TRIGGER_POOL_SIZE` INT UNSIGNED,
- `FRAGMENT_POOL_SIZE` INT UNSIGNED,
- `PAGE_POOL_SIZE` INT UNSIGNED,
- `COMPRESSED_BACKUP` INT UNSIGNE
-6 POOLS CREATE TABLE `ndb$info`.`NDB$POOLS` (
- `NODE_ID` INT UNSIGNED,
- `BLOCK_NUMBER` INT UNSIGNED,
- `BLOCK_INSTANCE` INT UNSIGNED,
- `POOL_NAME` VARCHAR(512),
- `FREE` INT UNSIGNED,
- `SIZE` INT UNSIGNED
-) ENGINE=NDBINFO;
-7 TEST CREATE TABLE `ndb$info`.`NDB$TEST` (
- `NODE_ID` INT UNSIGNED,
- `BLOCK_NUMBER` INT UNSIGNED,
- `BLOCK_INSTANCE` INT UNSIGNED,
- `COUNTER` INT UNSIGNED
-) ENGINE=NDBINFO;
-select count(*) from NDB$TABLES;
-count(*)
+SELECT * FROM ndb$tables;
+table_id table_name create_sql
+0 tables <unknown local column>
+1 columns <unknown local column>
+2 memusage <unknown local column>
+3 logdestination <unknown local column>
+4 backup_records <unknown local column>
+5 backup_parameters <unknown local column>
+6 pools <unknown local column>
+7 test <unknown local column>
+SELECT COUNT(*) FROM ndb$tables;
+COUNT(*)
8
-select * from NDB$TABLES where TABLE_ID = 2;
-TABLE_ID TABLE_NAME CREATE_SQL
-2 MEMUSAGE CREATE TABLE `ndb$info`.`NDB$MEMUSAGE` (
- `NODE_ID` INT UNSIGNED,
- `BLOCK_NUMBER` INT UNSIGNED,
- `BLOCK_INSTANCE` INT UNSIGNED,
- `RESOURCE_NAME` VARCHAR(512),
- `PAGE_SIZE` INT UNSIGNED,
- `PAGES_USED` INT UNSIGNED,
- `PAGES_TOTAL` INT UNSIGNED
-) ENGINE=NDBINFO;
-select * from NDB$TABLES where TABLE_ID > 5;
-TABLE_ID TABLE_NAME CREATE_SQL
-6 POOLS CREATE TABLE `ndb$info`.`NDB$POOLS` (
- `NODE_ID` INT UNSIGNED,
- `BLOCK_NUMBER` INT UNSIGNED,
- `BLOCK_INSTANCE` INT UNSIGNED,
- `POOL_NAME` VARCHAR(512),
- `FREE` INT UNSIGNED,
- `SIZE` INT UNSIGNED
-) ENGINE=NDBINFO;
-7 TEST CREATE TABLE `ndb$info`.`NDB$TEST` (
- `NODE_ID` INT UNSIGNED,
- `BLOCK_NUMBER` INT UNSIGNED,
- `BLOCK_INSTANCE` INT UNSIGNED,
- `COUNTER` INT UNSIGNED
-) ENGINE=NDBINFO;
-select * from NDB$TABLES where TABLE_NAME = 'LOGDESTINATION';
-TABLE_ID TABLE_NAME CREATE_SQL
-3 LOGDESTINATION CREATE TABLE `ndb$info`.`NDB$LOGDESTINATION` (
- `NODE_ID` INT UNSIGNED,
- `TYPE` VARCHAR(512),
- `PARAMS` VARCHAR(512),
- `CURRENT_SIZE` INT UNSIGNED,
- `MAX_SIZE` INT UNSIGNED
-) ENGINE=NDBINFO;
-select count(*) from NDB$TABLES t1, NDB$TABLES t2 WHERE t1.TABLE_ID = t1.TABLE_ID;
-count(*)
+SELECT * FROM ndb$tables WHERE table_id = 2;
+table_id table_name create_sql
+2 memusage <unknown local column>
+SELECT * FROM ndb$tables WHERE table_id > 5;
+table_id table_name create_sql
+6 pools <unknown local column>
+7 test <unknown local column>
+SELECT * FROM ndb$tables WHERE table_name = 'LOGDESTINATION';
+table_id table_name create_sql
+3 logdestination <unknown local column>
+SELECT COUNT(*) FROM ndb$tables t1, ndb$tables t2 WHERE t1.table_id = t1.table_id;
+COUNT(*)
64
-select TABLE_ID, TABLE_NAME, CREATE_SQL from NDB$TABLES
- where TABLE_ID > 2 and TABLE_ID <= 5 order by TABLE_ID;
-TABLE_ID TABLE_NAME CREATE_SQL
-3 LOGDESTINATION CREATE TABLE `ndb$info`.`NDB$LOGDESTINATION` (
- `NODE_ID` INT UNSIGNED,
- `TYPE` VARCHAR(512),
- `PARAMS` VARCHAR(512),
- `CURRENT_SIZE` INT UNSIGNED,
- `MAX_SIZE` INT UNSIGNED
-) ENGINE=NDBINFO;
-4 BACKUP_RECORDS CREATE TABLE `ndb$info`.`NDB$BACKUP_RECORDS` (
- `NODE_ID` INT UNSIGNED,
- `BACKUP_RECORD` INT UNSIGNED,
- `BACKUP_ID` INT UNSIGNED,
- `MASTER_REF` INT UNSIGNED,
- `CLIENT_REF` INT UNSIGNED,
- `STATE` INT UNSIGNED,
- `BYTES` INT UNSIGNED,
- `RECORDS` INT UNSIGNED,
- `LOG_BYTES` INT UNSIGNED,
- `LOG_RECORDS` INT UNSIGNED,
- `ERROR_CODE` INT UNSIGNED
-) ENGINE=NDBINFO;
-5 BACKUP_PARAMETERS CREATE TABLE `ndb$info`.`NDB$BACKUP_PARAMETERS` (
- `NODE_ID` INT UNSIGNED,
- `CURRENT_DISK_WRITE_SPEED` INT UNSIGNED,
- `BYTES_WRITTEN_THIS_PERIOD` INT UNSIGNED,
- `OVERFLOW_DISK_WRITE` INT UNSIGNED,
- `RESET_DELAY_USED` INT UNSIGNED,
- `RESET_DISK_SPEED_TIME` INT UNSIGNED,
- `BACKUP_POOL_SIZE` INT UNSIGNED,
- `BACKUP_FILE_POOL_SIZE` INT UNSIGNED,
- `TABLE_POOL_SIZE` INT UNSIGNED,
- `TRIGGER_POOL_SIZE` INT UNSIGNED,
- `FRAGMENT_POOL_SIZE` INT UNSIGNED,
- `PAGE_POOL_SIZE` INT UNSIGNED,
- `COMPRESSED_BACKUP` INT UNSIGNE
-select TABLE_ID from NDB$TABLES WHERE TABLE_ID = 2 order by TABLE_NAME;
-TABLE_ID
+SELECT table_id, table_name, create_sql from ndb$tables
+ WHERE table_id > 2 AND table_id <= 5 ORDER BY table_id;
+table_id table_name create_sql
+3 logdestination <unknown local column>
+4 backup_records <unknown local column>
+5 backup_parameters <unknown local column>
+SELECT table_id FROM ndb$tables WHERE table_id = 2 ORDER BY table_name;
+table_id
2
-select TABLE_ID, TABLE_NAME from NDB$TABLES order by TABLE_NAME;
-TABLE_ID TABLE_NAME
-5 BACKUP_PARAMETERS
-4 BACKUP_RECORDS
-1 COLUMNS
-3 LOGDESTINATION
-2 MEMUSAGE
-6 POOLS
-0 TABLES
-7 TEST
-
-select TABLE_ID, COLUMN_ID, COLUMN_NAME from NDB$COLUMNS LIMIT 7;
-TABLE_ID COLUMN_ID COLUMN_NAME
-0 0 TABLE_ID
-0 1 TABLE_NAME
-1 0 TABLE_ID
-1 1 COLUMN_ID
-1 2 COLUMN_NAME
-1 3 COLUMN_TYPE
-2 0 NODE_ID
-
-update NDB$TABLES set TABLE_ID=2 where TABLE_ID=3;
-ERROR HY000: Table 'NDB$TABLES' is read only
-
-update NDB$TABLES set TABLE_ID=9 where 1=0;
-ERROR HY000: Table 'NDB$TABLES' is read only
-
-update NDB$TABLES set TABLE_ID=9 where TABLE_ID > 1;
-ERROR HY000: Table 'NDB$TABLES' is read only
+SELECT table_id, table_name FROM ndb$tables ORDER BY table_name;
+table_id table_name
+5 backup_parameters
+4 backup_records
+1 columns
+3 logdestination
+2 memusage
+6 pools
+0 tables
+7 test
+
+SELECT table_id, column_id, column_name FROM ndb$columns LIMIT 7;
+table_id column_id column_name
+0 0 table_id
+0 1 table_name
+1 0 table_id
+1 1 column_id
+1 2 column_name
+1 3 column_type
+2 0 node_id
+
+UPDATE ndb$tables SET table_id=2 WHERE table_id=3;
+ERROR HY000: Table 'ndb$tables' is read only
+
+UPDATE ndb$tables SET table_id=9 WHERE 1=0;
+ERROR HY000: Table 'ndb$tables' is read only
+
+UPDATE ndb$tables SET table_id=9 WHERE table_id > 1;
+ERROR HY000: Table 'ndb$tables' is read only
-delete from NDB$TABLES where TABLE_ID=3;
-ERROR HY000: Table 'NDB$TABLES' is read only
+DELETE FROM ndb$tables WHERE table_id=3;
+ERROR HY000: Table 'ndb$tables' is read only
-delete from NDB$TABLES where 1=0;
-ERROR HY000: Table 'NDB$TABLES' is read only
+DELETE FROM ndb$tables WHERE 1=0;
+ERROR HY000: Table 'ndb$tables' is read only
-delete from NDB$TABLES where TABLE_ID > 1;
-ERROR HY000: Table 'NDB$TABLES' is read only
+DELETE FROM ndb$tables WHERE table_id > 1;
+ERROR HY000: Table 'ndb$tables' is read only
FLUSH TABLES;
-SELECT TABLE_ID from NDB$TABLES;
-TABLE_ID
+SELECT table_id FROM ndb$tables;
+table_id
0
1
2
@@ -235,12 +118,12 @@ Variable_name Value
ndbinfo_max_bytes 0
ndbinfo_max_rows 10
-CREATE TABLE `ndb$info`.`NDB$TEST`(
- `NODE_ID` INT UNSIGNED,
- `BLOCK_NUMBER` INT UNSIGNED,
- `BLOCK_INSTANCE` INT UNSIGNED,
- `COUNTER` INT UNSIGNED
+CREATE TABLE `ndb$info`.`ndb$test`(
+ `node_id` INT UNSIGNED,
+ `block_number` INT UNSIGNED,
+ `block_instance` INT UNSIGNED,
+ `counter` INT UNSIGNED
) ENGINE=NDBINFO;
## Cleanup
-DROP TABLE NDB$TEST;
+DROP TABLE ndb$test;
=== modified file 'mysql-test/suite/ndb/t/ndbinfo.test'
--- a/mysql-test/suite/ndb/t/ndbinfo.test 2009-07-09 15:04:27 +0000
+++ b/mysql-test/suite/ndb/t/ndbinfo.test 2009-07-10 09:04:33 +0000
@@ -1,63 +1,54 @@
--result_format 2
--source include/have_ndb.inc
-select * from information_schema.plugins where PLUGIN_NAME = 'ndbinfo';
+SELECT * FROM information_schema.plugins WHERE PLUGIN_NAME = 'ndbinfo';
-use ndb$info;
+USE ndb$info;
## Creation of temporary tables should not be supported
--error ER_ILLEGAL_HA_CREATE_OPTION
-CREATE TEMPORARY TABLE `TABLES` (
- `TABLE_ID` INT UNSIGNED,
- `TABLE_NAME` VARCHAR(512),
- `CREATE_SQL` VARCHAR(512)
+CREATE TEMPORARY TABLE `tables` (
+ `table_id` INT UNSIGNED,
+ `table_name` VARCHAR(512),
+ `create_sql` VARCHAR(512)
) ENGINE=NDBINFO;
-# replace for lower_case_table_names
---replace_result tables NDB$TABLES
-SHOW CREATE TABLE NDB$TABLES;
+SHOW CREATE TABLE ndb$tables;
-select * from NDB$TABLES;
-select count(*) from NDB$TABLES;
-select * from NDB$TABLES where TABLE_ID = 2;
-select * from NDB$TABLES where TABLE_ID > 5;
-select * from NDB$TABLES where TABLE_NAME = 'LOGDESTINATION';
-select count(*) from NDB$TABLES t1, NDB$TABLES t2 WHERE t1.TABLE_ID = t1.TABLE_ID;
+SELECT * FROM ndb$tables;
+SELECT COUNT(*) FROM ndb$tables;
+SELECT * FROM ndb$tables WHERE table_id = 2;
+SELECT * FROM ndb$tables WHERE table_id > 5;
+SELECT * FROM ndb$tables WHERE table_name = 'LOGDESTINATION';
+SELECT COUNT(*) FROM ndb$tables t1, ndb$tables t2 WHERE t1.table_id = t1.table_id;
-select TABLE_ID, TABLE_NAME, CREATE_SQL from NDB$TABLES
- where TABLE_ID > 2 and TABLE_ID <= 5 order by TABLE_ID;
-select TABLE_ID from NDB$TABLES WHERE TABLE_ID = 2 order by TABLE_NAME;
-select TABLE_ID, TABLE_NAME from NDB$TABLES order by TABLE_NAME;
+SELECT table_id, table_name, create_sql from ndb$tables
+ WHERE table_id > 2 AND table_id <= 5 ORDER BY table_id;
+SELECT table_id FROM ndb$tables WHERE table_id = 2 ORDER BY table_name;
+SELECT table_id, table_name FROM ndb$tables ORDER BY table_name;
-select TABLE_ID, COLUMN_ID, COLUMN_NAME from NDB$COLUMNS LIMIT 7;
+SELECT table_id, column_id, column_name FROM ndb$columns LIMIT 7;
-# replace for lower_case_table_names
---replace_result tables NDB$TABLES
--error ER_OPEN_AS_READONLY
-update NDB$TABLES set TABLE_ID=2 where TABLE_ID=3;
+UPDATE ndb$tables SET table_id=2 WHERE table_id=3;
---replace_result tables NDB$TABLES
--error ER_OPEN_AS_READONLY
-update NDB$TABLES set TABLE_ID=9 where 1=0;
+UPDATE ndb$tables SET table_id=9 WHERE 1=0;
---replace_result tables NDB$TABLES
--error ER_OPEN_AS_READONLY
-update NDB$TABLES set TABLE_ID=9 where TABLE_ID > 1;
+UPDATE ndb$tables SET table_id=9 WHERE table_id > 1;
---replace_result tables NDB$TABLES
--error ER_OPEN_AS_READONLY
-delete from NDB$TABLES where TABLE_ID=3;
+DELETE FROM ndb$tables WHERE table_id=3;
---replace_result tables NDB$TABLES
--error ER_OPEN_AS_READONLY
-delete from NDB$TABLES where 1=0;
+DELETE FROM ndb$tables WHERE 1=0;
---replace_result tables NDB$TABLES
--error ER_OPEN_AS_READONLY
-delete from NDB$TABLES where TABLE_ID > 1;
+DELETE FROM ndb$tables WHERE table_id > 1;
FLUSH TABLES;
-SELECT TABLE_ID from NDB$TABLES;
+SELECT table_id FROM ndb$tables;
## Variables and status
@@ -65,12 +56,12 @@ SHOW GLOBAL STATUS LIKE 'ndbinfo\_%';
SHOW GLOBAL VARIABLES LIKE 'ndbinfo\_%';
# Create the test table(this also shows that it's hidden by default)
-CREATE TABLE `ndb$info`.`NDB$TEST`(
- `NODE_ID` INT UNSIGNED,
- `BLOCK_NUMBER` INT UNSIGNED,
- `BLOCK_INSTANCE` INT UNSIGNED,
- `COUNTER` INT UNSIGNED
+CREATE TABLE `ndb$info`.`ndb$test`(
+ `node_id` INT UNSIGNED,
+ `block_number` INT UNSIGNED,
+ `block_instance` INT UNSIGNED,
+ `counter` INT UNSIGNED
) ENGINE=NDBINFO;
## Cleanup
-DROP TABLE NDB$TEST;
\ No newline at end of file
+DROP TABLE ndb$test;
\ No newline at end of file
=== modified file 'scripts/mysql_system_tables.sql'
--- a/scripts/mysql_system_tables.sql 2009-07-09 15:04:27 +0000
+++ b/scripts/mysql_system_tables.sql 2009-07-10 09:04:33 +0000
@@ -94,79 +94,80 @@ CREATE DATABASE IF NOT EXISTS `ndb$info`
-- Only create tables if NDBINFO is enabled
SELECT @have_ndbinfo:= COUNT(*) FROM information_schema.engines WHERE engine='NDBINFO' AND support IN ('YES', 'DEFAULT');
--- ndb$info.TABLES
-SET @str=IF(@have_ndbinfo,'DROP TABLE IF EXISTS `ndb$info`.`NDB$TABLES`','SET @dummy = 0');
+-- ndb$info.tables
+SET @str=IF(@have_ndbinfo,'DROP TABLE IF EXISTS `ndb$info`.`ndb$tables`','SET @dummy = 0');
PREPARE stmt FROM @str;
EXECUTE stmt;
DROP PREPARE stmt;
-SET @str=IF(@have_ndbinfo,'CREATE TABLE `ndb$info`.`NDB$TABLES` (`TABLE_ID` INT UNSIGNED,`TABLE_NAME` VARCHAR(512),`CREATE_SQL` VARCHAR(512)) ENGINE=NDBINFO;','SET @dummy = 0');
+SET @str=IF(@have_ndbinfo,'CREATE TABLE `ndb$info`.`ndb$tables` (`table_id` INT UNSIGNED,`table_name` VARCHAR(512),`create_sql` VARCHAR(512)) ENGINE=NDBINFO;','SET @dummy = 0');
PREPARE stmt FROM @str;
EXECUTE stmt;
DROP PREPARE stmt;
--- ndb$info.COLUMNS
-SET @str=IF(@have_ndbinfo,'DROP TABLE IF EXISTS `ndb$info`.`NDB$COLUMNS`','SET @dummy = 0');
+-- ndb$info.columns
+SET @str=IF(@have_ndbinfo,'DROP TABLE IF EXISTS `ndb$info`.`ndb$columns`','SET @dummy = 0');
PREPARE stmt FROM @str;
EXECUTE stmt;
DROP PREPARE stmt;
-SET @str=IF(@have_ndbinfo,'CREATE TABLE `ndb$info`.`NDB$COLUMNS` (`TABLE_ID` INT UNSIGNED,`COLUMN_ID` INT UNSIGNED,`COLUMN_NAME` VARCHAR(512),`COLUMN_TYPE` VARCHAR(512)) ENGINE=NDBINFO;','SET @dummy = 0');
+SET @str=IF(@have_ndbinfo,'CREATE TABLE `ndb$info`.`ndb$columns` (`table_id` INT UNSIGNED,`column_id` INT UNSIGNED,`column_name` VARCHAR(512),`column_type` VARCHAR(512)) ENGINE=NDBINFO;','SET @dummy = 0');
PREPARE stmt FROM @str;
EXECUTE stmt;
DROP PREPARE stmt;
--- ndb$info.MEMUSAGE
-SET @str=IF(@have_ndbinfo,'DROP TABLE IF EXISTS `ndb$info`.`NDB$MEMUSAGE`','SET @dummy = 0');
+-- ndb$info.memusage
+SET @str=IF(@have_ndbinfo,'DROP TABLE IF EXISTS `ndb$info`.`ndb$memusage`','SET @dummy = 0');
PREPARE stmt FROM @str;
EXECUTE stmt;
DROP PREPARE stmt;
-SET @str=IF(@have_ndbinfo,'CREATE TABLE `ndb$info`.`NDB$MEMUSAGE` (`NODE_ID` INT UNSIGNED,`BLOCK_NUMBER` INT UNSIGNED,`BLOCK_INSTANCE` INT UNSIGNED,`RESOURCE_NAME` VARCHAR(512),`PAGE_SIZE` INT UNSIGNED,`PAGES_USED` INT UNSIGNED,`PAGES_TOTAL` INT UNSIGNED) ENGINE=NDBINFO;','SET @dummy = 0');
+SET @str=IF(@have_ndbinfo,'CREATE TABLE `ndb$info`.`ndb$memusage` (`node_id` INT UNSIGNED,`block_number` INT UNSIGNED,`block_instance` INT UNSIGNED,`resource_name` VARCHAR(512),`page_size` INT UNSIGNED,`pages_used` INT UNSIGNED,`pages_total` INT UNSIGNED) ENGINE=NDBINFO;','SET @dummy = 0');
PREPARE stmt FROM @str;
EXECUTE stmt;
DROP PREPARE stmt;
--- ndb$info.LOGDESTINATION
-SET @str=IF(@have_ndbinfo,'DROP TABLE IF EXISTS `ndb$info`.`NDB$LOGDESTINATION`','SET @dummy = 0');
+-- ndb$info.logdestination
+SET @str=IF(@have_ndbinfo,'DROP TABLE IF EXISTS `ndb$info`.`ndb$logdestination`','SET @dummy = 0');
PREPARE stmt FROM @str;
EXECUTE stmt;
DROP PREPARE stmt;
-SET @str=IF(@have_ndbinfo,'CREATE TABLE `ndb$info`.`NDB$LOGDESTINATION` (`NODE_ID` INT UNSIGNED,`TYPE` VARCHAR(512),`PARAMS` VARCHAR(512),`CURRENT_SIZE` INT UNSIGNED,`MAX_SIZE` INT UNSIGNED) ENGINE=NDBINFO;','SET @dummy = 0');
+SET @str=IF(@have_ndbinfo,'CREATE TABLE `ndb$info`.`ndb$logdestination` (`node_id` INT UNSIGNED,`type` VARCHAR(512),`params` VARCHAR(512),`current_size` INT UNSIGNED,`max_size` INT UNSIGNED) ENGINE=NDBINFO;','SET @dummy = 0');
PREPARE stmt FROM @str;
EXECUTE stmt;
DROP PREPARE stmt;
--- ndb$info.BACKUP_RECORDS
-SET @str=IF(@have_ndbinfo,'DROP TABLE IF EXISTS `ndb$info`.`NDB$BACKUP_RECORDS`','SET @dummy = 0');
+-- ndb$info.backup_records
+SET @str=IF(@have_ndbinfo,'DROP TABLE IF EXISTS `ndb$info`.`ndb$backup_records`','SET @dummy = 0');
PREPARE stmt FROM @str;
EXECUTE stmt;
DROP PREPARE stmt;
-SET @str=IF(@have_ndbinfo,'CREATE TABLE `ndb$info`.`NDB$BACKUP_RECORDS` (`NODE_ID` INT UNSIGNED,`BACKUP_RECORD` INT UNSIGNED,`BACKUP_ID` INT UNSIGNED,`MASTER_REF` INT UNSIGNED,`CLIENT_REF` INT UNSIGNED,`STATE` INT UNSIGNED,`BYTES` INT UNSIGNED,`RECORDS` INT UNSIGNED,`LOG_BYTES` INT UNSIGNED,`LOG_RECORDS` INT UNSIGNED,`ERROR_CODE` INT UNSIGNED) ENGINE=NDBINFO;','SET @dummy = 0');
+SET @str=IF(@have_ndbinfo,'CREATE TABLE `ndb$info`.`ndb$backup_records` (`node_id` INT UNSIGNED,`backup_record` INT UNSIGNED,`backup_id` INT UNSIGNED,`master_ref` INT UNSIGNED,`client_ref` INT UNSIGNED,`state` INT UNSIGNED,`bytes` INT UNSIGNED,`records` INT UNSIGNED,`log_bytes` INT UNSIGNED,`log_records` INT UNSIGNED,`error_code` INT UNSIGNED) ENGINE=NDBINFO;','SET @dummy = 0');
PREPARE stmt FROM @str;
EXECUTE stmt;
DROP PREPARE stmt;
--- ndb$info.BACKUP_PARAMETERS
-SET @str=IF(@have_ndbinfo,'DROP TABLE IF EXISTS `ndb$info`.`NDB$BACKUP_PARAMETERS`','SET @dummy = 0');
+-- ndb$info.backup_parameters
+SET @str=IF(@have_ndbinfo,'DROP TABLE IF EXISTS `ndb$info`.`ndb$backup_parameters`','SET @dummy = 0');
PREPARE stmt FROM @str;
EXECUTE stmt;
DROP PREPARE stmt;
-SET @str=IF(@have_ndbinfo,'CREATE TABLE `ndb$info`.`NDB$BACKUP_PARAMETERS` (`NODE_ID` INT UNSIGNED,`CURRENT_DISK_WRITE_SPEED` INT UNSIGNED,`BYTES_WRITTEN_THIS_PERIOD` INT UNSIGNED,`OVERFLOW_DISK_WRITE` INT UNSIGNED,`RESET_DELAY_USED` INT UNSIGNED,`RESET_DISK_SPEED_TIME` INT UNSIGNED,`BACKUP_POOL_SIZE` INT UNSIGNED,`BACKUP_FILE_POOL_SIZE` INT UNSIGNED,`TABLE_POOL_SIZE` INT UNSIGNED,`TRIGGER_POOL_SIZE` INT UNSIGNED,`FRAGMENT_POOL_SIZE` INT UNSIGNED,`PAGE_POOL_SIZE` INT UNSIGNED,`COMPRESSED_BACKUP` INT UNSIGNED,`COMPRESSED_LCP` INT UNSIGNED) ENGINE=NDBINFO;','SET @dummy = 0');
+SET @str=IF(@have_ndbinfo,'CREATE TABLE `ndb$info`.`ndb$backup_parameters` (`node_id` INT UNSIGNED,`current_disk_write_speed` INT UNSIGNED,`bytes_written_this_period` INT UNSIGNED,`overflow_disk_write` INT UNSIGNED,`reset_delay_used` INT UNSIGNED,`reset_disk_speed_time` INT UNSIGNED,`backup_pool_size` INT UNSIGNED,`backup_file_pool_size` INT UNSIGNED,`table_pool_size` INT UNSIGNED,`trigger_pool_size` INT UNSIGNED,`fragment_pool_size` INT UNSIGNED,`page_pool_size` INT UNSIGNED,`compressed_backup` INT UNSIGNED,`compressed_lcp` INT UNSIGNED) ENGINE=NDBINFO;','SET @dummy = 0');
PREPARE stmt FROM @str;
EXECUTE stmt;
DROP PREPARE stmt;
--- ndb$info.POOLS
-SET @str=IF(@have_ndbinfo,'DROP TABLE IF EXISTS `ndb$info`.`NDB$POOLS`','SET @dummy = 0');
+-- ndb$info.pools
+SET @str=IF(@have_ndbinfo,'DROP TABLE IF EXISTS `ndb$info`.`ndb$pools`','SET @dummy = 0');
PREPARE stmt FROM @str;
EXECUTE stmt;
DROP PREPARE stmt;
-SET @str=IF(@have_ndbinfo,'CREATE TABLE `ndb$info`.`NDB$POOLS` (`NODE_ID` INT UNSIGNED,`BLOCK_NUMBER` INT UNSIGNED,`BLOCK_INSTANCE` INT UNSIGNED,`POOL_NAME` VARCHAR(512),`FREE` INT UNSIGNED,`SIZE` INT UNSIGNED) ENGINE=NDBINFO;','SET @dummy = 0');
+SET @str=IF(@have_ndbinfo,'CREATE TABLE `ndb$info`.`ndb$pools` (`node_id` INT UNSIGNED,`block_number` INT UNSIGNED,`block_instance` INT UNSIGNED,`pool_name` VARCHAR(512),`free` INT UNSIGNED,`size` INT UNSIGNED) ENGINE=NDBINFO;','SET @dummy = 0');
PREPARE stmt FROM @str;
EXECUTE stmt;
DROP PREPARE stmt;
+
=== modified file 'sql/ha_ndbinfo.cc'
--- a/sql/ha_ndbinfo.cc 2009-07-09 15:04:27 +0000
+++ b/sql/ha_ndbinfo.cc 2009-07-10 09:04:33 +0000
@@ -386,16 +386,14 @@ int ndbinfo_init(void *plugin)
}
const char* ndbinfo_db = "ndb$info";
- const char* table_prefix = "NDB$";
- bool use_lower_case = (lower_case_table_names != 0);
+ const char* table_prefix = "ndb$";
char prefix[FN_REFLEN];
build_table_filename(prefix, sizeof(prefix) - 1,
ndbinfo_db, table_prefix, "", 0);
- DBUG_PRINT("info", ("prefix: '%s', use_lower_case: %d",
- prefix, use_lower_case));
+ DBUG_PRINT("info", ("prefix: '%s'", prefix));
assert(g_ndb_cluster_connection);
g_ndbinfo = new NdbInfo(g_ndb_cluster_connection, prefix,
- ndbinfo_db, table_prefix, use_lower_case);
+ ndbinfo_db, table_prefix);
if (!g_ndbinfo)
{
sql_print_error("Failed to create NdbInfo");
=== modified file 'storage/ndb/src/kernel/vm/Ndbinfo.cpp'
--- a/storage/ndb/src/kernel/vm/Ndbinfo.cpp 2009-07-09 10:37:49 +0000
+++ b/storage/ndb/src/kernel/vm/Ndbinfo.cpp 2009-07-10 09:04:33 +0000
@@ -111,101 +111,101 @@ static const struct {
DECLARE_NDBINFO_TABLE(ndbinfo_TABLES,2) =
-{ "TABLES", 2, 0,
+{ "tables", 2, 0,
{
- {"TABLE_ID", Ndbinfo::Number},
- {"TABLE_NAME",Ndbinfo::String},
+ {"table_id", Ndbinfo::Number},
+ {"table_name",Ndbinfo::String},
}};
/** Reserved for DBINFO only */
DECLARE_NDBINFO_TABLE(ndbinfo_COLUMNS,4) =
-{ "COLUMNS", 4, 0,
+{ "columns", 4, 0,
{
- {"TABLE_ID", Ndbinfo::Number},
- {"COLUMN_ID", Ndbinfo::Number},
- {"COLUMN_NAME", Ndbinfo::String},
- {"COLUMN_TYPE", Ndbinfo::Number},
+ {"table_id", Ndbinfo::Number},
+ {"column_id", Ndbinfo::Number},
+ {"column_name", Ndbinfo::String},
+ {"column_type", Ndbinfo::Number},
}};
DECLARE_NDBINFO_TABLE(ndbinfo_MEMUSAGE,7) =
-{ "MEMUSAGE", 7, 0,
+{ "memusage", 7, 0,
{
- {"NODE_ID", Ndbinfo::Number},
- {"BLOCK_NUMBER", Ndbinfo::Number},
- {"BLOCK_INSTANCE", Ndbinfo::Number},
- {"RESOURCE_NAME", Ndbinfo::String},
- {"PAGE_SIZE", Ndbinfo::Number},
- {"PAGES_USED", Ndbinfo::Number},
- {"PAGES_TOTAL", Ndbinfo::Number},
+ {"node_id", Ndbinfo::Number},
+ {"block_number", Ndbinfo::Number},
+ {"block_instance", Ndbinfo::Number},
+ {"resource_name", Ndbinfo::String},
+ {"page_size", Ndbinfo::Number},
+ {"pages_used", Ndbinfo::Number},
+ {"pages_total", Ndbinfo::Number},
}};
DECLARE_NDBINFO_TABLE(ndbinfo_LOGDESTINATION,5) =
-{ "LOGDESTINATION", 5, 0,
+{ "logdestination", 5, 0,
{
- {"NODE_ID",Ndbinfo::Number},
- {"TYPE",Ndbinfo::String},
- {"PARAMS",Ndbinfo::String},
- {"CURRENT_SIZE",Ndbinfo::Number},
- {"MAX_SIZE",Ndbinfo::Number},
+ {"node_id", Ndbinfo::Number},
+ {"type", Ndbinfo::String},
+ {"params", Ndbinfo::String},
+ {"current_size", Ndbinfo::Number},
+ {"max_size", Ndbinfo::Number},
}
};
DECLARE_NDBINFO_TABLE(ndbinfo_BACKUP_RECORDS,11) =
-{ "BACKUP_RECORDS", 11, 0,
+{ "backup_records", 11, 0,
{
- {"NODE_ID", Ndbinfo::Number},
- {"BACKUP_RECORD", Ndbinfo::Number},
- {"BACKUP_ID", Ndbinfo::Number},
- {"MASTER_REF", Ndbinfo::Number},
- {"CLIENT_REF", Ndbinfo::Number},
- {"STATE", Ndbinfo::Number},
- {"BYTES", Ndbinfo::Number},
- {"RECORDS", Ndbinfo::Number},
- {"LOG_BYTES", Ndbinfo::Number},
- {"LOG_RECORDS", Ndbinfo::Number},
- {"ERROR_CODE", Ndbinfo::Number},
+ {"node_id", Ndbinfo::Number},
+ {"backup_record", Ndbinfo::Number},
+ {"backup_id", Ndbinfo::Number},
+ {"master_ref", Ndbinfo::Number},
+ {"client_ref", Ndbinfo::Number},
+ {"state", Ndbinfo::Number},
+ {"bytes", Ndbinfo::Number},
+ {"records", Ndbinfo::Number},
+ {"log_bytes", Ndbinfo::Number},
+ {"log_records", Ndbinfo::Number},
+ {"error_code", Ndbinfo::Number},
}
};
DECLARE_NDBINFO_TABLE(ndbinfo_BACKUP_PARAMETERS,14) =
-{ "BACKUP_PARAMETERS", 14, 0,
+{ "backup_parameters", 14, 0,
{
- {"NODE_ID", Ndbinfo::Number},
- {"CURRENT_DISK_WRITE_SPEED", Ndbinfo::Number},
- {"BYTES_WRITTEN_THIS_PERIOD",Ndbinfo::Number},
- {"OVERFLOW_DISK_WRITE", Ndbinfo::Number},
- {"RESET_DELAY_USED", Ndbinfo::Number},
- {"RESET_DISK_SPEED_TIME", Ndbinfo::Number},
- {"BACKUP_POOL_SIZE", Ndbinfo::Number},
- {"BACKUP_FILE_POOL_SIZE", Ndbinfo::Number},
- {"TABLE_POOL_SIZE", Ndbinfo::Number},
- {"TRIGGER_POOL_SIZE", Ndbinfo::Number},
- {"FRAGMENT_POOL_SIZE", Ndbinfo::Number},
- {"PAGE_POOL_SIZE", Ndbinfo::Number},
- {"COMPRESSED_BACKUP", Ndbinfo::Number},
- {"COMPRESSED_LCP", Ndbinfo::Number},
+ {"node_id", Ndbinfo::Number},
+ {"current_disk_write_speed", Ndbinfo::Number},
+ {"bytes_written_this_period",Ndbinfo::Number},
+ {"overflow_disk_write", Ndbinfo::Number},
+ {"reset_delay_used", Ndbinfo::Number},
+ {"reset_disk_speed_time", Ndbinfo::Number},
+ {"backup_pool_size", Ndbinfo::Number},
+ {"backup_file_pool_size", Ndbinfo::Number},
+ {"table_pool_size", Ndbinfo::Number},
+ {"trigger_pool_size", Ndbinfo::Number},
+ {"fragment_pool_size", Ndbinfo::Number},
+ {"page_pool_size", Ndbinfo::Number},
+ {"compressed_backup", Ndbinfo::Number},
+ {"compressed_lcp", Ndbinfo::Number},
}
};
DECLARE_NDBINFO_TABLE(ndbinfo_POOLS,6) =
-{ "POOLS", 6, 0,
+{ "pools", 6, 0,
{
- {"NODE_ID", Ndbinfo::Number},
- {"BLOCK_NUMBER", Ndbinfo::Number},
- {"BLOCK_INSTANCE", Ndbinfo::Number},
- {"POOL_NAME", Ndbinfo::String},
- {"FREE", Ndbinfo::Number},
- {"SIZE", Ndbinfo::Number},
+ {"node_id", Ndbinfo::Number},
+ {"block_number", Ndbinfo::Number},
+ {"block_instance", Ndbinfo::Number},
+ {"pool_name", Ndbinfo::String},
+ {"free", Ndbinfo::Number},
+ {"size", Ndbinfo::Number},
}
};
DECLARE_NDBINFO_TABLE(ndbinfo_TEST,4) =
-{ "TEST", 4, 0,
+{ "test", 4, 0,
{
- {"NODE_ID", Ndbinfo::Number},
- {"BLOCK_NUMBER", Ndbinfo::Number},
- {"BLOCK_INSTANCE", Ndbinfo::Number},
- {"COUNTER", Ndbinfo::Number},
+ {"node_id", Ndbinfo::Number},
+ {"block_number", Ndbinfo::Number},
+ {"block_instance", Ndbinfo::Number},
+ {"counter", Ndbinfo::Number},
}
};
=== modified file 'storage/ndb/src/ndbapi/NdbInfo.cpp'
--- a/storage/ndb/src/ndbapi/NdbInfo.cpp 2009-07-09 15:04:27 +0000
+++ b/storage/ndb/src/ndbapi/NdbInfo.cpp 2009-07-10 09:04:33 +0000
@@ -22,15 +22,13 @@
NdbInfo::NdbInfo(class Ndb_cluster_connection* connection,
const char* prefix, const char* dbname,
- const char* table_prefix,
- bool use_lower_case) :
+ const char* table_prefix) :
m_connect_count(connection->get_connect_count()),
m_connection(connection),
m_tables_table(NULL), m_columns_table(NULL),
m_prefix(prefix),
m_dbname(dbname),
m_table_prefix(table_prefix),
- m_use_lower_case(use_lower_case),
m_id_counter(0)
{
}
@@ -52,11 +50,8 @@ NdbInfo::~NdbInfo(void)
BaseString NdbInfo::mysql_table_name(const char* table_name) const
{
DBUG_ENTER("mysql_table_name");
- BaseString mysql_name(m_prefix);
- BaseString name(table_name);
- if (m_use_lower_case)
- name.ndb_tolower();
- mysql_name.append(name);
+ BaseString mysql_name;
+ mysql_name.assfmt("%s%s", m_prefix.c_str(), table_name);
DBUG_PRINT("exit", ("mysql_name: %s", mysql_name.c_str()));
DBUG_RETURN(mysql_name);
}
@@ -64,10 +59,10 @@ BaseString NdbInfo::mysql_table_name(con
bool NdbInfo::load_hardcoded_tables(void)
{
{
- InfoTable tabs("TABLES", 0);
- if (!tabs.addColumn(InfoColumn("TABLE_ID", 0, InfoColumn::Number)) ||
- !tabs.addColumn(InfoColumn("TABLE_NAME", 1, InfoColumn::String)) ||
- !tabs.addColumn(InfoColumn("CREATE_SQL", 2, InfoColumn::String, true)))
+ InfoTable tabs("tables", 0);
+ if (!tabs.addColumn(InfoColumn("table_id", 0, InfoColumn::Number)) ||
+ !tabs.addColumn(InfoColumn("table_name", 1, InfoColumn::String)) ||
+ !tabs.addColumn(InfoColumn("create_sql", 2, InfoColumn::String, true)))
return false;
BaseString hash_key = mysql_table_name(tabs.getName());
@@ -78,11 +73,11 @@ bool NdbInfo::load_hardcoded_tables(void
}
{
- InfoTable cols("COLUMNS", 1);
- if (!cols.addColumn(InfoColumn("TABLE_ID", 0, InfoColumn::Number)) ||
- !cols.addColumn(InfoColumn("COLUMN_ID", 1, InfoColumn::Number)) ||
- !cols.addColumn(InfoColumn("COLUMN_NAME", 2, InfoColumn::String)) ||
- !cols.addColumn(InfoColumn("COLUMN_TYPE", 3, InfoColumn::String)))
+ InfoTable cols("columns", 1);
+ if (!cols.addColumn(InfoColumn("table_id", 0, InfoColumn::Number)) ||
+ !cols.addColumn(InfoColumn("column_id", 1, InfoColumn::Number)) ||
+ !cols.addColumn(InfoColumn("column_name", 2, InfoColumn::String)) ||
+ !cols.addColumn(InfoColumn("column_type", 3, InfoColumn::String)))
return false;
BaseString hash_key = mysql_table_name(cols.getName());
@@ -129,8 +124,8 @@ bool NdbInfo::load_ndbinfo_tables(void)
DBUG_RETURN(false);
}
- const NdbInfoRecAttr *tableIdRes = scanOp->getValue("TABLE_ID");
- const NdbInfoRecAttr *tableNameRes = scanOp->getValue("TABLE_NAME");
+ const NdbInfoRecAttr *tableIdRes = scanOp->getValue("table_id");
+ const NdbInfoRecAttr *tableNameRes = scanOp->getValue("table_name");
if (!tableIdRes || !tableNameRes)
{
releaseScanOperation(scanOp);
@@ -152,10 +147,10 @@ bool NdbInfo::load_ndbinfo_tables(void)
tableName, tableId));
switch (tableId) {
case 0:
- assert(strcmp(tableName, "TABLES") == 0);
+ assert(strcmp(tableName, "tables") == 0);
break;
case 1:
- assert(strcmp(tableName, "COLUMNS") == 0);
+ assert(strcmp(tableName, "columns") == 0);
break;
default:
@@ -188,10 +183,10 @@ bool NdbInfo::load_ndbinfo_tables(void)
DBUG_RETURN(false);
}
- const NdbInfoRecAttr *tableIdRes = scanOp->getValue("TABLE_ID");
- const NdbInfoRecAttr *columnIdRes = scanOp->getValue("COLUMN_ID");
- const NdbInfoRecAttr *columnNameRes = scanOp->getValue("COLUMN_NAME");
- const NdbInfoRecAttr *columnTypeRes = scanOp->getValue("COLUMN_TYPE");
+ const NdbInfoRecAttr *tableIdRes = scanOp->getValue("table_id");
+ const NdbInfoRecAttr *columnIdRes = scanOp->getValue("column_id");
+ const NdbInfoRecAttr *columnNameRes = scanOp->getValue("column_name");
+ const NdbInfoRecAttr *columnTypeRes = scanOp->getValue("column_type");
if (!tableIdRes || !columnIdRes || !columnNameRes || !columnTypeRes)
{
releaseScanOperation(scanOp);
=== modified file 'storage/ndb/src/ndbapi/NdbInfo.hpp'
--- a/storage/ndb/src/ndbapi/NdbInfo.hpp 2009-07-09 10:37:49 +0000
+++ b/storage/ndb/src/ndbapi/NdbInfo.hpp 2009-07-10 09:04:33 +0000
@@ -97,7 +97,7 @@ public:
NdbInfo(class Ndb_cluster_connection* connection,
const char* prefix, const char* dbname = "",
- const char* table_prefix = "", bool use_lower_case = false);
+ const char* table_prefix = "");
bool init(void);
~NdbInfo();
@@ -125,7 +125,6 @@ private:
BaseString m_prefix;
BaseString m_dbname;
BaseString m_table_prefix;
- bool m_use_lower_case;
Uint32 m_id_counter;
bool addColumn(Uint32 tableId, const InfoColumn aCol);
=== modified file 'storage/ndb/test/ndbapi/testNdbinfo.cpp'
--- a/storage/ndb/test/ndbapi/testNdbinfo.cpp 2009-07-09 15:04:27 +0000
+++ b/storage/ndb/test/ndbapi/testNdbinfo.cpp 2009-07-10 09:04:33 +0000
@@ -31,9 +31,9 @@ int runTestNdbInfo(NDBT_Context* ctx, ND
}
const NdbInfo::InfoTable* table;
- if (ndbinfo.openTable("ndbinfo/TABLES", &table) != 0)
+ if (ndbinfo.openTable("ndbinfo/tables", &table) != 0)
{
- g_err << "Failed to openTable(TABLES)" << endl;
+ g_err << "Failed to openTable(tables)" << endl;
return NDBT_FAILED;
}
@@ -53,8 +53,8 @@ int runTestNdbInfo(NDBT_Context* ctx, ND
return NDBT_FAILED;
}
- const NdbInfoRecAttr* tableName= scanOp->getValue("TABLE_NAME");
- const NdbInfoRecAttr* createSQL= scanOp->getValue("CREATE_SQL");
+ const NdbInfoRecAttr* tableName= scanOp->getValue("table_name");
+ const NdbInfoRecAttr* createSQL= scanOp->getValue("create_sql");
if(scanOp->execute() != 0)
{
@@ -78,7 +78,7 @@ int runTestNdbInfo(NDBT_Context* ctx, ND
int runCreateSQL(NDBT_Context* ctx, NDBT_Step* step)
{
const char* ndbinfo_db = "ndb$info";
- const char* table_prefix = "NDB$";
+ const char* table_prefix = "ndb$";
NdbInfo ndbinfo(&ctx->m_cluster_connection, "ndbinfo/",
ndbinfo_db, table_prefix);
@@ -299,7 +299,7 @@ int runRatelimit(NDBT_Context* ctx, NDBT
return NDBT_FAILED;
}
- Uint32 tableId = 6; // MASV 0
+ Uint32 tableId = 0;
while(true) {
const NdbInfo::InfoTable* table;
@@ -396,9 +396,9 @@ int runTestTable(NDBT_Context* ctx, NDBT
}
const NdbInfo::InfoTable* table;
- if (ndbinfo.openTable("ndbinfo/TEST", &table) != 0)
+ if (ndbinfo.openTable("ndbinfo/test", &table) != 0)
{
- g_err << "Failed to openTable(TEST)" << endl;
+ g_err << "Failed to openTable(test)" << endl;
return NDBT_FAILED;
}
@@ -418,10 +418,10 @@ int runTestTable(NDBT_Context* ctx, NDBT
return NDBT_FAILED;
}
- const NdbInfoRecAttr* nodeId= scanOp->getValue("NODE_ID");
- const NdbInfoRecAttr* blockNumber= scanOp->getValue("BLOCK_NUMBER");
- const NdbInfoRecAttr* blockInstance= scanOp->getValue("BLOCK_INSTANCE");
- const NdbInfoRecAttr* counter= scanOp->getValue("COUNTER");
+ const NdbInfoRecAttr* nodeId= scanOp->getValue("node_id");
+ const NdbInfoRecAttr* blockNumber= scanOp->getValue("block_number");
+ const NdbInfoRecAttr* blockInstance= scanOp->getValue("block_instance");
+ const NdbInfoRecAttr* counter= scanOp->getValue("counter");
if(scanOp->execute() != 0)
{
Attachment: [text/bzr-bundle] bzr/magnus.blaudd@sun.com-20090710092935-y7mpeobln03o1vxe.bundle
| Thread |
|---|
| • bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:2940) | Magnus Blåudd | 10 Jul |
