diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-03 18:17:13 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-03 18:17:13 +0300 |
| commit | 96c1a87455f20db9ce651723628b4ac9a44d54a2 (patch) | |
| tree | 1ddbb206a100d634a54240dc53a7ce259fbf78eb /mysys | |
| parent | 90e058e0c623f770ee602ebab86e91303f08c90a (diff) | |
| download | mariadb-git-96c1a87455f20db9ce651723628b4ac9a44d54a2.tar.gz | |
Fixed after-merge failures found by buildbot
mysql-test/suite/funcs_1/r/is_columns_is.result:
Updated test results
mysql-test/suite/pbxt/r/client_xml.result:
Updated test results
mysys/Makefile.am:
Added back my_port.c
storage/xtradb/buf/buf0buddy.c:
Removed not used variables
storage/xtradb/fil/fil0fil.c:
Added casts to fix compiler warnings
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysys/Makefile.am b/mysys/Makefile.am index 2c42534b93b..7915ec89d17 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -43,7 +43,8 @@ libmysys_la_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \ mf_wcomp.c mf_wfile.c my_gethwaddr.c \ mf_qsort.c mf_qsort2.c mf_sort.c \ ptr_cmp.c mf_radix.c queues.c my_getncpus.c \ - tree.c trie.c list.c hash.c array.c string.c typelib.c \ + tree.c trie.c list.c hash.c array.c string.c \ + typelib.c \ my_copy.c my_append.c my_lib.c \ my_delete.c my_rename.c my_redel.c \ my_chsize.c my_clock.c \ @@ -51,7 +52,7 @@ libmysys_la_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \ my_sync.c my_getopt.c my_mkdir.c \ default_modify.c default.c \ my_compress.c checksum.c \ - my_net.c my_sleep.c \ + my_net.c my_port.c my_sleep.c \ charset.c charset-def.c my_bitmap.c my_bit.c md5.c \ rijndael.c my_aes.c sha1.c \ my_compare.c my_netware.c my_largepage.c \ |