diff options
| author | unknown <jimw@mysql.com> | 2005-11-28 10:50:23 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-11-28 10:50:23 -0800 |
| commit | 6c41013ea3b80a5b29c792b479b7c6c2d8ab9763 (patch) | |
| tree | 43d9451e988cf21058bcf0693e2f23fe14b9cab4 /sql/table.cc | |
| parent | a796fc484efe6eaaa782610ce563adca8f101c3d (diff) | |
| parent | 687b57be8d5e2ed0d69227f6285d4e0b804982dd (diff) | |
| download | mariadb-git-6c41013ea3b80a5b29c792b479b7c6c2d8ab9763.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-14155
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/t/create.test:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/create.result:
Resolve conflict
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/table.cc b/sql/table.cc index 8b22610a95e..07ca236854c 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1405,10 +1405,10 @@ File create_frm(THD *thd, my_string name, const char *db, #if SIZEOF_OFF_T > 4 /* Fix this when we have new .frm files; Current limit is 4G rows (QQ) */ - if (create_info->max_rows > ~(ulong) 0) - create_info->max_rows= ~(ulong) 0; - if (create_info->min_rows > ~(ulong) 0) - create_info->min_rows= ~(ulong) 0; + 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 |