Below is the list of changes that have just been committed into a local
5.1-ndb repository of jonas. When jonas 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/in...urce-tree.html

ChangeSet
1.1759 05/02/25 10:23:14 joreland (AT) mysql (DOT) com +5 -0
Merge mysql.com:/home/jonas/src/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.1-ndb-dd

sql/sql_parse.cc
1.409 05/02/25 10:23:13 joreland (AT) mysql (DOT) com +0 -0
Auto merged

sql/log.cc
1.148 05/02/25 10:23:12 joreland (AT) mysql (DOT) com +0 -0
Auto merged

sql/item.cc
1.119 05/02/25 10:23:12 joreland (AT) mysql (DOT) com +0 -0
Auto merged

BitKeeper/triggers/post-commit
1.36 05/02/25 10:23:12 joreland (AT) mysql (DOT) com +0 -0
Auto merged

BitKeeper/etc/logging_ok
1.282 05/02/25 10:23:00 joreland (AT) mysql (DOT) com +0 -0
auto-union

# 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: joreland
# Host: eel.hemma.oreland.se
# Root: /home/jonas/src/mysql-5.1-ndb-dd/RESYNC

--- 1.408/sql/sql_parse.cc Fri Feb 25 09:24:47 2005
+++ 1.409/sql/sql_parse.cc Fri Feb 25 10:23:13 2005
@@ -1865,11 +1865,7 @@
mysqld_list_fields(thd,&table_list,fields);
thd->lex->unit.cleanup();
thd->cleanup_after_query();
-#ifdef HAVE_INNOBASE_DB
release_local_lock(thd, locked_tables, old_innodb_table_locks);
-#else
- release_local_lock(thd, locked_tables, false);
-#endif
break;
}
#endif
@@ -4605,11 +4601,8 @@
if (thd->lock == thd->locked_tables)
thd->lock= 0;
}
-#ifdef HAVE_INNOBASE_DB
+
release_local_lock(thd, locked_tables, old_innodb_table_locks);
-#else
- release_local_lock(thd, locked_tables, false);
-#endif
DBUG_RETURN(res || thd->net.report_error);
}


--
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe: http://lists.mysql.com/internals?uns...ie.nctu.edu.tw