diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-10-15 22:52:31 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-10-15 22:52:31 +0300 |
| commit | 893797be02d4dff2e1aafbdb98ac4e33b9726628 (patch) | |
| tree | 8965c22cf3cbc1c873996552a81fad765b045446 /sql/item_strfunc.cc | |
| parent | 14573a71910c2a345d5bd1dc3d1bffd73319ba50 (diff) | |
| parent | ddbc8428546da197a031d24cfcafd1a545467e9b (diff) | |
| download | mariadb-git-893797be02d4dff2e1aafbdb98ac4e33b9726628.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
sql/item_strfunc.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 55a20908894..99dd06c566c 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -33,7 +33,9 @@ #include "md5.h" #include "sha1.h" #include "my_aes.h" +C_MODE_START #include "../mysys/my_static.h" // For soundex_map +C_MODE_END String my_empty_string("",default_charset_info); |