mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
merge
sql/item_strfunc.cc: Auto merged sql/lock.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted sql/net_serv.cc: Auto merged sql/sql_parse.cc: Auto merged
This commit is contained in:
@ -33,6 +33,7 @@
|
||||
#include "md5.h"
|
||||
#include "sha1.h"
|
||||
#include "my_aes.h"
|
||||
#include "../mysys/my_static.h" // For soundex_map
|
||||
|
||||
String my_empty_string("",default_charset_info);
|
||||
|
||||
@ -1496,15 +1497,11 @@ void Item_func_soundex::fix_length_and_dec()
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
If alpha, map input letter to soundex code.
|
||||
If not alpha and remove_garbage is set then skip to next char
|
||||
else return 0
|
||||
*/
|
||||
|
||||
extern "C" {
|
||||
extern const char *soundex_map; // In mysys/static.c
|
||||
}
|
||||
/*
|
||||
If alpha, map input letter to soundex code.
|
||||
If not alpha and remove_garbage is set then skip to next char
|
||||
else return 0
|
||||
*/
|
||||
|
||||
static char get_scode(CHARSET_INFO *cs,char *ptr)
|
||||
{
|
||||
|
Reference in New Issue
Block a user