mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Bug fixed
null_string wasn't known in libmysqld/lib_sql.cc, that caused compiler's error i put the declaration of the null_string in mysql_priv.h and renamed it to my_null_string to reduce the probability of name's intersections libmysqld/lib_sql.cc: null_string -> my_null_string sql/mysql_priv.h: my_null_string was made known sql/sql_prepare.cc: null_string -> my_null_string
This commit is contained in:
@@ -76,7 +76,7 @@ Long data handling:
|
||||
|
||||
#define STMT_QUERY_LOG_LENGTH 8192
|
||||
|
||||
String null_string("NULL", 4, default_charset_info);
|
||||
String my_null_string("NULL", 4, default_charset_info);
|
||||
|
||||
/*
|
||||
Find prepared statement in thd
|
||||
@@ -428,7 +428,7 @@ static bool insert_params_withlog(PREP_STMT *stmt, uchar *pos, uchar *read_pos)
|
||||
if (IS_PARAM_NULL(pos,param_no))
|
||||
{
|
||||
param->maybe_null= param->null_value= 1;
|
||||
res= &null_string;
|
||||
res= &my_null_string;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user