diff options
| author | unknown <jan@hundin.mysql.fi> | 2004-09-03 08:23:16 +0300 |
|---|---|---|
| committer | unknown <jan@hundin.mysql.fi> | 2004-09-03 08:23:16 +0300 |
| commit | 3e3981b558befa08a3278f86e5fd0a12417abba1 (patch) | |
| tree | d434aa5a534a44db7ec00b1a2b874304849a3964 /innobase/row | |
| parent | 05265d576cdc9b9aaf1bbe7c2dc3f7276d2247ec (diff) | |
| parent | c91fb136413030353b93ac41a7ef8430a6393509 (diff) | |
| download | mariadb-git-3e3981b558befa08a3278f86e5fd0a12417abba1.tar.gz | |
Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
Diffstat (limited to 'innobase/row')
| -rw-r--r-- | innobase/row/row0mysql.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/innobase/row/row0mysql.c b/innobase/row/row0mysql.c index fd12759ad0a..2e8c3adf94f 100644 --- a/innobase/row/row0mysql.c +++ b/innobase/row/row0mysql.c @@ -2337,21 +2337,6 @@ row_drop_table_for_mysql( srv_print_innodb_table_monitor = FALSE; } - ut_ad(trx->mysql_thread_id == os_thread_get_curr_id()); - ut_a(name != NULL); - - if (srv_created_new_raw) { - fputs( - "InnoDB: A new raw disk partition was initialized or\n" - "InnoDB: innodb_force_recovery is on: we do not allow\n" - "InnoDB: database modifications by the user. Shut down\n" - "InnoDB: mysqld and edit my.cnf so that newraw is replaced\n" - "InnoDB: with raw, and innodb_force_... is removed.\n", - stderr); - - return(DB_ERROR); - } - quoted_name = mem_strdupq(name, '\''); namelen = strlen(quoted_name); sql = mem_alloc((sizeof str1) + (sizeof str2) - 2 + 1 + namelen); |