diff options
| author | monty@hundin.mysql.fi <> | 2002-06-03 12:59:31 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-06-03 12:59:31 +0300 |
| commit | f0b28da6f91cf87804015b5dde4820be040c2de7 (patch) | |
| tree | be04186411dc657ef6bbcbe01267d30f2675c914 /sql/ha_innodb.cc | |
| parent | 3ede8f6289b53345f44aecffd70c7e291f88186b (diff) | |
| parent | 544f95c45112993df1d31d3eda859dd5e4efff89 (diff) | |
| download | mariadb-git-f0b28da6f91cf87804015b5dde4820be040c2de7.tar.gz | |
merge with 4.0
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index b93d9fa0108..455d890758f 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -102,13 +102,14 @@ my_bool innobase_use_native_aio = FALSE; my_bool innobase_fast_shutdown = TRUE; /* - Set default InnoDB size to 64M and let it be auto-extending. Thus users - can use InnoDB without having to specify any startup options. + Set default InnoDB data file size to 10 MB and let it be + auto-extending. Thus users can use InnoDB without having to + specify any startup options. */ /* innobase_data_file_path=ibdata:15,idata2:1,... */ -char *innobase_data_file_path= (char*) "ibdata1:64M:autoextend"; +char *innobase_data_file_path= (char*) "ibdata1:10M:autoextend"; static char *internal_innobase_data_file_path=0; /* The following counter is used to convey information to InnoDB @@ -653,6 +654,7 @@ innobase_close_connection( (thd->transaction.all.innobase_tid)); trx_free_for_mysql((trx_t*) (thd->transaction.all.innobase_tid)); + thd->transaction.all.innobase_tid = NULL; } return(0); |