diff options
author | monty@mysql.com <> | 2005-02-22 15:47:00 +0200 |
---|---|---|
committer | monty@mysql.com <> | 2005-02-22 15:47:00 +0200 |
commit | e2ea35ec673747925780b2ad44f2b3c0a2a7961a (patch) | |
tree | 775f6aaae95a3574b8d285d2433c3797b653e482 /sql/procedure.h | |
parent | f55e2002484b822851b5ce26e65eb82c0caed5f5 (diff) | |
parent | 5e6ba9dec8f3f82745e657a2f64564ef0c5e2348 (diff) | |
download | mariadb-git-e2ea35ec673747925780b2ad44f2b3c0a2a7961a.tar.gz |
Merge with 4.1
Diffstat (limited to 'sql/procedure.h')
-rw-r--r-- | sql/procedure.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/procedure.h b/sql/procedure.h index 4e5bf8a2f4b..5d0dccbcd5e 100644 --- a/sql/procedure.h +++ b/sql/procedure.h @@ -110,7 +110,7 @@ public: { int err_not_used; char *end_not_used; - CHARSET_INFO *cs=str_value.charset(); + CHARSET_INFO *cs= str_value.charset(); return my_strntod(cs, (char*) str_value.ptr(), str_value.length(), &end_not_used, &err_not_used); } |