diff options
| author | unknown <elliot@mysql.com> | 2005-08-19 15:29:30 -0400 |
|---|---|---|
| committer | unknown <elliot@mysql.com> | 2005-08-19 15:29:30 -0400 |
| commit | e9c420ccf140112995ff47a03a9c41cb3b12f18f (patch) | |
| tree | df0249492ecffbc91a5e3478685c8f1ad074a428 /include | |
| parent | 141a36c31b9b9732a479f5b40a2ba35781418ad6 (diff) | |
| parent | 1b970e94e0a736a2056cb94cfcba0b50133da1d6 (diff) | |
| download | mariadb-git-e9c420ccf140112995ff47a03a9c41cb3b12f18f.tar.gz | |
Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1
into mysql.com:/home/emurphy/src/work/mysql-5.0
BitKeeper/deleted/.del-ctype-cp932.c:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
Auto merged
include/m_ctype.h:
Auto merged
include/my_sys.h:
Auto merged
innobase/srv/srv0start.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysys/charset.c:
Auto merged
netware/BUILD/nwbootstrap:
Auto merged
sql/item.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-czech.c:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
strings/ctype-extra.c:
Auto merged
strings/ctype-gb2312.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-latin1.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-tis620.c:
Auto merged
strings/ctype-uca.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
strings/ctype-ujis.c:
Auto merged
strings/ctype-utf8.c:
Auto merged
strings/ctype-win1250ch.c:
Auto merged
configure.in:
Manual merge from 4.1
include/config-netware.h:
Manual merge from 4.1
sql/item.cc:
Manual merge from 4.1
sql/mysqld.cc:
Manual merge from 4.1
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-netware.h | 3 | ||||
| -rw-r--r-- | include/m_ctype.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/config-netware.h b/include/config-netware.h index 16fa451a770..4c46ccd3ec7 100644 --- a/include/config-netware.h +++ b/include/config-netware.h @@ -53,6 +53,7 @@ extern "C" { #define HAVE_PTHREAD_YIELD_ZERO_ARG 1 #define HAVE_BROKEN_REALPATH 1 +/* changes made to make use of LibC-June-2004 for building purpose */ #undef HAVE_POSIX_SIGNALS #undef HAVE_PTHREAD_ATTR_SETSCOPE #undef HAVE_ALLOC_A @@ -62,6 +63,8 @@ extern "C" { #undef HAVE_PTHREAD_SETSCHEDPARAM #undef HAVE_READLINK #undef HAVE_STPCPY +/* changes end */ + /* no libc crypt() function */ #ifdef HAVE_OPENSSL #define HAVE_CRYPT 1 diff --git a/include/m_ctype.h b/include/m_ctype.h index 8bb8e5c76df..e0a26c4ce56 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -231,6 +231,7 @@ typedef struct charset_info_st uint mbmaxlen; uint16 min_sort_char; uint16 max_sort_char; /* For LIKE optimization */ + my_bool escape_with_backslash_is_dangerous; MY_CHARSET_HANDLER *cset; MY_COLLATION_HANDLER *coll; |