diff options
author | Konstantin Osipov <kostja@sun.com> | 2010-02-03 03:06:42 +0300 |
---|---|---|
committer | Konstantin Osipov <kostja@sun.com> | 2010-02-03 03:06:42 +0300 |
commit | 056ac55aa0954b3321aa5e838a5563e731c1c516 (patch) | |
tree | 8555c47c0ce18227ce535252d2c2966af26183d3 /sql/item_timefunc.h | |
parent | a6daa9ada052b7b7b09683ea6d565c92f5e15512 (diff) | |
parent | 3701208a2e890d42aabc678a2a5d4ea539941b36 (diff) | |
download | mariadb-git-056ac55aa0954b3321aa5e838a5563e731c1c516.tar.gz |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/item_timefunc.h')
-rw-r--r-- | sql/item_timefunc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index f6c316c15c6..860bd983184 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -96,7 +96,7 @@ public: { int *input_version= (int*)int_arg; /* This function was introduced in 5.5 */ - int output_version= (*input_version, 50500); + int output_version= max(*input_version, 50500); *input_version= output_version; return 0; } |