fix lost vcol checks in sql_table.cc,

remove unused FIELD_IS_xxx flags change vcol tests to use innodb, not xtradb.
2026-10-23 18:49:29 +03:00 · 2013-07-12 13:32:37 +02:00
parent f672d6b7d8
commit ee8195a731
14 changed files with 35 additions and 20 deletions
--- a/mysql-test/suite/vcol/t/rpl_vcol.test
+++ b/mysql-test/suite/vcol/t/rpl_vcol.test
@@ -27,7 +27,7 @@

 ##### Storage engine to be tested
 # Set the session storage engine
--source include/have_xtradb.inc
+--source include/have_innodb.inc
 SET @@session.storage_engine = 'InnoDB';

 #------------------------------------------------------------------------------#
--- a/mysql-test/suite/vcol/t/vcol_blocked_sql_funcs_innodb.test
+++ b/mysql-test/suite/vcol/t/vcol_blocked_sql_funcs_innodb.test
@@ -32,7 +32,7 @@

 ##### Storage engine to be tested
 # Set the session storage engine
--source include/have_xtradb.inc
+--source include/have_innodb.inc
 eval SET @@session.storage_engine = 'InnoDB';

 let $skip_full_text_checks = 1;
--- a/mysql-test/suite/vcol/t/vcol_column_def_options_innodb.test
+++ b/mysql-test/suite/vcol/t/vcol_column_def_options_innodb.test
@@ -33,7 +33,7 @@

 ##### Storage engine to be tested
 # Set the session storage engine
--source include/have_xtradb.inc
+--source include/have_innodb.inc
 eval SET @@session.storage_engine = 'InnoDB';

 ##### Workarounds for known open engine specific bugs
--- a/mysql-test/suite/vcol/t/vcol_handler_innodb.test
+++ b/mysql-test/suite/vcol/t/vcol_handler_innodb.test
@@ -33,7 +33,7 @@

 ##### Storage engine to be tested
 # Set the session storage engine
--source include/have_xtradb.inc
+--source include/have_innodb.inc
 eval SET @@session.storage_engine = 'InnoDB';

 ##### Workarounds for known open engine specific bugs
--- a/mysql-test/suite/vcol/t/vcol_ins_upd_innodb.test
+++ b/mysql-test/suite/vcol/t/vcol_ins_upd_innodb.test
@@ -33,7 +33,7 @@

 ##### Storage engine to be tested
 # Set the session storage engine
--source include/have_xtradb.inc
+--source include/have_innodb.inc
 eval SET @@session.storage_engine = 'InnoDB';

 ##### Workarounds for known open engine specific bugs
--- a/mysql-test/suite/vcol/t/vcol_keys_innodb.test
+++ b/mysql-test/suite/vcol/t/vcol_keys_innodb.test
@@ -33,7 +33,7 @@

 ##### Storage engine to be tested
 # Set the session storage engine
--source include/have_xtradb.inc
+--source include/have_innodb.inc
 eval SET @@session.storage_engine = 'InnoDB';

 ##### Workarounds for known open engine specific bugs
--- a/mysql-test/suite/vcol/t/vcol_non_stored_columns_innodb.test
+++ b/mysql-test/suite/vcol/t/vcol_non_stored_columns_innodb.test
@@ -35,7 +35,7 @@

 ##### Storage engine to be tested
 # Set the session storage engine
--source include/have_xtradb.inc
+--source include/have_innodb.inc
 eval SET @@session.storage_engine = 'InnoDB';

 ##### Workarounds for known open engine specific bugs
--- a/mysql-test/suite/vcol/t/vcol_partition_innodb.test
+++ b/mysql-test/suite/vcol/t/vcol_partition_innodb.test
@@ -33,7 +33,7 @@

 ##### Storage engine to be tested
 # Set the session storage engine
--source include/have_xtradb.inc
+--source include/have_innodb.inc
 eval SET @@session.storage_engine = 'InnoDB';

 ##### Workarounds for known open engine specific bugs
--- a/mysql-test/suite/vcol/t/vcol_select_innodb.test
+++ b/mysql-test/suite/vcol/t/vcol_select_innodb.test
@@ -33,7 +33,7 @@

 ##### Storage engine to be tested
 # Set the session storage engine
--source include/have_xtradb.inc
+--source include/have_innodb.inc
 eval SET @@session.storage_engine = 'InnoDB';

 ##### Workarounds for known open engine specific bugs
--- a/mysql-test/suite/vcol/t/vcol_supported_sql_funcs_innodb.test
+++ b/mysql-test/suite/vcol/t/vcol_supported_sql_funcs_innodb.test
@@ -32,7 +32,7 @@

 ##### Storage engine to be tested
 # Set the session storage engine
--source include/have_xtradb.inc
+--source include/have_innodb.inc
 SET @@session.storage_engine = 'InnoDB';

 ##### Workarounds for known open engine specific bugs
--- a/mysql-test/suite/vcol/t/vcol_trigger_sp_innodb.test
+++ b/mysql-test/suite/vcol/t/vcol_trigger_sp_innodb.test
@@ -34,7 +34,7 @@

 ##### Storage engine to be tested
 # Set the session storage engine
--source include/have_xtradb.inc
+--source include/have_innodb.inc
 eval SET @@session.storage_engine = 'InnoDB';

 ##### Workarounds for known open engine specific bugs
--- a/mysql-test/suite/vcol/t/vcol_view_innodb.test
+++ b/mysql-test/suite/vcol/t/vcol_view_innodb.test
@@ -33,7 +33,7 @@

 ##### Storage engine to be tested
 # Set the session storage engine
--source include/have_xtradb.inc
+--source include/have_innodb.inc
 eval SET @@session.storage_engine = 'InnoDB';

 ##### Workarounds for known open engine specific bugs