summaryrefslogtreecommitdiff
path: root/innobase/read
diff options
context:
space:
mode:
authorunknown <heikki@hundin.mysql.fi>2005-08-03 17:09:21 +0300
committerunknown <heikki@hundin.mysql.fi>2005-08-03 17:09:21 +0300
commita8bb376fc7ecc3e26623c897c4ec99739a3d1a29 (patch)
treeaedea677efe6043e724f01c1c14864393d62c931 /innobase/read
parentacc423865419b1b9269b4e4777a27b431526d9da (diff)
downloadmariadb-git-a8bb376fc7ecc3e26623c897c4ec99739a3d1a29.tar.gz
Many files:
Push the patch of Jan Lindstrom: better comments ha_innodb.cc: Partial fix for Bug #12263 : we let InnoDB always to perform a rollback on the trx object if MySQL closes a connection; but we do print a warning to the .err log if an InnoDB transaction was active; we may remove that print later, since the situation really is not a bug; MySQL just is not aware that some cursor operation started an InnoDB transaction sql/ha_innodb.cc: Partial fix for Bug #12263 : we let InnoDB always to perform a rollback on the trx object if MySQL closes a connection; but we do print a warning to the .err log if an InnoDB transaction was active; we may remove that print later, since the situation really is not a bug; MySQL just is not aware that some cursor operation started an InnoDB transaction sql/ha_innodb.h: Push the patch of Jan Lindstrom: better comments innobase/trx/trx0trx.c: Push the patch of Jan Lindstrom: better comments innobase/srv/srv0srv.c: Push the patch of Jan Lindstrom: better comments innobase/srv/srv0start.c: Push the patch of Jan Lindstrom: better comments innobase/row/row0sel.c: Push the patch of Jan Lindstrom: better comments innobase/read/read0read.c: Push the patch of Jan Lindstrom: better comments innobase/include/read0read.h: Push the patch of Jan Lindstrom: better comments innobase/include/trx0trx.h: Push the patch of Jan Lindstrom: better comments
Diffstat (limited to 'innobase/read')
-rw-r--r--innobase/read/read0read.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/innobase/read/read0read.c b/innobase/read/read0read.c
index 76df7cdbee0..334f9a8a85a 100644
--- a/innobase/read/read0read.c
+++ b/innobase/read/read0read.c
@@ -347,8 +347,8 @@ read_cursor_view_create_for_mysql(
}
/*************************************************************************
-Close a given consistent cursor view for and restore global read view
-back to a transaction. */
+Close a given consistent cursor view for mysql and restore global read view
+back to a transaction read view. */
void
read_cursor_view_close_for_mysql(
@@ -372,7 +372,7 @@ read_cursor_view_close_for_mysql(
/*************************************************************************
This function sets a given consistent cursor view to a transaction
-read view if given consistent cursor view is not null. Otherwice, function
+read view if given consistent cursor view is not NULL. Otherwise, function
restores a global read view to a transaction read view. */
void