Gentoo Archives: gentoo-commits

From: "Ole Markus With (olemarkus)" <olemarkus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-db/freetds/files: freetds-0.91-fix_field_aliases.patch
Date: Wed, 22 Jan 2014 13:37:36
Message-Id: 20140122133730.DC6D92004E@flycatcher.gentoo.org
1 olemarkus 14/01/22 13:37:30
2
3 Added: freetds-0.91-fix_field_aliases.patch
4 Log:
5 Fix for bug 498374
6
7 (Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key C4A92BF5)
8
9 Revision Changes Path
10 1.1 dev-db/freetds/files/freetds-0.91-fix_field_aliases.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/freetds/files/freetds-0.91-fix_field_aliases.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/freetds/files/freetds-0.91-fix_field_aliases.patch?rev=1.1&content-type=text/plain
14
15 Index: freetds-0.91-fix_field_aliases.patch
16 ===================================================================
17 Gentoo bug: 498374
18
19 diff -Nru freetds-0.91/src/odbc/odbc.c freetds-0.91/src/odbc/odbc.c
20 --- freetds-0.91/src/odbc/odbc.c.orig 2010-03-22 09:42:16.000000000 -0500
21 +++ freetds-0.91/src/odbc/odbc.c 2010-05-06 16:00:00.000000000 -0500
22 @@ -3012,12 +3012,9 @@
23
24 odbc_set_sql_type_info(col, drec, stmt->dbc->env->attr.odbc_version);
25
26 - if (!col->table_column_name) {
27 - if (!tds_dstr_copyn(&drec->sql_desc_name, col->column_name, col->column_namelen))
28 - return SQL_ERROR;
29 - } else {
30 - if (!tds_dstr_copy(&drec->sql_desc_name, col->table_column_name))
31 - return SQL_ERROR;
32 + if (!tds_dstr_copyn(&drec->sql_desc_name, col->column_name, col->column_namelen))
33 + return SQL_ERROR;
34 + if (col->table_column_name) {
35 if (!tds_dstr_copy(&drec->sql_desc_base_column_name, col->table_column_name))
36 return SQL_ERROR;
37 }