diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-25 13:33:31 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-25 13:33:31 +0000 |
| commit | 3346feb8df7894d80e40c5dbbf64eaf78ad9234f (patch) | |
| tree | e75ee46033a15986e69f6355f4f36ed7aadcdb5c /myisam/mi_test3.c | |
| parent | a0f2ecf7fbb0194ed26a8b6dadd4fffa672c46bc (diff) | |
| parent | 207676814b6f464441498e95ad809498a2948130 (diff) | |
| download | mariadb-git-3346feb8df7894d80e40c5dbbf64eaf78ad9234f.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
mysql-test/r/fulltext.result:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'myisam/mi_test3.c')
| -rw-r--r-- | myisam/mi_test3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/mi_test3.c b/myisam/mi_test3.c index dca04a9a64b..27d23317b5c 100644 --- a/myisam/mi_test3.c +++ b/myisam/mi_test3.c @@ -40,7 +40,7 @@ #endif -const char *filename= "test3.MSI"; +const char *filename= "test3"; uint tests=10,forks=10,key_cacheing=0,use_log=0; static void get_options(int argc, char *argv[]); @@ -363,7 +363,7 @@ int test_write(MI_INFO *file,int id,int lock_type) } sprintf(record.id,"%7d",getpid()); - strmov(record.text,"Testing..."); + strnmov(record.text,"Testing...", sizeof(record.text)); tries=(uint) rnd(100)+10; for (i=count=0 ; i < tries ; i++) |