Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2013Q2

Browse Source
This commit is contained in:
Lionel Sambuc
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
databases/mysql56-client/patches/patch-sql_sql__load.cc Normal file
View File

@@ -0,0 +1,40 @@
$NetBSD: patch-sql_sql__load.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
--- sql/sql_load.cc.orig 2013-04-05 12:27:18.000000000 +0000
+++ sql/sql_load.cc
@@ -475,7 +475,7 @@ int mysql_load(THD *thd,sql_exchange *ex
}
}
- if (!(error=test(read_info.error)))
+ if (!(error=my_test(read_info.error)))
{
table->next_number_field=table->found_next_number_field;
@@ -908,7 +908,7 @@ read_fixed_length(THD *thd, COPY_INFO &i
thd->get_stmt_da()->inc_current_row_for_warning();
continue_loop:;
}
- DBUG_RETURN(test(read_info.error));
+ DBUG_RETURN(my_test(read_info.error));
}
@@ -1118,7 +1118,7 @@ read_sep_field(THD *thd, COPY_INFO &info
thd->get_stmt_da()->inc_current_row_for_warning();
continue_loop:;
}
- DBUG_RETURN(test(read_info.error));
+ DBUG_RETURN(my_test(read_info.error));
}
@@ -1280,7 +1280,7 @@ read_xml_field(THD *thd, COPY_INFO &info
thd->get_stmt_da()->inc_current_row_for_warning();
continue_loop:;
}
- DBUG_RETURN(test(read_info.error) || thd->is_error());
+ DBUG_RETURN(my_test(read_info.error) || thd->is_error());
} /* load xml end */