diff options
| author | unknown <Justin.He/justin.he@dev3-240.dev.cn.tlan> | 2007-08-29 10:49:31 +0800 |
|---|---|---|
| committer | unknown <Justin.He/justin.he@dev3-240.dev.cn.tlan> | 2007-08-29 10:49:31 +0800 |
| commit | b6621a44a43162e1c638ef00114fa39548c40c7b (patch) | |
| tree | 2942069dc3fb2c8fb2e6cdc1e6cb83b953f3a082 /mysql-test | |
| parent | 7f3d03fc9f303b1782824e94ad9130d192c04e1e (diff) | |
| parent | dfad6b37d53aef01a6b379b5536268b4b49617a6 (diff) | |
| download | mariadb-git-b6621a44a43162e1c638ef00114fa39548c40c7b.tar.gz | |
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ndb_restore.result | 5 | ||||
| -rw-r--r-- | mysql-test/t/ndb_restore.test | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/ndb_restore.result b/mysql-test/r/ndb_restore.result index d1c76192cef..aba6997d218 100644 --- a/mysql-test/r/ndb_restore.result +++ b/mysql-test/r/ndb_restore.result @@ -141,6 +141,11 @@ DROP TABLE test.backup_info; drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c,t10_c; ForceVarPart: 0 ForceVarPart: 1 +select * from information_schema.columns where table_name = "t1_c"; +TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT +NULL test t1_c capgoaledatta 1 NULL NO mediumint NULL NULL 7 0 NULL NULL mediumint(5) unsigned PRI auto_increment select,insert,update,references +NULL test t1_c goaledatta 2 NO char 2 2 NULL NULL latin1 latin1_swedish_ci char(2) PRI select,insert,update,references +NULL test t1_c maturegarbagefa 3 NO varchar 32 32 NULL NULL latin1 latin1_swedish_ci varchar(32) PRI select,insert,update,references select count(*) from t1; count(*) 5 diff --git a/mysql-test/t/ndb_restore.test b/mysql-test/t/ndb_restore.test index 7f0cafdfd77..18efa66ebe0 100644 --- a/mysql-test/t/ndb_restore.test +++ b/mysql-test/t/ndb_restore.test @@ -180,6 +180,11 @@ drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c,t10_c; --exec $NDB_TOOLS_DIR/ndb_desc --no-defaults -d test t3_c | grep ForceVarPart --exec $NDB_TOOLS_DIR/ndb_desc --no-defaults -d test t2_c | grep ForceVarPart +# Bug #30667 +# ndb table discovery does not work correcly with information schema +# - prior to bug fix this would yeild no output and a warning +select * from information_schema.columns where table_name = "t1_c"; + # random output order?? #show tables; |