diff options
| author | unknown <bar@eagle.intranet.mysql.r18.ru> | 2005-03-25 10:43:35 +0400 |
|---|---|---|
| committer | unknown <bar@eagle.intranet.mysql.r18.ru> | 2005-03-25 10:43:35 +0400 |
| commit | e6eef648b077e63f704cac1642c21ff6006f1fd9 (patch) | |
| tree | be8c2e805ee462b2b1ae5dc0f8e3e3b9ca664eb4 /sql/item_strfunc.h | |
| parent | d146fbc347a1656f4bf8095c069ecf786471b620 (diff) | |
| parent | 76f3b678b7d70c859ba61c12292a9d6bbf7dcb25 (diff) | |
| download | mariadb-git-e6eef648b077e63f704cac1642c21ff6006f1fd9.tar.gz | |
Merge
myisam/myisamchk.c:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.h:
Auto merged
mysql-test/r/func_str.result:
merging
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index ea8a78c528a..eec81f953fb 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -653,7 +653,9 @@ public: { collation.set(system_charset_info); max_length= 64 * collation.collation->mbmaxlen; // should be enough + maybe_null= 0; }; + table_map not_null_tables() const { return 0; } }; class Item_func_collation :public Item_str_func @@ -666,7 +668,9 @@ public: { collation.set(system_charset_info); max_length= 64 * collation.collation->mbmaxlen; // should be enough + maybe_null= 0; }; + table_map not_null_tables() const { return 0; } }; class Item_func_crc32 :public Item_int_func |