diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-08-07 21:19:43 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-08-07 21:19:43 +0300 |
| commit | f4646c0d063fb541f48dd2824ecccea464a9958d (patch) | |
| tree | ae1adf314b74af9f9885cef15ab9ffb8974d3e2d /sql/set_var.h | |
| parent | 553daa5e40b413489431d5d21b512c6b529bccac (diff) | |
| parent | b9aa175cb282ce92e733412a74e23ba750f8dd80 (diff) | |
| download | mariadb-git-f4646c0d063fb541f48dd2824ecccea464a9958d.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
sql/item_func.cc:
Auto merged
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index 978aba3384a..968687ad382 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -607,7 +607,7 @@ public: { Item_field *item= (Item_field*) value_arg; if (!(value=new Item_string(item->field_name, strlen(item->field_name), - item->charset()))) + item->collation.collation))) value=value_arg; /* Give error message later */ } else |