diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-07-23 00:15:53 +0300 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-07-23 00:15:53 +0300 |
| commit | 20b098551d35d1ff21f7418fbcd960ac0a247a56 (patch) | |
| tree | fe24aa5f883d66e688458a0c94afba1b629eecc1 /sql/ha_innodb.h | |
| parent | 96c050321d8e87e5ee94bab2ae21655d4a80cd3b (diff) | |
| parent | f1e255130bf57880f228b1a42c41885e99d5644a (diff) | |
| download | mariadb-git-20b098551d35d1ff21f7418fbcd960ac0a247a56.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
BitKeeper/etc/config:
Auto merged
sql/field.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/ha_heap.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisam.h:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_myisammrg.h:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/ha_ndbcluster.cc:
Merge.
sql/field.h:
Auto merged
Diffstat (limited to 'sql/ha_innodb.h')
| -rw-r--r-- | sql/ha_innodb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h index acfe8b950eb..1883885a805 100644 --- a/sql/ha_innodb.h +++ b/sql/ha_innodb.h @@ -202,6 +202,8 @@ class ha_innobase: public handler static ulonglong get_mysql_bin_log_pos(); bool primary_key_is_clustered() { return true; } int cmp_ref(const byte *ref1, const byte *ref2); + bool ha_innobase::check_if_incompatible_data(HA_CREATE_INFO *info, + uint table_changes); }; extern struct show_var_st innodb_status_variables[]; |