summaryrefslogtreecommitdiff
path: root/sql/create_options.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2010-05-12 18:15:35 +0200
committerSergei Golubchik <sergii@pisem.net>2010-05-12 18:15:35 +0200
commitf1fb9b67c4e9a402bb52ca73881d7641c9837caa (patch)
treebdfe3fdbb6a676923cc50631cba01bf5392e306d /sql/create_options.cc
parenta3e8ae12805fb85a0b175b3ccbce36da62f8fdc4 (diff)
downloadmariadb-git-f1fb9b67c4e9a402bb52ca73881d7641c9837caa.tar.gz
make table option reader more future-proof
Diffstat (limited to 'sql/create_options.cc')
-rw-r--r--sql/create_options.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/create_options.cc b/sql/create_options.cc
index f4868f95330..8dac8917a6b 100644
--- a/sql/create_options.cc
+++ b/sql/create_options.cc
@@ -587,7 +587,12 @@ my_bool engine_table_options_frm_read(const uchar *buff, uint length,
buff++;
}
- DBUG_RETURN(buff != buff_end);
+ if (buff < buff_end)
+ sql_print_warning("Table %`s was created in a later MariaDB version - "
+ "unknown table attributes were ignored",
+ share->table_name);
+
+ DBUG_RETURN(buff > buff_end);
}
/**