Commit b78f8380 authored by heikki@donna.mysql.fi's avatar heikki@donna.mysql.fi
Browse files

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()
parent 298cb454

sql/ha_innobase.cc

+9 −1
Original line number Diff line number Diff line
@@ -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

	}

sql/ha_innobase.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

  	{