Commit a21e8517 authored by unknown's avatar unknown
Browse files

Merge mysqldev@production.mysql.com:my/mysql-5.0-release 

into  mysql.com:/usr/home/ram/work/mysql-5.0-release
parents 26eb5ff0 6abb702c

mysql-test/t/mysqltest.test

+2 −2
Original line number Diff line number Diff line
@@ -968,9 +968,9 @@ drop table t1; 


--error 1

--exec $MYSQL_TEST --record -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql -R $MYSQL_TEST_DIR/var/tmp/bug11731.out

# The .out file should be empty, cat will fail!

# The .out file should be empty

--error 1

--exec cat $MYSQL_TEST_DIR/var/tmp/bug11731.out

--exec test -s $MYSQL_TEST_DIR/var/tmp/bug11731.out

drop table t1;

sql/table.cc

+1 −2
Original line number Diff line number Diff line
@@ -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