diff options
| author | unknown <heikki@hundin.mysql.fi> | 2003-04-16 16:45:01 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2003-04-16 16:45:01 +0300 |
| commit | 33ac47279b7367c816c90642f1b4e530c05f248e (patch) | |
| tree | 7fff68a7504903b0da22aa86bbf09e69351a2184 /innobase/srv | |
| parent | 07c29cc91aaba8a7982db9b7ba9c95ffc9ab7445 (diff) | |
| download | mariadb-git-33ac47279b7367c816c90642f1b4e530c05f248e.tar.gz | |
Many files:
Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/buf/buf0flu.c:
Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/dict/dict0crea.c:
Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/dict/dict0dict.c:
Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/dict/dict0load.c:
Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/ibuf/ibuf0ibuf.c:
Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/include/db0err.h:
Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/include/dict0dict.h:
Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/include/row0ins.h:
Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/lock/lock0lock.c:
Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/os/os0file.c:
Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/row/row0ins.c:
Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/row/row0mysql.c:
Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/row/row0sel.c:
Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/row/row0upd.c:
Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/srv/srv0srv.c:
Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/ut/ut0ut.c:
Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
sql/ha_innodb.cc:
Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
Diffstat (limited to 'innobase/srv')
| -rw-r--r-- | innobase/srv/srv0srv.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index c6f3bd40dfe..ccb3755b252 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -1869,11 +1869,11 @@ retry: /* Go to wait for the event; when a thread leaves InnoDB it will release this thread */ - trx->op_info = "waiting in InnoDB queue"; + trx->op_info = (char*)"waiting in InnoDB queue"; os_event_wait(slot->event); - trx->op_info = ""; + trx->op_info = (char*)""; os_fast_mutex_lock(&srv_conc_mutex); @@ -2346,12 +2346,22 @@ srv_sprintf_innodb_monitor( buf = buf + strlen(buf); ut_a(buf < buf_end + 1500); - buf += sprintf(buf, "------------\n" - "TRANSACTIONS\n" - "------------\n"); + if (*dict_foreign_err_buf != '\0') { + buf += sprintf(buf, + "------------------------\n" + "LATEST FOREIGN KEY ERROR\n" + "------------------------\n"); + + if (buf_end - buf > 6000) { + buf+= sprintf(buf, "%.4000s", dict_foreign_err_buf); + } + } + + ut_a(buf < buf_end + 1500); + lock_print_info(buf, buf_end); buf = buf + strlen(buf); - + buf += sprintf(buf, "--------\n" "FILE I/O\n" "--------\n"); |