diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-01-15 17:27:55 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-01-15 17:27:55 +0200 |
| commit | d8ecbbe63471f958aa70443545b63d88d2db0230 (patch) | |
| tree | 32a6f432080d9125b3619f8935eb5b1de00e861d /sql/item_strfunc.cc | |
| parent | d121e6630519a66eec7c953ee0eae623f592ce87 (diff) | |
| parent | 6d69089845ed4c50df0ca8136a2cdacb8f2e1380 (diff) | |
| download | mariadb-git-d8ecbbe63471f958aa70443545b63d88d2db0230.tar.gz | |
Merge with MySQL 5.1.42
- Marked a couple of tests with --big
- Fixed xtradb/handler/ha_innodb.cc to call explain_filename()
storage/xtradb/handler/ha_innodb.cc:
Call explain_filename() to get proper names for partitioned tables
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 5e2c161bbe2..ac15ac93f7d 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1828,8 +1828,9 @@ String *Item_func_database::val_str(String *str) /** - @todo - make USER() replicate properly (currently it is replicated to "") + @note USER() is replicated correctly if binlog_format=ROW or (as of + BUG#28086) binlog_format=MIXED, but is incorrectly replicated to '' + if binlog_format=STATEMENT. */ bool Item_func_user::init(const char *user, const char *host) { |