diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-02-14 11:47:41 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-02-14 11:47:41 +0200 |
| commit | 5a12dff30bc694f8d0af923b0bd2a5b79912d2ca (patch) | |
| tree | 2bcccee0d1ca3eede87c86ba444c18bb917dd8cd /sql/item.cc | |
| parent | 86ec3c8f085c65b9ac2ef8776cad956465abddd7 (diff) | |
| download | mariadb-git-5a12dff30bc694f8d0af923b0bd2a5b79912d2ca.tar.gz | |
Fixed problem when connecting to user without a password.
Fixed problem with LIKE and BINARY
BitKeeper/etc/ignore:
added scripts/fill_help_tables
client/mysqltest.c:
Better error messages
libmysql/libmysql.c:
Simple code cleanup
Simplified connect() and change_user() by using sub function
libmysqld/lib_sql.cc:
Ensure that new fields in MYSQL_FIELD structure is used
mysql-test/r/rpl_user_variables.result:
Cleaned up test
mysql-test/r/type_blob.result:
New test
mysql-test/t/rpl_user_variables.test:
Cleaned up test
mysql-test/t/type_blob.test:
New test
sql/item.cc:
Fixed that Item_ref returns the right character set
sql/item_cmpfunc.cc:
Fixed problem with LIKE and BINARY
sql/item_func.cc:
Don't store end ASCII(0) for string user variables
(Made some other code easier)
sql/log_event.cc:
Don't store end ASCII(0) for string user variables.
Fixed comment style
Some optimizations
sql/log_event.h:
Optimized type
sql/mini_client.cc:
Indentation changes
sql/mysql_priv.h:
Made is_update_query extern
sql/protocol.cc:
Simple code cleanup
sql/sql_acl.cc:
Code cleanup
Fixed problem when connecting to user without a password.
sql/sql_lex.h:
Fixed problem with uninitialized memory
sql/sql_parse.cc:
Fixed problem with user without passwords
Fixed some connect problems.
sql/time.cc:
removed reference to uninitialized memory
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc index ee7af1ae0fd..50f87235196 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -1203,18 +1203,22 @@ bool Item_ref::fix_fields(THD *thd,TABLE_LIST *tables, Item **reference) max_length= (*ref)->max_length; maybe_null= (*ref)->maybe_null; decimals= (*ref)->decimals; + set_charset((*ref)->charset()); fixed= 1; + if (ref && (*ref)->check_cols(1)) return 1; return 0; } + bool Item_default_value::eq(const Item *item, bool binary_cmp) const { return item->type() == DEFAULT_VALUE_ITEM && ((Item_default_value *)item)->arg->eq(arg, binary_cmp); } + bool Item_default_value::fix_fields(THD *thd, struct st_table_list *table_list, Item **items) { if (!arg) |