← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_db.cc

  • Committer: Brian Aker
  • Date: 2008-09-28 03:20:53 UTC
  • mto: This revision was merged to the branch mainline in revision 413.
  • Revision ID: brian@tangent.org-20080928032053-rclc4iiwmwedsf73
Work on removing GNU specific calls.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_db.cc
286
286
    }
287
287
    
288
288
    opt->name= tmp_name;
289
 
    stpcpy(opt->name, dbname);
 
289
    my_stpcpy(opt->name, dbname);
290
290
    opt->name_length= length;
291
291
    
292
292
    if ((error= my_hash_insert(&dboptions, (uchar*) opt)))
808
808
  thd->clear_current_stmt_binlog_row_based();
809
809
 
810
810
  length= build_table_filename(path, sizeof(path), db, "", "", 0);
811
 
  stpcpy(path+length, MY_DB_OPT_FILE);          // Append db option file name
 
811
  my_stpcpy(path+length, MY_DB_OPT_FILE);               // Append db option file name
812
812
  del_dbopt(path);                              // Remove dboption hash entry
813
813
  path[length]= '\0';                           // Remove file name
814
814
 
885
885
 
886
886
    if (!(query= (char*) thd->alloc(MAX_DROP_TABLE_Q_LEN)))
887
887
      goto exit; /* not much else we can do */
888
 
    query_pos= query_data_start= stpcpy(query,"drop table ");
 
888
    query_pos= query_data_start= my_stpcpy(query,"drop table ");
889
889
    query_end= query + MAX_DROP_TABLE_Q_LEN;
890
890
    db_len= strlen(db);
891
891
 
903
903
      }
904
904
 
905
905
      *query_pos++ = '`';
906
 
      query_pos= stpcpy(query_pos,tbl->table_name);
 
906
      query_pos= my_stpcpy(query_pos,tbl->table_name);
907
907
      *query_pos++ = '`';
908
908
      *query_pos++ = ',';
909
909
    }
981
981
      if (!table_list)
982
982
        goto err;
983
983
      table_list->db= (char*) (table_list+1);
984
 
      table_list->table_name= stpcpy(table_list->db, db) + 1;
 
984
      table_list->table_name= my_stpcpy(table_list->db, db) + 1;
985
985
      VOID(filename_to_tablename(file->name, table_list->table_name,
986
986
                                 MYSQL50_TABLE_NAME_PREFIX_LENGTH +
987
987
                                 strlen(file->name) + 1));