diff options
author | unknown <bell@sanja.is.com.ua> | 2004-10-22 09:53:08 +0300 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2004-10-22 09:53:08 +0300 |
commit | 58aa05e23e73b022e74e55a035ec498a691c29bb (patch) | |
tree | 2d141b0dbfdcd231ccbfce520e105300fe9a024c /sql/item_strfunc.h | |
parent | 485141ce7a6d34e2cf59eb5bf115d6941795043e (diff) | |
parent | 4d204f4303b9b8f2dfc83e593f2f03e35824fb34 (diff) | |
download | mariadb-git-58aa05e23e73b022e74e55a035ec498a691c29bb.tar.gz |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-view-5.0
sql/item_strfunc.h:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/item_strfunc.h')
-rw-r--r-- | sql/item_strfunc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 357ce0af45a..49429a55cac 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -218,7 +218,7 @@ public: Item_func_substr_index(Item *a,Item *b,Item *c) :Item_str_func(a,b,c) {} String *val_str(String *); void fix_length_and_dec(); - const char *func_name() const { return "substr_index"; } + const char *func_name() const { return "substring_index"; } }; |