diff options
| author | Alexander Barkov <bar@mysql.com> | 2009-10-21 15:48:22 +0500 |
|---|---|---|
| committer | Alexander Barkov <bar@mysql.com> | 2009-10-21 15:48:22 +0500 |
| commit | 344ddc85faa7b6936f0f2d9b925af112cbaa1d79 (patch) | |
| tree | d2522e7182d47f0be16e18e95d3830f7ff496ce0 /sql/sql_class.cc | |
| parent | 479b602fd6453e9e5907d7a2554f9682bac6a1b8 (diff) | |
| parent | ac2a0348a24f501fdd2ffb1dcf3bde5d3ce101db (diff) | |
| download | mariadb-git-344ddc85faa7b6936f0f2d9b925af112cbaa1d79.tar.gz | |
Merging mysql-next-mr-merge to mysql-next-mr.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 24d1dc5d3a9..4ed25b03ed7 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1617,13 +1617,17 @@ bool select_result::check_simple_select() const static String default_line_term("\n",default_charset_info); static String default_escaped("\\",default_charset_info); static String default_field_term("\t",default_charset_info); +static String default_xml_row_term("<row>", default_charset_info); -sql_exchange::sql_exchange(char *name,bool flag) +sql_exchange::sql_exchange(char *name, bool flag, + enum enum_filetype filetype_arg) :file_name(name), opt_enclosed(0), dumpfile(flag), skip_lines(0) { + filetype= filetype_arg; field_term= &default_field_term; enclosed= line_start= &my_empty_string; - line_term= &default_line_term; + line_term= filetype == FILETYPE_CSV ? + &default_line_term : &default_xml_row_term; escaped= &default_escaped; cs= NULL; } |