diff options
| author | unknown <mskold/marty@linux.site> | 2006-12-03 17:03:01 +0100 |
|---|---|---|
| committer | unknown <mskold/marty@linux.site> | 2006-12-03 17:03:01 +0100 |
| commit | da7016ee74c9e78e8eb569a9e325b8db59cb0859 (patch) | |
| tree | 375770c6b33ff284a0bfcc81cfeef9b97e00f468 /include | |
| parent | 2a2f219c0256b8b4ae5bf39ef1f969c8de770d8d (diff) | |
| parent | ddb679ed903782fe2e97964d6442e1bbb976931a (diff) | |
| download | mariadb-git-da7016ee74c9e78e8eb569a9e325b8db59cb0859.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
mysql-test/mysql-test-run.pl:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 22 | ||||
| -rw-r--r-- | include/m_ctype.h | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index af061f80ff2..814badc24be 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -15,14 +15,18 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA -BUILT_SOURCES = mysql_version.h my_config.h -pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \ - mysql.h mysql_com.h mysql_embed.h \ +# FIXME 'abi_check' should be in BUILT_SOURCES, disabled for now +BUILT_SOURCES = $(HEADERS_GEN) +HEADERS_GEN = mysql_version.h my_config.h +HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \ + my_list.h my_alloc.h typelib.h +pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \ + my_xml.h mysql_embed.h \ my_semaphore.h my_pthread.h my_no_pthread.h \ - errmsg.h my_global.h my_net.h my_alloc.h \ - my_getopt.h sslopt-longopts.h my_dir.h typelib.h \ + errmsg.h my_global.h my_net.h \ + my_getopt.h sslopt-longopts.h my_dir.h \ sslopt-vars.h sslopt-case.h sql_common.h keycache.h \ - mysql_time.h m_ctype.h mysql/plugin.h $(BUILT_SOURCES) + m_ctype.h mysql/plugin.h $(HEADERS_GEN) noinst_HEADERS = config-win.h config-netware.h \ heap.h my_bitmap.h my_uctype.h \ myisam.h myisampack.h myisammrg.h ft_global.h\ @@ -61,8 +65,7 @@ dist-hook: # # Create a icheck file and compare it to the reference -abi_check: mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h \ - my_alloc.h typelib.h mysql_h.ic +abi_check: $(HEADERS_ABI) mysql_version.h mysql_h.ic @set -ex; \ if [ @ICHECK@ != no ] ; then \ @ICHECK@ --canonify --skip-from-re /usr/ -o $@.ic mysql.h; \ @@ -70,8 +73,5 @@ abi_check: mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h \ fi; \ touch abi_check; -#all: abi_check - - # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/include/m_ctype.h b/include/m_ctype.h index 0d586030735..d98663c8db4 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -446,7 +446,7 @@ int my_wildcmp_unicode(CHARSET_INFO *cs, extern my_bool my_parse_charset_xml(const char *bug, uint len, int (*add)(CHARSET_INFO *cs)); extern char *my_strchr(CHARSET_INFO *cs, const char *str, const char *end, - char c); + pchar c); my_bool my_propagate_simple(CHARSET_INFO *cs, const uchar *str, uint len); my_bool my_propagate_complex(CHARSET_INFO *cs, const uchar *str, uint len); |