diff options
| author | unknown <guilhem@gbichot3.local> | 2007-03-01 18:23:58 +0100 |
|---|---|---|
| committer | unknown <guilhem@gbichot3.local> | 2007-03-01 18:23:58 +0100 |
| commit | 3411bfe05a2a77c6c5b9911237792eb436f16543 (patch) | |
| tree | 400242e73e0c9b50c2036048184c136608b29219 /storage/maria/unittest | |
| parent | ea57b3d4a066a5507a7e322b53e3acab24a2855e (diff) | |
| download | mariadb-git-3411bfe05a2a77c6c5b9911237792eb436f16543.tar.gz | |
merge from MyISAM into Maria (last step of merge of 5.1 into Maria).
Tests: "maria" and "ps_maria" fail like before merge (assertions),
"ma_test_all" fails like before merge (ma_test2 segfaults, I'll try
to find out why).
mysys/mf_pagecache.c:
using a more distinctive tag
storage/maria/ha_maria.cc:
merge from MyISAM into Maria
storage/maria/ma_check.c:
merge from MyISAM into Maria
storage/maria/ma_close.c:
TODO as a word
storage/maria/ma_create.c:
merge from MyISAM into Maria
storage/maria/ma_delete_all.c:
TODO as a word
storage/maria/ma_delete_table.c:
TODO as a word
storage/maria/ma_dynrec.c:
merge from MyISAM into Maria
storage/maria/ma_extra.c:
merge from MyISAM into Maria
storage/maria/ma_ft_boolean_search.c:
merge from MyISAM into Maria
storage/maria/ma_locking.c:
merge from MyISAM into Maria
storage/maria/ma_loghandler.c:
fix for compiler warning
storage/maria/ma_open.c:
merge from MyISAM into Maria.
I will ask Monty to check the ASKMONTY-marked piece of code.
storage/maria/ma_packrec.c:
merge from MyISAM into Maria
storage/maria/ma_range.c:
merge from MyISAM into Maria
storage/maria/ma_rename.c:
TODO as a word
storage/maria/ma_rt_index.c:
merge from MyISAM into Maria
storage/maria/ma_rt_split.c:
merge from MyISAM into Maria
storage/maria/ma_search.c:
merge from MyISAM into Maria
storage/maria/ma_sort.c:
merge from MyISAM into Maria
storage/maria/ma_update.c:
merge from MyISAM into Maria
storage/maria/ma_write.c:
merge from MyISAM into Maria
storage/maria/maria_chk.c:
merge from MyISAM into Maria
storage/maria/maria_def.h:
merge from MyISAM into Maria
storage/maria/maria_pack.c:
merge from MyISAM into Maria
storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
fix for compiler warning
storage/myisam/ha_myisam.cc:
merge from MyISAM into Maria
storage/myisammrg/ha_myisammrg.cc:
merge from MyISAM into Maria
Diffstat (limited to 'storage/maria/unittest')
| -rw-r--r-- | storage/maria/unittest/ma_test_loghandler_pagecache-t.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/unittest/ma_test_loghandler_pagecache-t.c b/storage/maria/unittest/ma_test_loghandler_pagecache-t.c index 211eb6dea9e..9204d531ea1 100644 --- a/storage/maria/unittest/ma_test_loghandler_pagecache-t.c +++ b/storage/maria/unittest/ma_test_loghandler_pagecache-t.c @@ -21,7 +21,7 @@ static PAGECACHE_FILE file1; int main(int argc, char *argv[]) { uint pagen; - uchar long_tr_id[6]; + byte long_tr_id[6]; PAGECACHE pagecache; LSN lsn; MY_STAT st, *stat; |