diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-04-13 15:34:39 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-04-13 15:34:39 +0300 |
| commit | fdc446d0c621c3be38b5b11cc0e40308679fb996 (patch) | |
| tree | 6bb12842fb04d64fa854f04ec3d07da1e1f7c48b /acconfig.h | |
| parent | 54373c16f8435db653ffbad55466e457eb816976 (diff) | |
| parent | adc7a375368892eac433e19aab29ecefcf867d4b (diff) | |
| download | mariadb-git-fdc446d0c621c3be38b5b11cc0e40308679fb996.tar.gz | |
merge
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BUILD/FINISH.sh:
Auto merged
BUILD/SETUP.sh:
Auto merged
BUILD/compile-pentium-debug:
Auto merged
acconfig.h:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
heap/hp_rfirst.c:
Auto merged
heap/hp_rnext.c:
Auto merged
include/my_sys.h:
Auto merged
include/myisam.h:
Auto merged
libmysql/Makefile.shared:
Auto merged
myisam/mi_write.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/heap.test:
Auto merged
mysql-test/t/select_found.test:
Auto merged
mysql-test/t/union.test:
Auto merged
mysys/mf_iocache2.c:
Auto merged
mysys/my_vsnprintf.c:
Auto merged
sql/convert.cc:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/structs.h:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
strings/Makefile.am:
Auto merged
Diffstat (limited to 'acconfig.h')
| -rw-r--r-- | acconfig.h | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/acconfig.h b/acconfig.h index f52c38b2fdc..6ff8958670b 100644 --- a/acconfig.h +++ b/acconfig.h @@ -18,6 +18,9 @@ #undef CRAY_STACKSEG_END +/* Define the default charset name */ +#undef DEFAULT_CHARSET_NAME + /* Version of .frm files */ #undef DOT_FRM_VERSION @@ -63,6 +66,41 @@ /* READLINE: */ #undef HAVE_BSD_SIGNALS +/* Define charsets you want */ +#undef HAVE_CHARSET_armscii8 +#undef HAVE_CHARSET_big5 +#undef HAVE_CHARSET_cp1251 +#undef HAVE_CHARSET_cp1257 +#undef HAVE_CHARSET_croat +#undef HAVE_CHARSET_czech +#undef HAVE_CHARSET_danish +#undef HAVE_CHARSET_dec8 +#undef HAVE_CHARSET_dos +#undef HAVE_CHARSET_estonia +#undef HAVE_CHARSET_euc_kr +#undef HAVE_CHARSET_gb2312 +#undef HAVE_CHARSET_gbk +#undef HAVE_CHARSET_german1 +#undef HAVE_CHARSET_greek +#undef HAVE_CHARSET_hebrew +#undef HAVE_CHARSET_hp8 +#undef HAVE_CHARSET_hungarian +#undef HAVE_CHARSET_koi8_ru +#undef HAVE_CHARSET_koi8_ukr +#undef HAVE_CHARSET_latin1 +#undef HAVE_CHARSET_latin1_de +#undef HAVE_CHARSET_latin2 +#undef HAVE_CHARSET_latin5 +#undef HAVE_CHARSET_sjis +#undef HAVE_CHARSET_swe7 +#undef HAVE_CHARSET_tis620 +#undef HAVE_CHARSET_ujis +#undef HAVE_CHARSET_usa7 +#undef HAVE_CHARSET_utf8 +#undef HAVE_CHARSET_win1250 +#undef HAVE_CHARSET_win1251ukr +#undef HAVE_CHARSET_win1251 + /* ZLIB and compress: */ #undef HAVE_COMPRESS |