← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Brian Aker
  • Date: 2009-02-21 00:18:15 UTC
  • Revision ID: brian@tangent.org-20090221001815-x20e8h71e984lvs1
Completion (?) of uint conversion.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
2233
2233
  /* Fix alias if table name changes */
2234
2234
  if (strcmp(table->alias, alias))
2235
2235
  {
2236
 
    uint32_t length=(uint) strlen(alias)+1;
 
2236
    uint32_t length=(uint32_t) strlen(alias)+1;
2237
2237
    table->alias= (char*) realloc((char*) table->alias, length);
2238
2238
    memcpy((void*) table->alias, alias, length);
2239
2239
  }
2514
2514
      already locked.
2515
2515
    */
2516
2516
    session->some_tables_deleted=0;
2517
 
    if ((lock= mysql_lock_tables(session, tables, (uint) (tables_ptr - tables),
 
2517
    if ((lock= mysql_lock_tables(session, tables, (uint32_t) (tables_ptr - tables),
2518
2518
                                 flags, &not_used)))
2519
2519
    {
2520
2520
      session->locked_tables=mysql_lock_merge(session->locked_tables,lock);
2885
2885
    return(1);
2886
2886
 
2887
2887
  while ((error= open_table_from_share(session, share, alias,
2888
 
                                       (uint) (HA_OPEN_KEYFILE |
 
2888
                                       (uint32_t) (HA_OPEN_KEYFILE |
2889
2889
                                               HA_OPEN_RNDFILE |
2890
2890
                                               HA_GET_INDEX |
2891
2891
                                               HA_TRY_READ_ONLY),
2946
2946
     session->clear_error();                            // Clear error message
2947
2947
     error= 0;
2948
2948
     if (open_table_from_share(session, share, alias,
2949
 
                               (uint) (HA_OPEN_KEYFILE | HA_OPEN_RNDFILE |
 
2949
                               (uint32_t) (HA_OPEN_KEYFILE | HA_OPEN_RNDFILE |
2950
2950
                                       HA_GET_INDEX |
2951
2951
                                       HA_TRY_READ_ONLY),
2952
2952
                               EXTRA_RECORD,
3439
3439
        *(ptr++)= table->table;
3440
3440
    }
3441
3441
 
3442
 
    if (!(session->lock= mysql_lock_tables(session, start, (uint) (ptr - start),
 
3442
    if (!(session->lock= mysql_lock_tables(session, start, (uint32_t) (ptr - start),
3443
3443
                                       lock_flag, need_reopen)))
3444
3444
    {
3445
3445
      return(-1);
3549
3549
  if (open_table_def(session, share, 0) ||
3550
3550
      open_table_from_share(session, share, table_name,
3551
3551
                            (open_mode == OTM_ALTER) ? 0 :
3552
 
                            (uint) (HA_OPEN_KEYFILE | HA_OPEN_RNDFILE |
 
3552
                            (uint32_t) (HA_OPEN_KEYFILE | HA_OPEN_RNDFILE |
3553
3553
                                    HA_GET_INDEX),
3554
3554
                            (open_mode == OTM_ALTER) ?
3555
3555
                              (EXTRA_RECORD | OPEN_FRM_FILE_ONLY)
4088
4088
  const char *db= item->db_name;
4089
4089
  const char *table_name= item->table_name;
4090
4090
  const char *name= item->field_name;
4091
 
  uint32_t length=(uint) strlen(name);
 
4091
  uint32_t length=(uint32_t) strlen(name);
4092
4092
  char name_buff[NAME_LEN+1];
4093
4093
  TableList *cur_table= first_table;
4094
4094
  TableList *actual_table;
5942
5942
  if ((dirp = my_dir(drizzle_tmpdir ,MYF(MY_WME | MY_DONT_SORT))))
5943
5943
  {
5944
5944
    /* Remove all SQLxxx tables from directory */
5945
 
    for (idx=0 ; idx < (uint) dirp->number_off_files ; idx++)
 
5945
    for (idx=0 ; idx < (uint32_t) dirp->number_off_files ; idx++)
5946
5946
    {
5947
5947
      file=dirp->dir_entry+idx;
5948
5948