Merge trift2.:/MySQL/M41/mysql-4.1

into  trift2.:/MySQL/M41/push-4.1

BitKeeper/triggers/post-commit

@@ -26,6 +26,13 @@ then
   exit
 fi
 
+IS_MERGE=`bk changes -r+ -k -m`
+if [ "$IS_MERGE" = "" ]
+then
+  echo Merge changeset, not sending mails
+  exit
+fi
+
 CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet`
 CSETKEY=`bk -R prs -r+ -h -d':KEY:' ChangeSet`
 #
@@ -41,42 +48,51 @@ WL=`bk -R prs -r+ -h -d':C:' ChangeSet | \
               s/.*\(WL#[0-9][0-9]*\)/ \1/p'`
 if [ "$BUG" = "" ]
 then
-  TO=dev-public@mysql.com
+#  TO=dev-public@mysql.com
   BS=""
   BH=""
 else
-  TO=dev-bugs@mysql.com
+#  TO=dev-bugs@mysql.com
   BS=" BUG#$BUG"
 # need newline here
   BH="X-Bug: $BUG
 "
 fi
-#++
-# dev-public@ / dev-bugs@
-#--
- echo "Commit successful, notifying developers at $TO"
- (
-   cat <<EOF
-List-ID: <bk.mysql-$VERSION>
-From: $FROM
-To: $TO
-Subject: bk commit - $VERSION tree ($CHANGESET)${BS}${WL}
-X-CSetKey: <$CSETKEY>
-$BH
-EOF
-  bk changes -v -r+
-  bk cset -r+ -d
- ) | head -n $LIMIT | /usr/sbin/sendmail -t
+##++
+## dev-public@ / dev-bugs@
+##--
+# echo "Commit successful, notifying developers at $TO"
+# (
+#   cat <<EOF
+#List-ID: <bk.mysql-$VERSION>
+#From: $FROM
+#To: $TO
+#Subject: bk commit - $VERSION tree ($CHANGESET)${BS}${WL}
+#X-CSetKey: <$CSETKEY>
+#$BH
+#EOF
+#  bk changes -v -r+
+#  bk cset -r+ -d
+# ) | head -n $LIMIT | /usr/sbin/sendmail -t
 
 #++
-# commits@ mail
+# commits@ or dev-private@ mail
 #--
- echo "Notifying commits list at $COMMITS"
+
+LIST="commits"
+TO="commits@lists.mysql.com"
+if [ -f .tree-is-private ]
+then
+  LIST="dev-private"
+  TO="dev-private@mysql.com"
+fi
+
+ echo "Notifying $LIST list at $TO"
  (
    cat <<EOF
 List-ID: <bk.mysql-$VERSION>
 From: $FROM
-To: $COMMITS
+To: $TO
 Subject: bk commit into $VERSION tree ($CHANGESET)$BS
 X-CSetKey: <$CSETKEY>
 $BH

libmysqld/lib_sql.cc

@@ -540,7 +540,7 @@ void *create_embedded_thd(int client_flag)
   thd->set_time();
   thd->init_for_queries();
   thd->client_capabilities= client_flag;
-  thd->real_id= (pthread_t) thd;
+  thd->real_id= (pthread_t)thd->thread_id;
 
   thd->db= NULL;
   thd->db_length= 0;

sql/item_func.cc

@@ -2243,7 +2243,7 @@ longlong Item_func_release_lock::val_int()
   else
   {
 #ifdef EMBEDDED_LIBRARY
-    if (ull->locked && pthread_equal(current_thd->real_id,ull->thread))
+    if (ull->locked && (current_thd->real_id == ull->thread))
 #else
     if (ull->locked && pthread_equal(pthread_self(),ull->thread))
 #endif