summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorunknown <hf@deer.(none)>2003-09-25 13:02:45 +0500
committerunknown <hf@deer.(none)>2003-09-25 13:02:45 +0500
commite81d45c182971be3a29e042794f0922112f11479 (patch)
tree1618bc288af6f85cba705e6fc20713b3bd47a632 /libmysqld
parenta582bf83a7e08a20c295f24d1b94f01eea10a65f (diff)
downloadmariadb-git-e81d45c182971be3a29e042794f0922112f11479.tar.gz
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
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/lib_sql.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 179bbaeec91..df1e5b8f36c 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -752,7 +752,7 @@ bool setup_params_data_withlog(st_prep_stmt *stmt)
if (*client_param->is_null)
{
param->maybe_null= param->null_value= 1;
- res= &null_string;
+ res= &my_null_string;
}
else
{