diff options
author | Sergei Golubchik <serg@mariadb.org> | 2014-09-03 20:05:51 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-10 22:27:42 +0200 |
commit | a7b2c95a40101f218d6ed608e8703c2ff761ea47 (patch) | |
tree | 7963fc33deb93aa05fe504d3121eea4260c1a639 /sql/sql_string.h | |
parent | b969a690217f2364cd6c8b55315360223fe1f00b (diff) | |
download | mariadb-git-a7b2c95a40101f218d6ed608e8703c2ff761ea47.tar.gz |
bugs in sys_var::val_* code
1. @@boolean_var differs from SHOW VARIABLES
2. @@str_var ignored variable charset (which is wrong
for path variables that use filesystem charset)
3. @@signed_int_var in the string context was printed
as unsigned
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r-- | sql/sql_string.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index 95c82518f9e..0b7e949392d 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -211,10 +211,12 @@ public: str_charset=cs; } bool set_int(longlong num, bool unsigned_flag, CHARSET_INFO *cs); - bool set(longlong num, CHARSET_INFO *cs) - { return set_int(num, false, cs); } - bool set(ulonglong num, CHARSET_INFO *cs) - { return set_int((longlong)num, true, cs); } + bool set(int num, CHARSET_INFO *cs) { return set_int(num, false, cs); } + bool set(uint num, CHARSET_INFO *cs) { return set_int(num, true, cs); } + bool set(long num, CHARSET_INFO *cs) { return set_int(num, false, cs); } + bool set(ulong num, CHARSET_INFO *cs) { return set_int(num, true, cs); } + bool set(longlong num, CHARSET_INFO *cs) { return set_int(num, false, cs); } + bool set(ulonglong num, CHARSET_INFO *cs) { return set_int((longlong)num, true, cs); } bool set_real(double num,uint decimals, CHARSET_INFO *cs); /* Move handling of buffer from some other object to String */ |