summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlenz@mysql.com <>2005-06-03 18:20:25 +0200
committerlenz@mysql.com <>2005-06-03 18:20:25 +0200
commit852a57300d3891f877ed368dae3f728284b89bce (patch)
tree68e205b16630b227a32bf598a49bd400ab5441a1
parent5f2f34079bd6f64bd203a41ade6d0b944764ebb1 (diff)
downloadmariadb-git-852a57300d3891f877ed368dae3f728284b89bce.tar.gz
- include/config-win.h: removed double HAVE_CHARSET_cp932 #define
- mysql-test/Makefile.am: added a pattern match for t/*.sql (t/mysql_delimiter.sql was missing from the source distribution)
-rw-r--r--include/config-win.h1
-rw-r--r--mysql-test/Makefile.am1
2 files changed, 1 insertions, 1 deletions
diff --git a/include/config-win.h b/include/config-win.h
index b17e4df4e26..f6c72a85a60 100644
--- a/include/config-win.h
+++ b/include/config-win.h
@@ -392,7 +392,6 @@ inline double ulonglong2double(ulonglong value)
/* #undef HAVE_CHARSET_armscii8 */
/* #undef HAVE_CHARSET_ascii */
#define HAVE_CHARSET_big5 1
-#define HAVE_CHARSET_cp932
#define HAVE_CHARSET_cp1250 1
/* #undef HAVE_CHARSET_cp1251 */
/* #undef HAVE_CHARSET_cp1256 */
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 9963074daf5..a5e3f7977ee 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -48,6 +48,7 @@ dist-hook:
mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \
$(distdir)/std_data $(distdir)/lib
$(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t
+ $(INSTALL_DATA) $(srcdir)/t/*.sql $(distdir)/t
-$(INSTALL_DATA) $(srcdir)/t/*.disabled $(distdir)/t
$(INSTALL_DATA) $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(srcdir)/t/*.slave-mi $(distdir)/t
$(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include