database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

merge 5.3 -> 5.5

Browse Source
This commit is contained in:
Alexander Barkov
2014-01-28 13:00:50 +04:00
parent 4bf002d6a0 f189ed5009
commit 94868914b8
6 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_class.cc
View File

@@ -2284,6 +2284,7 @@ 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_enclosed_and_line_start("", default_charset_info);
static String default_xml_row_term("<row>", default_charset_info);
sql_exchange::sql_exchange(char *name, bool flag,
@@ -2292,7 +2293,7 @@ sql_exchange::sql_exchange(char *name, bool flag,
{
filetype= filetype_arg;
field_term= &default_field_term;
enclosed= line_start= &my_empty_string;
enclosed= line_start= &default_enclosed_and_line_start;
line_term= filetype == FILETYPE_CSV ?
&default_line_term : &default_xml_row_term;
escaped= &default_escaped;