Commit 388450f6 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

refs #6028, compilation fix

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@53329 c7de825b-a66e-492c-adef-691d508d4ae1
parent b6ea904d
...@@ -2886,6 +2886,8 @@ bool fields_are_same_type( ...@@ -2886,6 +2886,8 @@ bool fields_are_same_type(
bool retval = true; bool retval = true;
enum_field_types a_mysql_type = a->real_type(); enum_field_types a_mysql_type = a->real_type();
enum_field_types b_mysql_type = b->real_type(); enum_field_types b_mysql_type = b->real_type();
TOKU_TYPE a_toku_type = mysql_to_toku_type(a);
TOKU_TYPE b_toku_type = mysql_to_toku_type(b);
// make sure have same names // make sure have same names
// make sure have same types // make sure have same types
if (a_mysql_type != b_mysql_type) { if (a_mysql_type != b_mysql_type) {
...@@ -2896,8 +2898,6 @@ bool fields_are_same_type( ...@@ -2896,8 +2898,6 @@ bool fields_are_same_type(
// be the same MySQL type but not the same toku type, // be the same MySQL type but not the same toku type,
// This is an issue introduced with MariaDB's fractional time // This is an issue introduced with MariaDB's fractional time
// implementation // implementation
TOKU_TYPE a_toku_type = mysql_to_toku_type(a);
TOKU_TYPE b_toku_type = mysql_to_toku_type(b);
if (a_toku_type != b_toku_type) { if (a_toku_type != b_toku_type) {
retval = false; retval = false;
goto cleanup; goto cleanup;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment