diff options
| author | unknown <mikael/pappa@dator5.(none)> | 2006-08-02 07:01:38 -0400 |
|---|---|---|
| committer | unknown <mikael/pappa@dator5.(none)> | 2006-08-02 07:01:38 -0400 |
| commit | 66f51d15742da645513e6f50db28d5a47e97fc5f (patch) | |
| tree | f18a764bff80f479eb18d1517215d1160a408a07 /sql/item_xmlfunc.h | |
| parent | 95dcd768ca9da1f50f0ddfc42c9072c0001bc3d5 (diff) | |
| parent | bcd98d512db7957896e44059e1f291c04aca3550 (diff) | |
| download | mariadb-git-66f51d15742da645513e6f50db28d5a47e97fc5f.tar.gz | |
Merge dator5.(none):/home/pappa/clean-mysql-5.1
into dator5.(none):/home/pappa/bug18198
mysql-test/r/partition_pruning.result:
Auto merged
mysql-test/t/partition_pruning.test:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.h:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/item_strfunc.h:
SCCS merged
Diffstat (limited to 'sql/item_xmlfunc.h')
| -rw-r--r-- | sql/item_xmlfunc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_xmlfunc.h b/sql/item_xmlfunc.h index e11b4eac1e2..513a85aa665 100644 --- a/sql/item_xmlfunc.h +++ b/sql/item_xmlfunc.h @@ -42,7 +42,7 @@ public: Item_func_xml_extractvalue(Item *a,Item *b) :Item_xml_str_func(a,b) {} const char *func_name() const { return "extractvalue"; } String *val_str(String *); - bool check_partition_func_processor(byte *bool_arg) { return 0;} + bool check_partition_func_processor(byte *int_arg) { return FALSE; } }; |