diff options
| author | unknown <guilhem@gbichot3.local> | 2006-12-19 19:15:53 +0100 |
|---|---|---|
| committer | unknown <guilhem@gbichot3.local> | 2006-12-19 19:15:53 +0100 |
| commit | c2f2a41ed32522fa89f5c79fec42ab60e0b4aa62 (patch) | |
| tree | 5a01f0133436bc1be991e9425d3219ce2b917945 /BitKeeper | |
| parent | 51bb36a0e2200a56d7dc9cb83b79c81f996a00d9 (diff) | |
| download | mariadb-git-c2f2a41ed32522fa89f5c79fec42ab60e0b4aa62.tar.gz | |
Maria - merging recent changes done to MyISAM into Maria.
Plus compiler warnings, and a fix to the pagecache unit tests for IA64
include/maria.h:
merging MyISAM into Maria
include/myisam.h:
post-merge fixes
mysql-test/r/maria.result:
merging MyISAM into Maria
mysql-test/t/maria.test:
merging MyISAM into Maria
sql/mysqld.cc:
post-merge fixes
storage/maria/ha_maria.cc:
merging MyISAM into Maria
storage/maria/ha_maria.h:
merging MyISAM into Maria
storage/maria/ma_check.c:
merging MyISAM into Maria
storage/maria/ma_open.c:
merging MyISAM into Maria
storage/maria/ma_packrec.c:
merging MyISAM into Maria
storage/maria/ma_range.c:
merging MyISAM into Maria
storage/maria/ma_sort.c:
merging MyISAM into Maria
storage/maria/maria_def.h:
merging MyISAM into Maria
storage/maria/maria_pack.c:
merging MyISAM into Maria
storage/maria/plug.in:
merging MyISAM into Maria
storage/myisam/myisamdef.h:
merging MyISAM into Maria
storage/myisam/myisampack.c:
fix for compiler warnings
unittest/mysys/mf_pagecache_consist.c:
this sets the stack size lower than the minimum on IA64, we remove it
(it made the test fail)
unittest/mysys/mf_pagecache_single.c:
this sets the stack size lower than the minimum on IA64, we remove it
(it made the test fail)
Diffstat (limited to 'BitKeeper')
0 files changed, 0 insertions, 0 deletions