diff options
| author | unknown <joerg@trift-lap.fambruehe> | 2005-12-14 23:05:08 +0100 |
|---|---|---|
| committer | unknown <joerg@trift-lap.fambruehe> | 2005-12-14 23:05:08 +0100 |
| commit | 487d56b096e3e0eef9a5f81ffec8d4a86e444724 (patch) | |
| tree | 3af0a889290d81aa65639beebb7aec19a4e9b84d /sql/table.cc | |
| parent | 59789c7f4b186372e884f71488f3ed5a764de5c3 (diff) | |
| parent | 1f61e98e1b0a57d75ab22f5f58af0bc10a8f4c82 (diff) | |
| download | mariadb-git-487d56b096e3e0eef9a5f81ffec8d4a86e444724.tar.gz | |
Merge joerg@trift2:/M50/part2-ramil
into trift-lap.fambruehe:/MySQL/M51/merge-5.1
sql/sp_head.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/table.cc')
| -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 26a5e9362b8..6cbb913de11 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1877,13 +1877,12 @@ File create_frm(THD *thd, const char *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 |