diff options
| author | unknown <heikki@donna.mysql.fi> | 2001-08-31 16:50:57 +0300 |
|---|---|---|
| committer | unknown <heikki@donna.mysql.fi> | 2001-08-31 16:50:57 +0300 |
| commit | e19a292c56c3c613a798f612a73ff4b9e62eb911 (patch) | |
| tree | 0226a7a1b9d6fb09aaaed6ebed0bb5a5bad960a1 /sql | |
| parent | 421e64ae356a1633ea50294b48c5025ea387a64d (diff) | |
| download | mariadb-git-e19a292c56c3c613a798f612a73ff4b9e62eb911.tar.gz | |
ha_innobase.cc Add better error message if innodb_data_file_path is not set
ha_innobase.h Remove HA_NOT_READ_AFTER_KEY from table han
ha_innobase.h dler flags: it prevented the use of an index in MAX()
sql/ha_innobase.h:
Remove HA_NOT_READ_AFTER_KEY from table han
dler flags: it prevented the use of an index in MAX()
sql/ha_innobase.cc:
Add better error message if innodb_data_file_path is not set
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_innobase.cc | 10 | ||||
| -rw-r--r-- | sql/ha_innobase.h | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc index 5f76ec39ce3..2eed5ada680 100644 --- a/sql/ha_innobase.cc +++ b/sql/ha_innobase.cc @@ -542,7 +542,15 @@ innobase_init(void) if (!innobase_data_file_path) { fprintf(stderr, - "Can't initialize InnoDB as 'innodb_data_file_path' is not set\n"); + "Cannot initialize InnoDB as 'innodb_data_file_path' is not set.\n" + "If you do not want to use transactional InnoDB tables, add a line\n" + "skip-innodb\n" + "to the [mysqld] section of init parameters in your my.cnf\n" + "or my.ini. If you want to use InnoDB tables, add for example,\n" + "innodb_data_file_path = /mysql/data/ibdata1:20M\n" + "More information on setting the parameters you find in the\n" + "manual.\n"); + innodb_skip=1; DBUG_RETURN(FALSE); // Continue without innobase } diff --git a/sql/ha_innobase.h b/sql/ha_innobase.h index d129e00ba6e..daa987dd757 100644 --- a/sql/ha_innobase.h +++ b/sql/ha_innobase.h @@ -83,7 +83,7 @@ class ha_innobase: public handler HA_NO_WRITE_DELAYED | HA_PRIMARY_KEY_IN_READ_INDEX | HA_DROP_BEFORE_CREATE | - HA_NOT_READ_AFTER_KEY | HA_NO_PREFIX_CHAR_KEYS), + HA_NO_PREFIX_CHAR_KEYS), last_dup_key((uint) -1), start_of_scan(0) { |