diff options
| author | unknown <ramil@mysql.com> | 2005-09-05 18:28:56 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-09-05 18:28:56 +0500 |
| commit | b48e721d2f2e4f2ae591de5c581e002db8d7cc88 (patch) | |
| tree | 4523c480ff3020b7a082c4066c29b6f996ffa587 /myisam/mi_static.c | |
| parent | 7a0f593dac959f2f243f4157a7c763c152e10dc6 (diff) | |
| parent | 43b0448081cc5a2e79e598c32f96a95a85fd4aed (diff) | |
| download | mariadb-git-b48e721d2f2e4f2ae591de5c581e002db8d7cc88.tar.gz | |
Merge mysql.com:/usr/home/ram/work/4.1.b4214
into mysql.com:/usr/home/ram/work/mysql-5.0
myisam/mi_check.c:
Auto merged
myisam/mi_packrec.c:
Auto merged
myisam/mi_static.c:
Auto merged
myisam/myisamdef.h:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/vm/Emulator.cpp:
Auto merged
myisam/myisampack.c:
merging
Diffstat (limited to 'myisam/mi_static.c')
| -rw-r--r-- | myisam/mi_static.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_static.c b/myisam/mi_static.c index 4c9d814f7d6..fc585eb5543 100644 --- a/myisam/mi_static.c +++ b/myisam/mi_static.c @@ -27,7 +27,7 @@ LIST *myisam_open_list=0; uchar NEAR myisam_file_magic[]= { (uchar) 254, (uchar) 254,'\007', '\001', }; uchar NEAR myisam_pack_file_magic[]= -{ (uchar) 254, (uchar) 254,'\010', '\001', }; +{ (uchar) 254, (uchar) 254,'\010', '\002', }; my_string myisam_log_filename=(char*) "myisam.log"; File myisam_log_file= -1; uint myisam_quick_table_bits=9; |