diff options
author | unknown <serg@serg.mylan> | 2004-11-20 18:36:41 +0100 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2004-11-20 18:36:41 +0100 |
commit | 7b0069ee20c5f0a43149aa962ac1b26f19257b23 (patch) | |
tree | 62ae289d237eebb2f3c921cb532cc66e70229341 /innobase/include/fil0fil.h | |
parent | 15092975f506dfadeb379805f78e50e2939a2911 (diff) | |
parent | a3740c887e940144828543bc7c4e1ddfa8de2b7e (diff) | |
download | mariadb-git-7b0069ee20c5f0a43149aa962ac1b26f19257b23.tar.gz |
merged
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
client/Makefile.am:
Auto merged
client/mysqlbinlog.cc:
Auto merged
configure.in:
Auto merged
include/my_time.h:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/include/fil0fil.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/func_group.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/field.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
tests/client_test.c:
Auto merged
Diffstat (limited to 'innobase/include/fil0fil.h')
-rw-r--r-- | innobase/include/fil0fil.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/include/fil0fil.h b/innobase/include/fil0fil.h index 9f854688ac7..75b32937e0b 100644 --- a/innobase/include/fil0fil.h +++ b/innobase/include/fil0fil.h @@ -480,7 +480,7 @@ fil_extend_space_to_desired_size( ulint* actual_size, /* out: size of the space after extension; if we ran out of disk space this may be lower than the desired size */ - ulint space_id, /* in: space id, must be != 0 */ + ulint space_id, /* in: space id */ ulint size_after_extend);/* in: desired size in pages after the extension; if the current space size is bigger than this already, the function does nothing */ |