diff options
| author | unknown <hf@deer.(none)> | 2003-09-25 13:02:45 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-09-25 13:02:45 +0500 |
| commit | e81d45c182971be3a29e042794f0922112f11479 (patch) | |
| tree | 1618bc288af6f85cba705e6fc20713b3bd47a632 | |
| parent | a582bf83a7e08a20c295f24d1b94f01eea10a65f (diff) | |
| download | mariadb-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
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 | ||||
| -rw-r--r-- | sql/mysql_priv.h | 1 | ||||
| -rw-r--r-- | sql/sql_prepare.cc | 4 |
3 files changed, 4 insertions, 3 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 { diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index a0f34434254..e5ad15e1d0e 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -799,6 +799,7 @@ extern I_List<NAMED_LIST> key_caches; extern MY_BITMAP temp_pool; extern DATE_FORMAT dayord; extern String my_empty_string; +extern String my_null_string; extern SHOW_VAR init_vars[],status_vars[], internal_vars[]; extern struct show_table_type_st table_type_vars[]; extern SHOW_COMP_OPTION have_isam; diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 469937b6065..0fd5ef5b7dd 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -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 { |