← Back to branch summary

~myodbc-developers/myodbc/dsn-upgrade-util

« back to all changes in this revision

Viewing changes to driver/utility.c

  • Committer: Jess Balint
  • Date: 2009-08-12 04:56:20 UTC
  • Revision ID: jbalint@mysql.com-20090812045620-wpy4n9dbbhfz33ap
fix merge from old patch to use new flag struct

Show diffs side-by-side

added added

removed removed

Lines of Context:
driver/utility.c
996
996
  case MYSQL_TYPE_LONGLONG:
997
997
    if (buff)
998
998
    {
999
 
      if (stmt->dbc->flag & FLAG_NO_BIGINT)
 
999
      if (stmt->dbc->ds->change_bigint_columns_to_int)
1000
1000
        buff= strmov(buff, "int");
1001
1001
      else
1002
1002
        buff= strmov(buff, "bigint");
1196
1196
    return 0;
1197
1197
 
1198
1198
  case MYSQL_TYPE_LONGLONG:
1199
 
    if (stmt->dbc->flag & FLAG_NO_BIGINT)
 
1199
    if (stmt->dbc->ds->change_bigint_columns_to_int)
1200
1200
      return 10; /* same as MYSQL_TYPE_LONG */
1201
1201
    else
1202
1202
      return (field->flags & UNSIGNED_FLAG) ? 20 : 19;