← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/alter_table.cc

merged with latest trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/alter_table.cc
51
51
 
52
52
extern pid_t current_pid;
53
53
 
54
 
static int copy_data_between_tables(Table *from,Table *to,
 
54
static int copy_data_between_tables(Session *session,
 
55
                                    Table *from,Table *to,
55
56
                                    List<CreateField> &create,
56
57
                                    bool ignore,
57
58
                                    uint32_t order_num,
273
274
  /* First collect all fields from table which isn't in drop_list */
274
275
  Field **f_ptr;
275
276
  Field *field;
276
 
  for (f_ptr= table->field; (field= *f_ptr); f_ptr++)
 
277
  for (f_ptr= table->getFields(); (field= *f_ptr); f_ptr++)
277
278
  {
278
279
    /* Check if field should be dropped */
279
280
    AlterDrop *drop;
434
435
    Collect all keys which isn't in drop list. Add only those
435
436
    for which some fields exists.
436
437
  */
437
 
  for (uint32_t i= 0; i < table->getShare()->keys; i++, key_info++)
 
438
  for (uint32_t i= 0; i < table->getShare()->sizeKeys(); i++, key_info++)
438
439
  {
439
440
    char *key_name= key_info->name;
440
441
    AlterDrop *drop;
685
686
    false  OK
686
687
    true   Error
687
688
*/
688
 
static bool alter_table_manage_keys(Table *table, int indexes_were_disabled,
 
689
static bool alter_table_manage_keys(Session *session,
 
690
                                    Table *table, int indexes_were_disabled,
689
691
                                    enum enum_enable_or_disable keys_onoff)
690
692
{
691
693
  int error= 0;
703
705
 
704
706
  if (error == HA_ERR_WRONG_COMMAND)
705
707
  {
706
 
    push_warning_printf(current_session, DRIZZLE_ERROR::WARN_LEVEL_NOTE,
 
708
    push_warning_printf(session, DRIZZLE_ERROR::WARN_LEVEL_NOTE,
707
709
                        ER_ILLEGAL_HA, ER(ER_ILLEGAL_HA),
708
710
                        table->getMutableShare()->getTableName());
709
711
    error= 0;
962
964
        }
963
965
        else
964
966
        {
965
 
          if (mysql_rename_table(original_engine, original_table_identifier, new_table_identifier))
 
967
          if (mysql_rename_table(*session, original_engine, original_table_identifier, new_table_identifier))
966
968
          {
967
969
            error= -1;
968
970
          }
1046
1048
    /* We don't want update TIMESTAMP fields during ALTER Table. */
1047
1049
    new_table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET;
1048
1050
    new_table->next_number_field= new_table->found_next_number_field;
1049
 
    error= copy_data_between_tables(table,
 
1051
    error= copy_data_between_tables(session,
 
1052
                                    table,
1050
1053
                                    new_table,
1051
1054
                                    alter_info->create_list,
1052
1055
                                    ignore,
1163
1166
 
1164
1167
    new_table_identifier.setPath(new_table_as_temporary.getPath());
1165
1168
 
1166
 
    if (mysql_rename_table(new_engine, new_table_as_temporary, new_table_identifier) != 0)
 
1169
    if (mysql_rename_table(*session, new_engine, new_table_as_temporary, new_table_identifier) != 0)
1167
1170
    {
1168
1171
      return true;
1169
1172
    }
1230
1233
    TableIdentifier original_table_to_drop(original_table_identifier.getSchemaName(),
1231
1234
                                           old_name, message::Table::TEMPORARY);
1232
1235
 
1233
 
    if (mysql_rename_table(original_engine, original_table_identifier, original_table_to_drop))
 
1236
    if (mysql_rename_table(*session, original_engine, original_table_identifier, original_table_to_drop))
1234
1237
    {
1235
1238
      error= 1;
1236
1239
      quick_rm_table(*session, new_table_as_temporary);
1237
1240
    }
1238
1241
    else
1239
1242
    {
1240
 
      if (mysql_rename_table(new_engine, new_table_as_temporary, new_table_identifier) != 0)
 
1243
      if (mysql_rename_table(*session, new_engine, new_table_as_temporary, new_table_identifier) != 0)
1241
1244
      {
1242
1245
        /* Try to get everything back. */
1243
1246
        error= 1;
1246
1249
 
1247
1250
        quick_rm_table(*session, new_table_as_temporary);
1248
1251
 
1249
 
        mysql_rename_table(original_engine, original_table_to_drop, original_table_identifier);
 
1252
        mysql_rename_table(*session, original_engine, original_table_to_drop, original_table_identifier);
1250
1253
      }
1251
1254
      else
1252
1255
      {
1361
1364
/* alter_table */
1362
1365
 
1363
1366
static int
1364
 
copy_data_between_tables(Table *from, Table *to,
 
1367
copy_data_between_tables(Session *session,
 
1368
                         Table *from, Table *to,
1365
1369
                         List<CreateField> &create,
1366
1370
                         bool ignore,
1367
1371
                         uint32_t order_num, order_st *order,
1373
1377
  int error= 0;
1374
1378
  CopyField *copy,*copy_end;
1375
1379
  ulong found_count,delete_count;
1376
 
  Session *session= current_session;
1377
1380
  uint32_t length= 0;
1378
1381
  SORT_FIELD *sortorder;
1379
1382
  ReadRecord info;
1401
1404
   */
1402
1405
  to->s->getEngine()->startStatement(session);
1403
1406
 
1404
 
  if (!(copy= new CopyField[to->s->fields]))
1405
 
  if (!(copy= new CopyField[to->getShare()->fields]))
 
1407
  if (!(copy= new CopyField[to->getShare()->sizeFields()]))
1406
1408
    return -1;
1407
1409
 
1408
1410
  if (to->cursor->ha_external_lock(session, F_WRLCK))
1409
1411
    return -1;
1410
1412
 
1411
1413
  /* We need external lock before we can disable/enable keys */
1412
 
  alter_table_manage_keys(to, from->cursor->indexes_are_disabled(), keys_onoff);
 
1414
  alter_table_manage_keys(session, to, from->cursor->indexes_are_disabled(), keys_onoff);
1413
1415
 
1414
1416
  /* We can abort alter table for any table type */
1415
1417
  session->abort_on_warning= !ignore;
1420
1422
  List_iterator<CreateField> it(create);
1421
1423
  CreateField *def;
1422
1424
  copy_end=copy;
1423
 
  for (Field **ptr=to->field ; *ptr ; ptr++)
 
1425
  for (Field **ptr= to->getFields(); *ptr ; ptr++)
1424
1426
  {
1425
1427
    def=it++;
1426
1428
    if (def->field)
1450
1452
    else
1451
1453
    {
1452
1454
      from->sort.io_cache= new internal::IO_CACHE;
1453
 
      memset(from->sort.io_cache, 0, sizeof(internal::IO_CACHE));
1454
1455
 
1455
1456
      memset(&tables, 0, sizeof(tables));
1456
1457
      tables.table= from;