summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2003-02-14 11:47:41 +0200
committerunknown <monty@mashka.mysql.fi>2003-02-14 11:47:41 +0200
commit5a12dff30bc694f8d0af923b0bd2a5b79912d2ca (patch)
tree2bcccee0d1ca3eede87c86ba444c18bb917dd8cd /libmysqld
parent86ec3c8f085c65b9ac2ef8776cad956465abddd7 (diff)
downloadmariadb-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 'libmysqld')
-rw-r--r--libmysqld/lib_sql.cc13
1 files changed, 11 insertions, 2 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index a1fbaaae631..c989ee0c89f 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -373,13 +373,22 @@ bool Protocol::send_fields(List<Item> *list, uint flag)
Send_field server_field;
item->make_field(&server_field);
+ client_field->db= strdup_root(alloc, server_field.db_name);
client_field->table= strdup_root(alloc, server_field.table_name);
- client_field->name= strdup_root(alloc,server_field.col_name);
+ client_field->name= strdup_root(alloc, server_field.col_name);
+ client_field->org_table= strdup_root(alloc, server_field.org_table_name);
+ client_field->org_name= strdup_root(alloc, server_field.org_col_name);
client_field->length= server_field.length;
client_field->type= server_field.type;
client_field->flags= server_field.flags;
client_field->decimals= server_field.decimals;
-
+ client_field->db_length= strlen(client_field->db);
+ client_field->table_length= strlen(client_field->table);
+ client_field->name_length= strlen(client_field->name);
+ client_field->org_name_length= strlen(client_field->org_name);
+ client_field->org_table_length= strlen(client_field->org_table);
+ client_field->charsetnr= server_field.charsetnr;
+
if (INTERNAL_NUM_FIELD(client_field))
client_field->flags|= NUM_FLAG;