1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

merge with 3.23.52

BitKeeper/etc/config:
  Auto merged
Docs/manual.texi:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
This commit is contained in:
unknown
2002-08-13 02:33:25 +03:00
6 changed files with 46 additions and 32 deletions

View File

@ -80,5 +80,5 @@ EOF
fi
else
echo "commit failed because '$BK_STATUS', sorry life is hard..."
echo "commit failed because '$BK_STATUS', you may need to re-clone..."
fi