diff options
| author | unknown <knielsen@mysql.com> | 2006-03-28 10:07:03 +0200 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-03-28 10:07:03 +0200 |
| commit | fb36d9180649d699519555ff2ce338b8144b9dbd (patch) | |
| tree | 6724cacb8e05bc9947fee00d5a2dd6c47605ce66 /strings | |
| parent | 2cd99ea7f450173dc9ba2cba90bff7c20189fc2b (diff) | |
| parent | cf24abdad0fac6436632cb80d9729f6dc2abca02 (diff) | |
| download | mariadb-git-fb36d9180649d699519555ff2ce338b8144b9dbd.tar.gz | |
Manual merge.
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/Makefile.am b/strings/Makefile.am index fcb97a071f1..1183fcae01a 100644 --- a/strings/Makefile.am +++ b/strings/Makefile.am @@ -54,7 +54,7 @@ EXTRA_DIST = ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc bmove_upp-sparc.s strappend-sparc.s strend-sparc.s \ strinstr-sparc.s strmake-sparc.s strmov-sparc.s \ strnmov-sparc.s strstr-sparc.s strxmov-sparc.s \ - t_ctype.h my_strchr.c + t_ctype.h my_strchr.c cmakelists.txt libmystrings_a_LIBADD= conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c bcmp.c |