summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2002-12-14 12:25:33 +0200
committerunknown <monty@mashka.mysql.fi>2002-12-14 12:25:33 +0200
commit697f939e2c8e4188ac180fb10b04a9f5bf035c91 (patch)
tree81656c006807593e3d7cdacfe450baa3b39b1754
parent05e6b27a13b21cab3f918f425eefc559efc84a6e (diff)
downloadmariadb-git-697f939e2c8e4188ac180fb10b04a9f5bf035c91.tar.gz
Make --lower-case-table-names default on MacOSX
-rw-r--r--configure.in8
-rw-r--r--sql/mysqld.cc7
2 files changed, 10 insertions, 5 deletions
diff --git a/configure.in b/configure.in
index 7a4498bff97..41e44a9e970 100644
--- a/configure.in
+++ b/configure.in
@@ -915,8 +915,8 @@ case $SYSTEM_TYPE in
*darwin5*)
if test "$ac_cv_prog_gcc" = "yes"
then
- CFLAGS="$CFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH"
- CXXFLAGS="$CXXFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ"
+ CFLAGS="$CFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH -DFN_NO_CASE_SENCE"
+ CXXFLAGS="$CXXFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DFN_NO_CASE_SENCE"
MAX_C_OPTIMIZE="-O"
with_named_curses=""
fi
@@ -924,8 +924,8 @@ case $SYSTEM_TYPE in
*darwin6*)
if test "$ac_cv_prog_gcc" = "yes"
then
- CFLAGS="$CFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH"
- CXXFLAGS="$CXXFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ"
+ CFLAGS="$CFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH -DFN_NO_CASE_SENCE"
+ CXXFLAGS="$CXXFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DFN_NO_CASE_SENCE"
MAX_C_OPTIMIZE="-O"
fi
;;
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 17cf8f79646..a5fc7eabe46 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2976,7 +2976,12 @@ CHANGEABLE_VAR changeable_vars[] = {
{ "long_query_time", (long*) &long_query_time,
10, 1, LONG_TIMEOUT, 0, 1 },
{ "lower_case_table_names", (long*) &lower_case_table_names,
- IF_WIN(1,0), 0, 1, 0, 1 },
+#ifdef FN_NO_CASE_SENCE
+ 1
+#else
+ 0
+#endif
+ ,0, 1, 0, 1 },
{ "max_allowed_packet", (long*) &max_allowed_packet,
1024*1024L, 80, 64*1024*1024L, MALLOC_OVERHEAD, 1024 },
{ "max_binlog_cache_size", (long*) &max_binlog_cache_size,