From 26bb50a19b8c3a79a745d052c14f73a5a06e466e Mon Sep 17 00:00:00 2001
From: unknown <monty@narttu.mysql.fi>
Date: Thu, 28 Aug 2003 06:08:17 +0300
Subject: Add detection of in_addr_t Add pack_bits to pack_reclength for
 dynamic rows.  This solves buffer a possible buffer overflow on update. (This
 will probably solve bug #563) Fix test for available file descriptors in
 mysqltest Fixed core dump bug in replication tests when running without
 transactional table support

acconfig.h:
  Add detection of in_addr_t
acinclude.m4:
  Add detection of in_addr_t
configure.in:
  Add detection of in_addr_t
extra/my_print_defaults.c:
  Cleanup
extra/resolveip.c:
  Add detection of in_addr_t
libmysql/dll.c:
  Fixed C++ commments
myisam/mi_dynrec.c:
  Add ASSERT if allocated record length is to small
myisam/mi_open.c:
  Add pack_bits to pack_reclength for dynamic rows.  This solves buffer a possible buffer overflow on update.
myisam/mi_test_all.sh:
  Added valgrind option to make it easier to verify tests
mysql-test/include/check_var_limit.inc:
  Fix test for available file descriptors
mysql-test/r/myisam.result:
  More tests
mysql-test/t/myisam.test:
  More tests
mysql-test/t/query_cache_merge.test:
  Fix test for available file descriptors
mysys/default.c:
  Cleanup
mysys/my_pthread.c:
  Remove C++ comments
sql/log.cc:
  Code cleanup
  Fixed core dump bug in replication tests when running without transactional table support.
---
 mysql-test/t/myisam.test            | 6 ++++--
 mysql-test/t/query_cache_merge.test | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'mysql-test/t')

diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
index 2ae3c27f699..02c92109816 100644
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test
@@ -127,7 +127,6 @@ drop table t1;
 # test of myisam with huge number of packed fields
 #
 
-drop table if exists t1;
 create table t1 (i1 int, i2 int, i3 int, i4 int, i5 int, i6 int, i7 int, i8
 int, i9 int, i10 int, i11 int, i12 int, i13 int, i14 int, i15 int, i16 int, i17
 int, i18 int, i19 int, i20 int, i21 int, i22 int, i23 int, i24 int, i25 int,
@@ -292,7 +291,10 @@ insert into t1 values (1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, "Sergei");
-drop table if exists t1;
+update t1 set b=repeat('a',256);
+update t1 set i1=0, i2=0, i3=0, i4=0, i5=0, i6=0, i7=0;
+check table t1;
+drop table t1;
 
 #
 # Test of REPAIR that once failed
diff --git a/mysql-test/t/query_cache_merge.test b/mysql-test/t/query_cache_merge.test
index 9d9e311af06..02e316932a3 100644
--- a/mysql-test/t/query_cache_merge.test
+++ b/mysql-test/t/query_cache_merge.test
@@ -2,8 +2,8 @@
 
 --source include/have_query_cache.inc
 let $LIMIT=`SHOW VARIABLES LIKE 'open_files_limit'`;
-let $MIN_LIMIT=100
-let $MAX_LIMIT=65536
+let $MIN_LIMIT=600;
+let $MAX_LIMIT=65536;
 --source include/check_var_limit.inc
 
 SET @@global.query_cache_size=1355776;
-- 
cgit v1.2.1