← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/db.cc

Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/db.cc
345
345
      push_warning_printf(session, DRIZZLE_ERROR::WARN_LEVEL_NOTE,
346
346
                          ER_DB_CREATE_EXISTS, ER(ER_DB_CREATE_EXISTS), db);
347
347
      if (!silent)
348
 
        my_ok(session);
 
348
        session->my_ok();
349
349
      error= 0;
350
350
      goto exit;
351
351
    }
382
382
    }
383
383
 
384
384
    (void)replicator_statement(session, query, query_length);
385
 
    my_ok(session, result);
 
385
    session->my_ok(result);
386
386
  }
387
387
 
388
388
exit:
440
440
  }
441
441
 
442
442
  (void)replicator_statement(session, session->query, session->query_length);
443
 
  my_ok(session, result);
 
443
  session->my_ok(result);
444
444
 
445
445
  pthread_mutex_unlock(&LOCK_drizzle_create_db);
446
446
  start_waiting_global_read_lock(session);
552
552
    (void)replicator_statement(session, session->query, session->query_length);
553
553
    session->clear_error();
554
554
    session->server_status|= SERVER_STATUS_DB_DROPPED;
555
 
    my_ok(session, (uint32_t) deleted);
 
555
    session->my_ok((uint32_t) deleted);
556
556
    session->server_status&= ~SERVER_STATUS_DB_DROPPED;
557
557
  }
558
558
  else