diff options
| author | Michael Widenius <monty@mysql.com> | 2008-06-26 12:32:22 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2008-06-26 12:32:22 +0300 |
| commit | 1d726038324e9ed977b9b1a7d2ebf90ca647db9d (patch) | |
| tree | d65ab7be01ae6f1c020c007ae7524eef204d2cc1 /storage/myisam | |
| parent | 52cb0c24a6a6674ee17c4bb86fa02527043ed90f (diff) | |
| parent | 4f14b87d9131877841558fe6afe2832f6aba31a7 (diff) | |
| download | mariadb-git-1d726038324e9ed977b9b1a7d2ebf90ca647db9d.tar.gz | |
Merge; No notable changes
.bzr-mysql/default.conf:
Automatic merge
config/ac-macros/plugins.m4:
Automatic merge
configure.in:
Automatic merge
include/my_global.h:
Automatic merge
mysql-test/include/maria_empty_logs.inc:
Use Guilmhems version, but don't echo use database
mysql-test/r/maria-no-logging.result:
Automatic merge
mysql-test/r/maria-page-checksum.result:
Automatic merge
mysql-test/r/maria-recover.result:
Automatic merge
mysql-test/r/maria2.result:
Automatic merge
mysql-test/t/maria-no-logging.test:
Automatic merge
mysql-test/t/maria-page-checksum.test:
Automatic merge
mysql-test/t/maria-purge.test:
Automatic merge
mysql-test/t/maria-recover.test:
Automatic merge
mysql-test/t/maria2.test:
Automatic merge
sql/sql_table.cc:
Automatic merge
storage/maria/CMakeLists.txt:
Automatic merge
storage/maria/ma_ft_parser.c:
Automatic merge
storage/maria/ma_loghandler.c:
Automatic merge
storage/maria/ma_recovery.c:
Automatic merge
storage/maria/ma_rt_test.c:
Manual merge
storage/maria/ma_state.c:
Automatic merge
storage/maria/ma_test_force_start.pl:
Automatic merge
storage/maria/plug.in:
Automatic merge
storage/maria/unittest/CMakeLists.txt:
Automatic merge
storage/maria/unittest/Makefile.am:
Automatic merge
storage/maria/unittest/ma_test_all-t:
Automatic merge
storage/maria/unittest/ma_test_loghandler_multithread-t.c:
Automatic merge
storage/maria/unittest/ma_test_recovery.pl:
Automatic merge
storage/myisam/rt_test.c:
Automatic merge
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/rt_test.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/storage/myisam/rt_test.c b/storage/myisam/rt_test.c index 92f329baa81..6c73c9db13c 100644 --- a/storage/myisam/rt_test.c +++ b/storage/myisam/rt_test.c @@ -112,7 +112,13 @@ static int run_test(const char *filename) uchar read_record[MAX_REC_LENGTH]; int upd= 10; ha_rows hrows; - + + bzero(&uniquedef, sizeof(uniquedef)); + bzero(&create_info, sizeof(create_info)); + bzero(recinfo, sizeof(recinfo)); + bzero(keyinfo, sizeof(keyinfo)); + bzero(keyseg, sizeof(keyseg)); + /* Define a column for NULLs and DEL markers*/ recinfo[0].type=FIELD_NORMAL; @@ -147,7 +153,6 @@ static int run_test(const char *filename) if (!silent) printf("- Creating isam-file\n"); - bzero((char*) &create_info,sizeof(create_info)); create_info.max_rows=10000000; if (mi_create(filename, |