List:Internals« Previous MessageNext Message »
From:Heikki Tuuri Date:August 19 2005 10:33am
Subject:bk commit into 5.0 tree (heikki:1.1992) BUG#12456
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of heikki. When heikki does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1992 05/08/19 11:33:11 heikki@stripped +1 -0
  row0sel.c:
    Temporarily remove error print if MySQL tries to do a SELECT even though
trx->n_mysql_tables_in_use is 0. We must return the error print when the lock count of
cursors is properly implemented (Bug #12456)

  innobase/row/row0sel.c
    1.101 05/08/19 11:32:52 heikki@stripped +5 -0
    Temporarily remove error print if MySQL tries to do a SELECT even though
trx->n_mysql_tables_in_use is 0. We must return the error print when the lock count of
cursors is properly implemented (Bug #12456)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	heikki
# Host:	hundin.mysql.fi
# Root:	/home/heikki/mysql-5.0

--- 1.100/innobase/row/row0sel.c	2005-08-12 11:29:57 +03:00
+++ 1.101/innobase/row/row0sel.c	2005-08-19 11:32:52 +03:00
@@ -3124,12 +3124,17 @@
 		be zero; in that case select_lock_type is set to LOCK_X in
 		::start_stmt. */
 
+/* August 19, 2005 by Heikki: temporarily disable this error print until the
+cursor lock count is done correctly. See bugs #12263 and #12456!
+
 		fputs(
 "InnoDB: Error: MySQL is trying to perform a SELECT\n"
 "InnoDB: but it has not locked any tables in ::external_lock()!\n",
                       stderr);
 		trx_print(stderr, trx, 600);
                 fputc('\n', stderr);
+*/
+
 	}
 
 /*	fprintf(stderr, "Match mode %lu\n search tuple ", (ulong) match_mode);
Thread
bk commit into 5.0 tree (heikki:1.1992) BUG#12456Heikki Tuuri19 Aug