#At file:///home/msvensson/mysql/tmp/oheUmOdmQm/7.0/ based on revid:magnus.blaudd@stripped13105128-2hj4hjyj6l5oq5rz
2949 Magnus Blåudd 2009-07-13 [merge]
Merge
added:
mysql-test/suite/ndb/t/show_attributes.inc
mysql-test/suite/ndb/t/show_varpart.inc
modified:
mysql-test/suite/ndb/r/ndb_alter_table_online.result
mysql-test/suite/ndb/r/ndb_column_properties.result
mysql-test/suite/ndb/r/ndb_dd_alter.result
mysql-test/suite/ndb/r/ndb_dd_restore_compat.result
mysql-test/suite/ndb/r/ndb_partition_key.result
mysql-test/suite/ndb/t/ndb_alter_table_online.test
mysql-test/suite/ndb/t/ndb_column_properties.test
mysql-test/suite/ndb/t/ndb_dd_alter.test
mysql-test/suite/ndb/t/ndb_dd_restore_compat.test
mysql-test/suite/ndb/t/ndb_partition_key.test
mysql-test/suite/ndb/t/ndb_row_format.test
=== modified file 'mysql-test/suite/ndb/r/ndb_alter_table_online.result'
--- a/mysql-test/suite/ndb/r/ndb_alter_table_online.result 2009-07-13 10:51:28 +0000
+++ b/mysql-test/suite/ndb/r/ndb_alter_table_online.result 2009-07-13 13:22:46 +0000
@@ -681,12 +681,14 @@ CREATE TABLE t1
ENGINE=NDB;
Warnings:
Warning 1478 Row format FIXED incompatible with dynamic attribute b
+Attributes:
pk1 Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
b Int NULL AT=FIXED ST=MEMORY DYNAMIC
DROP TABLE t1;
CREATE TABLE t1
(pk1 INT NOT NULL COLUMN_FORMAT FIXED PRIMARY KEY,
b INT COLUMN_FORMAT FIXED)ROW_FORMAT=DYNAMIC ENGINE=NDB;
+Attributes:
pk1 Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
b Int NULL AT=FIXED ST=MEMORY
********************
=== modified file 'mysql-test/suite/ndb/r/ndb_column_properties.result'
--- a/mysql-test/suite/ndb/r/ndb_column_properties.result 2007-11-19 12:56:54 +0000
+++ b/mysql-test/suite/ndb/r/ndb_column_properties.result 2009-07-13 13:22:46 +0000
@@ -21,6 +21,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL
) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+Attributes:
a Int NULL AT=FIXED ST=DISK
$PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY AUTO_INCR
drop table t1;
@@ -98,6 +99,7 @@ t1 CREATE TABLE `t1` (
`f1` char(100) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT DYNAMIC */,
KEY `b` (`b`)
) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+Attributes:
a Int NULL AT=FIXED ST=DISK
a1 Int NULL AT=FIXED ST=MEMORY
b Int NOT NULL AT=FIXED ST=MEMORY DYNAMIC
@@ -131,6 +133,7 @@ t1 CREATE TABLE `t1` (
`f1` char(100) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT DYNAMIC */,
KEY `b` (`b`)
) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+Attributes:
a Int NULL AT=FIXED ST=MEMORY
a1 Int NULL AT=FIXED ST=MEMORY
b Int NOT NULL AT=FIXED ST=MEMORY DYNAMIC
@@ -168,6 +171,7 @@ t1 CREATE TABLE `t1` (
`a2` int(11) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
KEY `b` (`b`)
) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+Attributes:
a Int NULL AT=FIXED ST=MEMORY
a1 Int NULL AT=FIXED ST=MEMORY
b Int NOT NULL AT=FIXED ST=MEMORY
@@ -204,6 +208,7 @@ t1 CREATE TABLE `t1` (
`c2` varchar(100) /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL,
KEY `b` (`b`)
) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+Attributes:
a Int NULL AT=FIXED ST=MEMORY
a1 Int NULL AT=FIXED ST=MEMORY
b Int NOT NULL AT=FIXED ST=MEMORY
@@ -242,6 +247,7 @@ t1 CREATE TABLE `t1` (
`c3` varchar(100) /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
KEY `b` (`b`)
) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+Attributes:
a Int NULL AT=FIXED ST=MEMORY
a1 Int NULL AT=FIXED ST=MEMORY
b Int NOT NULL AT=FIXED ST=MEMORY
@@ -266,6 +272,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) /*!50120 STORAGE MEMORY */ /*!50120 COLUMN_FORMAT DYNAMIC */ DEFAULT NULL
) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+Attributes:
a Int NULL AT=FIXED ST=MEMORY DYNAMIC
$PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY AUTO_INCR
drop table t1;
@@ -276,6 +283,7 @@ t1 CREATE TABLE `t1` (
`column_format` int(11) /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL,
`storage` int(11) /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT FIXED */ DEFAULT NULL
) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+Attributes:
column_format Int NULL AT=FIXED ST=DISK
storage Int NULL AT=FIXED ST=DISK
$PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY AUTO_INCR
=== modified file 'mysql-test/suite/ndb/r/ndb_dd_alter.result'
--- a/mysql-test/suite/ndb/r/ndb_dd_alter.result 2009-02-12 15:21:46 +0000
+++ b/mysql-test/suite/ndb/r/ndb_dd_alter.result 2009-07-13 13:22:46 +0000
@@ -77,6 +77,7 @@ t1 CREATE TABLE `t1` (
`a10` blob,
PRIMARY KEY (`a1`)
) /*!50100 TABLESPACE ts STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+Attributes:
a1 Smallint PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
a2 Int NOT NULL AT=FIXED ST=DISK
a3 Bigint NOT NULL AT=FIXED ST=DISK
@@ -176,6 +177,7 @@ t1 CREATE TABLE `t1` (
`a10` blob,
PRIMARY KEY (`a1`)
) /*!50100 TABLESPACE ts STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+Attributes:
a1 Smallint PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
a2 Int NOT NULL AT=FIXED ST=DISK
a3 Bigint NOT NULL AT=FIXED ST=DISK
@@ -262,6 +264,7 @@ t1 CREATE TABLE `t1` (
`a10` blob,
PRIMARY KEY (`a1`)
) /*!50100 TABLESPACE ts STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+Attributes:
a1 Smallint PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
a2 Int NOT NULL AT=FIXED ST=DISK
a3 Bigint NOT NULL AT=FIXED ST=DISK
@@ -384,6 +387,7 @@ t1 CREATE TABLE `t1` (
`a14` blob,
PRIMARY KEY (`a1`)
) /*!50100 TABLESPACE ts STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+Attributes:
a1 Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
a2 Float NULL AT=FIXED ST=DISK
a3 Double NULL AT=FIXED ST=DISK
@@ -442,6 +446,7 @@ t1 CREATE TABLE `t1` (
KEY `a2_i` (`a2`),
KEY `a3_i` (`a3`)
) /*!50100 TABLESPACE ts STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+Attributes:
a1 Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
a2 Float NULL AT=FIXED ST=MEMORY
a3 Double NULL AT=FIXED ST=MEMORY
@@ -477,6 +482,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`a1`),
KEY `a3_i` (`a3`)
) /*!50100 TABLESPACE ts STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+Attributes:
a1 Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
a2 Float NULL AT=FIXED ST=DISK
a3 Double NULL AT=FIXED ST=MEMORY
@@ -512,6 +518,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`a1`),
KEY `a3_i` (`a3`)
) /*!50100 TABLESPACE ts STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+Attributes:
a1 Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
a2 Float NULL AT=FIXED ST=DISK
a3 Double NULL AT=FIXED ST=MEMORY
@@ -546,6 +553,7 @@ t1 CREATE TABLE `t1` (
`a5` tinyint(4) DEFAULT NULL,
KEY `a3_i` (`a3`)
) /*!50100 TABLESPACE ts STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+Attributes:
a1 Int NOT NULL AT=FIXED ST=DISK
a2 Float NULL AT=FIXED ST=DISK
a3 Double NULL AT=FIXED ST=MEMORY
=== modified file 'mysql-test/suite/ndb/r/ndb_dd_restore_compat.result'
--- a/mysql-test/suite/ndb/r/ndb_dd_restore_compat.result 2007-11-29 10:29:35 +0000
+++ b/mysql-test/suite/ndb/r/ndb_dd_restore_compat.result 2009-07-13 13:22:46 +0000
@@ -26,6 +26,7 @@ t1 CREATE TABLE `t1` (
`a10` blob,
PRIMARY KEY (`a1`)
) /*!50100 TABLESPACE ts */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+Attributes:
a1 Smallint PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
a2 Int NOT NULL AT=FIXED ST=DISK
a3 Bigint NOT NULL AT=FIXED ST=DISK
=== modified file 'mysql-test/suite/ndb/r/ndb_partition_key.result'
--- a/mysql-test/suite/ndb/r/ndb_partition_key.result 2009-05-16 08:26:43 +0000
+++ b/mysql-test/suite/ndb/r/ndb_partition_key.result 2009-07-13 13:22:46 +0000
@@ -62,6 +62,7 @@ ENGINE=NDB
DEFAULT CHARSET=latin1
PARTITION BY KEY (b);
insert into t1 values (1,"a",1,1),(2,"a",1,1),(3,"a",1,1);
+Attributes:
a Int PRIMARY KEY AT=FIXED ST=MEMORY
b Char(10;latin1_bin) PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
c Int PRIMARY KEY AT=FIXED ST=MEMORY
=== modified file 'mysql-test/suite/ndb/t/ndb_alter_table_online.test'
--- a/mysql-test/suite/ndb/t/ndb_alter_table_online.test 2009-07-13 10:51:28 +0000
+++ b/mysql-test/suite/ndb/t/ndb_alter_table_online.test 2009-07-13 13:22:46 +0000
@@ -633,7 +633,7 @@ DROP TABLE t1;
--exec $NDB_RESTORE --no-defaults -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
--exec $NDB_RESTORE --no-defaults -b $the_backup_id -n 2 -r --print --print_meta $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
---exec $NDB_DESC --no-defaults -d test t1 | grep ForceVarPart
+source show_varpart.inc;
DROP TABLE t1;
@@ -721,7 +721,7 @@ CREATE TABLE t1
(pk1 INT NOT NULL PRIMARY KEY, b INT COLUMN_FORMAT DYNAMIC)ROW_FORMAT=FIXED
ENGINE=NDB;
---exec $NDB_DESC --no-defaults -d test t1 | grep 'AT='
+source show_attributes.inc;
DROP TABLE t1;
@@ -729,7 +729,7 @@ CREATE TABLE t1
(pk1 INT NOT NULL COLUMN_FORMAT FIXED PRIMARY KEY,
b INT COLUMN_FORMAT FIXED)ROW_FORMAT=DYNAMIC ENGINE=NDB;
---exec $NDB_DESC --no-defaults -d test t1 | grep 'AT='
+source show_attributes.inc;
--echo ********************
--echo * Cleanup Section
=== modified file 'mysql-test/suite/ndb/t/ndb_column_properties.test'
--- a/mysql-test/suite/ndb/t/ndb_column_properties.test 2008-10-13 17:45:03 +0000
+++ b/mysql-test/suite/ndb/t/ndb_column_properties.test 2009-07-13 13:22:46 +0000
@@ -20,7 +20,7 @@ create table t1 (a int column_format DYN
select column_name, storage, format from information_schema.columns
where table_name = "t1";
show create table t1;
---exec $NDB_DESC --no-defaults -d test t1 | grep 'ST='
+source show_attributes.inc;
drop table t1;
create table t1 (a int column_format DYNAMIC,
@@ -46,32 +46,32 @@ select column_name, storage, format from
where table_name = "t1";
alter table t1 change column a a int storage disk;
show create table t1;
---exec $NDB_DESC --no-defaults -d test t1 | grep 'ST='
+source show_attributes.inc;
alter table t1 change column a a int storage memory;
show create table t1;
---exec $NDB_DESC --no-defaults -d test t1 | grep 'ST='
+source show_attributes.inc;
alter table t1 change column b b int NOT NULL storage memory;
alter table t1 add column a2 int column_format FIXED;
show create table t1;
---exec $NDB_DESC --no-defaults -d test t1 | grep 'ST='
+source show_attributes.inc;
alter table t1 add column c2 VARCHAR(100) column_format DYNAMIC;
show create table t1;
---exec $NDB_DESC --no-defaults -d test t1 | grep 'ST='
+source show_attributes.inc;
alter table t1 add column c3 VARCHAR(100) column_format FIXED;
show create table t1;
---exec $NDB_DESC --no-defaults -d test t1 | grep 'ST='
-
+source show_attributes.inc;
drop table t1;
+
create table t1 (a int storage disk column_format FIXED) TABLESPACE ts1 engine NDB;
alter table t1 change column a a int storage memory column_format DYNAMIC;
show create table t1;
---exec $NDB_DESC --no-defaults -d test t1 | grep 'ST='
+source show_attributes.inc;
drop table t1;
# Checking keywords
create table t1 (column_format int storage disk column_format FIXED, storage int storage disk column_format FIXED) TABLESPACE ts1 engine NDB;
show create table t1;
---exec $NDB_DESC --no-defaults -d test t1 | grep 'ST='
+source show_attributes.inc;
drop table t1;
ALTER TABLESPACE ts1
=== modified file 'mysql-test/suite/ndb/t/ndb_dd_alter.test'
--- a/mysql-test/suite/ndb/t/ndb_dd_alter.test 2008-12-22 14:21:46 +0000
+++ b/mysql-test/suite/ndb/t/ndb_dd_alter.test 2009-07-13 13:22:46 +0000
@@ -93,7 +93,7 @@ SELECT * FROM test.t1 ORDER BY a1;
ALTER TABLE test.t1 TABLESPACE ts STORAGE DISK ENGINE=NDB;
SHOW CREATE TABLE test.t1;
# Check column storage
---exec $NDB_DESC --no-defaults -d test t1 | grep 'ST='
+source show_attributes.inc;
SELECT * FROM test.t1 ORDER BY a1;
DROP TABLE test.t1;
@@ -127,7 +127,7 @@ SELECT * FROM test.t1 ORDER BY a1;
ALTER TABLE test.t1 TABLESPACE ts STORAGE DISK ENGINE=NDB;
SHOW CREATE TABLE test.t1;
# Check column storage
---exec $NDB_DESC --no-defaults -d test t1 | grep 'ST='
+source show_attributes.inc;
SELECT * FROM test.t1 ORDER BY a1;
#### Try to ALTER from Cluster Disk Data to InnoDB
@@ -138,7 +138,7 @@ SELECT * FROM test.t1 ORDER BY a1;
ALTER TABLE test.t1 TABLESPACE ts STORAGE DISK ENGINE=NDB;
SHOW CREATE TABLE test.t1;
# Check column storage
---exec $NDB_DESC --no-defaults -d test t1 | grep 'ST='
+source show_attributes.inc;
#### Try to ALTER from Cluster Disk Data to MyISAM
@@ -195,7 +195,7 @@ SELECT a1,a2,a3,hex(a4), a5,a6,a7,a8 FRO
ALTER TABLE test.t1 ADD a9 DATETIME, ADD a10 TINYTEXT, ADD a11 MEDIUMTEXT, ADD a12 LONGTEXT, ADD a13 TEXT, ADD a14 BLOB;
SHOW CREATE TABLE test.t1;
# Check column storage
---exec $NDB_DESC --no-defaults -d test t1 | grep 'ST='
+source show_attributes.inc;
disable_query_log;
set @d2 = 'dd2';
@@ -225,21 +225,21 @@ ALTER TABLE test.t1 ADD INDEX a2_i (a2),
SHOW CREATE TABLE test.t1;
# Check column storage
---exec $NDB_DESC --no-defaults -d test t1 | grep 'ST='
+source show_attributes.inc;
ALTER TABLE test.t1 DROP INDEX a2_i;
SHOW CREATE TABLE test.t1;
# Check column storage
---exec $NDB_DESC --no-defaults -d test t1 | grep 'ST='
+source show_attributes.inc;
TRUNCATE TABLE test.t1;
SHOW CREATE TABLE test.t1;
# Check column storage
---exec $NDB_DESC --no-defaults -d test t1 | grep 'ST='
+source show_attributes.inc;
#### Try to ALTER DD Tables and drop columns
@@ -258,7 +258,7 @@ ALTER TABLE test.t1 DROP PRIMARY KEY;
SHOW CREATE TABLE test.t1;
# Check column storage
---exec $NDB_DESC --no-defaults -d test t1 | grep 'ST='
+source show_attributes.inc;
DROP TABLE test.t1;
=== modified file 'mysql-test/suite/ndb/t/ndb_dd_restore_compat.test'
--- a/mysql-test/suite/ndb/t/ndb_dd_restore_compat.test 2008-10-13 17:45:03 +0000
+++ b/mysql-test/suite/ndb/t/ndb_dd_restore_compat.test 2009-07-13 13:22:46 +0000
@@ -8,7 +8,7 @@
select * from information_schema.columns
where table_name = "t1";
show create table t1;
---exec $NDB_DESC --no-defaults -d test t1 | grep 'ST='
+source show_attributes.inc;
select * from t1 order by a1;
drop table t1;
=== modified file 'mysql-test/suite/ndb/t/ndb_partition_key.test'
--- a/mysql-test/suite/ndb/t/ndb_partition_key.test 2009-05-16 09:27:17 +0000
+++ b/mysql-test/suite/ndb/t/ndb_partition_key.test 2009-07-13 13:22:46 +0000
@@ -57,7 +57,7 @@ CREATE TABLE t1 (a INT, b CHAR(10) COLLA
insert into t1 values (1,"a",1,1),(2,"a",1,1),(3,"a",1,1);
# should show only one attribute with DISTRIBUTION KEY
---exec $NDB_DESC --no-defaults -d test t1 | grep 'AT='
+source show_attributes.inc;
#
# Test that explicit partition info is not shown in show create table
=== modified file 'mysql-test/suite/ndb/t/ndb_row_format.test'
--- a/mysql-test/suite/ndb/t/ndb_row_format.test 2008-10-13 17:45:03 +0000
+++ b/mysql-test/suite/ndb/t/ndb_row_format.test 2009-07-13 13:22:46 +0000
@@ -18,7 +18,7 @@ CREATE TABLE t1
# warnings give more detail on the conflict
SHOW WARNINGS;
---exec $NDB_DESC --no-defaults -d test t1 | grep ForceVarPart
+source show_varpart.inc;
INSERT INTO t1 values(0,''),(2,"**"),(4,"****"),(6,"******"),(8,"********"),(10,"**********"),(12,"************");
SELECT * FROM t1 ORDER BY a;
DROP TABLE t1;
@@ -32,7 +32,7 @@ CREATE TABLE t1
( a INT KEY,
b INT )
ENGINE=NDB;
---exec $NDB_DESC --no-defaults -d test t1 | grep ForceVarPart
+source show_varpart.inc;
DROP TABLE t1;
# explicit DEFAULT => ForceVarPart: 1
@@ -41,7 +41,7 @@ CREATE TABLE t1
b INT )
ROW_FORMAT=DEFAULT
ENGINE=NDB;
---exec $NDB_DESC --no-defaults -d test t1 | grep ForceVarPart
+source show_varpart.inc;
DROP TABLE t1;
# FIXED => ForceVarPart: 0
@@ -50,7 +50,7 @@ CREATE TABLE t1
b INT )
ROW_FORMAT=FIXED
ENGINE=NDB;
---exec $NDB_DESC --no-defaults -d test t1 | grep ForceVarPart
+source show_varpart.inc;
DROP TABLE t1;
# DYNAMIC => ForceVarPart: 1
@@ -59,7 +59,7 @@ CREATE TABLE t1
b INT )
ROW_FORMAT=DYNAMIC
ENGINE=NDB;
---exec $NDB_DESC --no-defaults -d test t1 | grep ForceVarPart
+source show_varpart.inc;
DROP TABLE t1;
# test of bug
=== added file 'mysql-test/suite/ndb/t/show_attributes.inc'
--- a/mysql-test/suite/ndb/t/show_attributes.inc 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/t/show_attributes.inc 2009-07-13 13:22:46 +0000
@@ -0,0 +1,20 @@
+--disable_query_log
+let $dump_file = $MYSQLTEST_VARDIR/tmp/desc.txt;
+
+# Dump the output of ndb_desc to file
+--exec $NDB_DESC --no-defaults -d test t1 > $dump_file
+
+# Load the file into a temporary table
+CREATE TEMPORARY TABLE test.desc (a varchar(512)) ENGINE = HEAP;
+
+# needed for embedded
+--exec chmod 0777 $dump_file
+--replace_result $dump_file DUMP_FILE
+eval LOAD DATA INFILE '$dump_file' INTO TABLE test.desc;
+--remove_file $dump_file
+
+# Query the temporary table
+SELECT a as 'Attributes:' FROM test.desc WHERE a LIKE BINARY "%ST=%";
+
+DROP TABLE test.desc;
+--enable_query_log
=== added file 'mysql-test/suite/ndb/t/show_varpart.inc'
--- a/mysql-test/suite/ndb/t/show_varpart.inc 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/t/show_varpart.inc 2009-07-13 13:22:46 +0000
@@ -0,0 +1,22 @@
+--disable_query_log
+let $dump_file = $MYSQLTEST_VARDIR/tmp/desc.txt;
+
+# Dump the output of ndb_desc to file
+--exec $NDB_DESC --no-defaults -d test t1 > $dump_file
+
+# Load the file into a temporary table
+CREATE TEMPORARY TABLE test.desc (a varchar(512)) ENGINE = HEAP;
+
+# needed for embedded
+--exec chmod 0777 $dump_file
+--replace_result $dump_file DUMP_FILE
+eval LOAD DATA INFILE '$dump_file' INTO TABLE test.desc;
+--remove_file $dump_file
+
+# Query the temporary table
+let $value = `SELECT a FROM test.desc
+ WHERE a LIKE BINARY "ForceVarPart%"`;
+echo $value;
+
+DROP TABLE test.desc;
+--enable_query_log
Attachment: [text/bzr-bundle] bzr/magnus.blaudd@sun.com-20090713133323-oecnwmrrk4xmcl06.bundle
| Thread |
|---|
| • bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:2949) | Magnus Blåudd | 13 Jul |
