diff options
| author | unknown <mikael@dator6.(none)> | 2007-06-13 16:12:02 +0200 |
|---|---|---|
| committer | unknown <mikael@dator6.(none)> | 2007-06-13 16:12:02 +0200 |
| commit | 59f309c8586ae7ff2d62ce3ac7c9c1b567da61ff (patch) | |
| tree | 905126fecca6a81364b8222ea7f3520d89d134d9 /sql/item_timefunc.h | |
| parent | 43fb390959fab00de4b5fa29a9c027e5cd64278a (diff) | |
| download | mariadb-git-59f309c8586ae7ff2d62ce3ac7c9c1b567da61ff.tar.gz | |
manual merge
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index bdf3560a55d..32f5bcf8e52 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -127,7 +127,7 @@ public: max_length=10*my_charset_bin.mbmaxlen; maybe_null=1; } - bool check_partition_func_processor(byte *int_arg) {return TRUE;} + bool check_partition_func_processor(uchar *int_arg) {return TRUE;} }; @@ -301,7 +301,7 @@ class Item_func_dayname :public Item_func_weekday max_length=9*MY_CHARSET_BIN_MB_MAXLEN; maybe_null=1; } - bool check_partition_func_processor(byte *int_arg) {return TRUE;} + bool check_partition_func_processor(uchar *int_arg) {return TRUE;} }; |