diff options
| author | Vladislav Vaintroub <vvaintroub@fedora12> | 2009-12-25 16:49:21 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@fedora12> | 2009-12-25 16:49:21 +0100 |
| commit | 541edcc2e4a746908e508c6f997baf13c02aee89 (patch) | |
| tree | 7759e1bcb9d4f5273bfcaada45aac3885f5cd8fe /sql/item_timefunc.h | |
| parent | 0940d7d2040f71686901bcc0cd708f562a9ee271 (diff) | |
| parent | 6c716007d13ffd74bb5c3dd7c512d4d7026a23d8 (diff) | |
| download | mariadb-git-541edcc2e4a746908e508c6f997baf13c02aee89.tar.gz | |
merge
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; } |