diff options
| author | unknown <serg@janus.mylan> | 2007-10-08 21:01:44 +0200 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-10-08 21:01:44 +0200 |
| commit | ceadd59644981c103831d9c20b1f06bbab337989 (patch) | |
| tree | d53c392b402d00eeeb5b401ac93da40017f87801 /support-files | |
| parent | 7bb3501ff901d62fe249373e848a81c3c0e973b8 (diff) | |
| parent | 6c7a278c836c086d59a84589988536d654fd0a57 (diff) | |
| download | mariadb-git-ceadd59644981c103831d9c20b1f06bbab337989.tar.gz | |
Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/mysql-maria1
Makefile.am:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysys/mf_tempfile.c:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/ha_partition.h:
Auto merged
sql/handler.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
BUILD/compile-dist:
SCCS merged
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/compiler_warnings.supp | 5 | ||||
| -rw-r--r-- | support-files/magic | 15 |
2 files changed, 18 insertions, 2 deletions
diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp index 0a2c720b81b..a4048c2fbc0 100644 --- a/support-files/compiler_warnings.supp +++ b/support-files/compiler_warnings.supp @@ -65,6 +65,11 @@ db_vrfy.c : .*comparison is always false due to limited range of data type.* .*/ndb/.* : .*defined but not used.* # +# Maria warning that is ok in debug builds +# +storage/maria/ma_pagecache.c: .*'info_check_pin' defined but not used + +# # Unexplanable (?) stuff # listener.cc : .*conversion from 'SOCKET' to 'int'.* diff --git a/support-files/magic b/support-files/magic index 9844142ba93..b3f3b3ea29d 100644 --- a/support-files/magic +++ b/support-files/magic @@ -4,12 +4,23 @@ # 0 beshort 0xfe01 MySQL table definition file >2 byte x Version %d -0 belong&0xffffff00 0xfefe0300 MySQL MISAM index file +0 belong&0xffffff00 0xfefe0700 MySQL MyISAM index file >3 byte x Version %d -0 belong&0xffffff00 0xfefe0700 MySQL MISAM compressed data file +0 belong&0xffffff00 0xfefe0800 MySQL MyISAM compressed data file +>3 byte x Version %d +0 belong&0xffffff00 0xfefe0900 MySQL Maria index file +>3 byte x Version %d +0 belong&0xffffff00 0xfefe0A00 MySQL Maria compressed data file >3 byte x Version %d 0 belong&0xffffff00 0xfefe0500 MySQL ISAM index file >3 byte x Version %d 0 belong&0xffffff00 0xfefe0600 MySQL ISAM compressed data file >3 byte x Version %d 0 string \376bin MySQL replication log +0 belong&0xffffff00 0xfefe0b00 +>4 string MARIALOG MySQL Maria transaction log file +>>3 byte x Version %d +0 belong&0xffffff00 0xfefe0c00 +>4 string MACF MySQL Maria control file +>>3 byte x Version %d + |