summaryrefslogtreecommitdiff
path: root/innobase/trx/trx0trx.c
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2004-02-20 17:43:02 +0200
committermonty@mashka.mysql.fi <>2004-02-20 17:43:02 +0200
commit494e43c1f56d2a65fc804af865ae82661fbb046f (patch)
treee13a23a1c9f28ed5eb2d903ba59a153cda3355ac /innobase/trx/trx0trx.c
parentf8b4732a5edccdf71eb65093c8bb6ec028176fec (diff)
parente1fee022fa10fc0cceafbd774441d70311e10434 (diff)
downloadmariadb-git-494e43c1f56d2a65fc804af865ae82661fbb046f.tar.gz
merge with 4.0 to get security fixes and latest bug fixes
Diffstat (limited to 'innobase/trx/trx0trx.c')
-rw-r--r--innobase/trx/trx0trx.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c
index 3926cfa03c5..47927976851 100644
--- a/innobase/trx/trx0trx.c
+++ b/innobase/trx/trx0trx.c
@@ -1147,8 +1147,6 @@ trx_sig_send(
ut_a(0);
- /* sess_raise_error_low(trx, 0, 0, NULL, NULL, NULL, NULL,
- "Incompatible signal"); */
return(FALSE);
}
@@ -1197,9 +1195,6 @@ trx_sig_send(
in the error state: */
ut_a(0);
-
- sess_raise_error_low(trx, 0, 0, NULL, NULL, NULL, NULL,
- (char *) "Signal from another session, or a break execution signal");
}
/* If there were no other signals ahead in the queue, try to start