diff options
author | ramil@mysql.com <> | 2005-12-12 11:55:49 +0400 |
---|---|---|
committer | ramil@mysql.com <> | 2005-12-12 11:55:49 +0400 |
commit | 351204834bb11a159f7817613b0ba92c4c1d84e3 (patch) | |
tree | 50fd558268aa0b2992218c7dbb2b1ef27852a25d /sql | |
parent | 43252fa1bb93cf37422db0a298997e89c6f291aa (diff) | |
parent | cafbf5ac3b86c4a9681f21b8de18c3de0dbbeaaf (diff) | |
download | mariadb-git-351204834bb11a159f7817613b0ba92c4c1d84e3.tar.gz |
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into mysql.com:/usr/home/ram/work/mysql-5.0-release
Diffstat (limited to 'sql')
-rw-r--r-- | sql/table.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index 268d7a0be49..fc75568b615 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1403,13 +1403,12 @@ File create_frm(THD *thd, my_string name, const char *db, if (create_info->options & HA_LEX_CREATE_TMP_TABLE) create_flags|= O_EXCL | O_NOFOLLOW; -#if SIZEOF_OFF_T > 4 /* Fix this when we have new .frm files; Current limit is 4G rows (QQ) */ if (create_info->max_rows > UINT_MAX32) create_info->max_rows= UINT_MAX32; if (create_info->min_rows > UINT_MAX32) create_info->min_rows= UINT_MAX32; -#endif + /* Ensure that raid_chunks can't be larger than 255, as this would cause problems with drop database |