diff options
| author | hf@deer.(none) <> | 2003-09-25 13:02:45 +0500 |
|---|---|---|
| committer | hf@deer.(none) <> | 2003-09-25 13:02:45 +0500 |
| commit | 192fcb9cc6c669b40c1c92c5164cd0736c8b979f (patch) | |
| tree | 1618bc288af6f85cba705e6fc20713b3bd47a632 /sql/sql_prepare.cc | |
| parent | 5077ea0e2dd2a5439eeb89b22fd4e9d01d2608ed (diff) | |
| download | mariadb-git-192fcb9cc6c669b40c1c92c5164cd0736c8b979f.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
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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 { |