List:Internals« Previous MessageNext Message »
From:ramil Date:December 9 2005 4:56pm
Subject:bk commit into 5.0 tree (ramil:1.1985) BUG#15602
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1985 05/12/09 19:55:59 ramil@stripped +1 -0
  Fix for bug #15602: 5.0.17 test case 'create' failure.
  

  sql/table.cc
    1.213 05/12/09 19:55:50 ramil@stripped +1 -2
    Fix for bug #15602: 5.0.17 test case 'create' failure.
    - always test create_info->max_rows/min_rows as they are of ulonglong type.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/mysql-5.0-release

--- 1.212/sql/table.cc	2005-12-06 20:04:22 +04:00
+++ 1.213/sql/table.cc	2005-12-09 19:55:50 +04:00
@@ -1403,13 +1403,12 @@ File create_frm(THD *thd, my_string name
   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
Thread
bk commit into 5.0 tree (ramil:1.1985) BUG#15602ramil9 Dec