diff options
| author | bar@bar.mysql.r18.ru <> | 2003-05-30 13:03:56 +0500 |
|---|---|---|
| committer | bar@bar.mysql.r18.ru <> | 2003-05-30 13:03:56 +0500 |
| commit | 81f0fb6e18eb0a3dca8350275d83dce4d0c6c74d (patch) | |
| tree | 7682d84ae2c4a6586327f259fdad9663290deb15 /sql/sql_load.cc | |
| parent | b4014b903b115f4181fba03911c5a77fd87d1cba (diff) | |
| download | mariadb-git-81f0fb6e18eb0a3dca8350275d83dce4d0c6c74d.tar.gz | |
character_set_server is now updatable
character_set_database was added
Code optimization: reuse more code for all character sets variables
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 758ff88477b..12acfb9b5df 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -215,7 +215,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, info.handle_duplicates=handle_duplicates; info.escape_char=escaped->length() ? (*escaped)[0] : INT_MAX; - READ_INFO read_info(file,tot_length,thd->db_charset, + READ_INFO read_info(file,tot_length,thd->variables.character_set_database, *field_term,*ex->line_start, *ex->line_term, *enclosed, info.escape_char, read_file_from_client, is_fifo); if (read_info.error) |