diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-10-28 02:36:19 +0300 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-10-28 02:36:19 +0300 |
| commit | 1b574f5bdf347ddfeea3b6b704f1089ebb99ea98 (patch) | |
| tree | 15e24b28ea84bf971a840e358e58bfdcfb90ebe9 /sql/item_timefunc.h | |
| parent | 7911c50718fa27c2fa56e99d765b54267481a8d2 (diff) | |
| download | mariadb-git-1b574f5bdf347ddfeea3b6b704f1089ebb99ea98.tar.gz | |
Merge 4.1 - 5.0
mysql-test/r/insert_select.result:
Merge from 4.1 to 5.0.
mysql-test/r/select.result:
Merge from 4.1 to 5.0.
mysql-test/t/insert_select.test:
Merge from 4.1 to 5.0.
mysys/my_handler.c:
Merge from 4.1 to 5.0.
sql/item.cc:
Merge from 4.1 to 5.0.
sql/item_timefunc.cc:
Imported bug fix from 4.1 to 5.0. (Bug#14016)
sql/item_timefunc.h:
Imported bug fix from 4.1 to 5.0. (Bug#14016)
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index 8e15acbc1fc..196966f5388 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -537,6 +537,7 @@ public: { return is_time_format ? "time_format" : "date_format"; } void fix_length_and_dec(); uint format_length(const String *format); + bool eq(const Item *item, bool binary_cmp) const; }; |