database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge of maria/5.5 into maria-5.5-galera.

Browse Source 
bzr merge -r tag:mariadb-5.5.35 maria/5.5
This commit is contained in:
Nirbhay Choubey
2014-01-29 19:00:43 -05:00
parent d2c72da610 6b6d40fa6c
commit ecc2c96c9d
403 changed files with 14777 additions and 1292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.cc
View File

@@ -1349,6 +1349,7 @@ MYSQL_ERROR* THD::raise_condition(uint sql_errno,
got_warning= 1;
break;
case MYSQL_ERROR::WARN_LEVEL_ERROR:
mysql_audit_general(this, MYSQL_AUDIT_GENERAL_ERROR, sql_errno, msg);
break;
default:
DBUG_ASSERT(FALSE);
@@ -2515,6 +2516,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,
@@ -2523,7 +2525,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;