diff options
author | unknown <monty@donna.mysql.com> | 2000-08-21 03:01:16 +0300 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2000-08-21 03:01:16 +0300 |
commit | 2019201ba6e950ef5167869da707112897218745 (patch) | |
tree | f537ea3d07420a6c53e98f021e4f87a52fd7d313 /configure.in | |
parent | 6d40bcef37b2789ed4b4d5af2d88421b3d62815b (diff) | |
parent | 55c5016f92383fdf7cd14de4ef3ec5afbb89fd5a (diff) | |
download | mariadb-git-2019201ba6e950ef5167869da707112897218745.tar.gz |
Merge monty@work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
include/global.h:
Auto merged
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 9aaca9ede13..f200fefca33 100644 --- a/configure.in +++ b/configure.in @@ -1700,10 +1700,10 @@ CHARSET_COMP_CS_INIT="$CHARSET_COMP_CS_INIT { 0, /* end-of-list marker */ NullS, - \"\", - \"\", - \"\", - \"\", + NULL, + NULL, + NULL, + NULL, 0, NULL, NULL, |