Commit 5a4e3eaa authored by unknown's avatar unknown Committed by MySQL Build Team

Merge from mysql-5.1.31-release

parents 04fdb65c e3d71709
...@@ -60,13 +60,16 @@ STRIP=1 # Option ignored ...@@ -60,13 +60,16 @@ STRIP=1 # Option ignored
SILENT=0 SILENT=0
PLATFORM="" PLATFORM=""
TMP=/tmp TMP=/tmp
NEW_NAME="" # Final top directory and TAR package name
SUFFIX="" SUFFIX=""
SHORT_PRODUCT_TAG="" # If don't want server suffix in package name
NDBCLUSTER="" # Option ignored NDBCLUSTER="" # Option ignored
for arg do for arg do
case "$arg" in case "$arg" in
--tmp=*) TMP=`echo "$arg" | sed -e "s;--tmp=;;"` ;; --tmp=*) TMP=`echo "$arg" | sed -e "s;--tmp=;;"` ;;
--suffix=*) SUFFIX=`echo "$arg" | sed -e "s;--suffix=;;"` ;; --suffix=*) SUFFIX=`echo "$arg" | sed -e "s;--suffix=;;"` ;;
--short-product-tag=*) SHORT_PRODUCT_TAG=`echo "$arg" | sed -e "s;--short-product-tag=;;"` ;;
--no-strip) STRIP=0 ;; --no-strip) STRIP=0 ;;
--machine=*) machine=`echo "$arg" | sed -e "s;--machine=;;"` ;; --machine=*) machine=`echo "$arg" | sed -e "s;--machine=;;"` ;;
--platform=*) PLATFORM=`echo "$arg" | sed -e "s;--platform=;;"` ;; --platform=*) PLATFORM=`echo "$arg" | sed -e "s;--platform=;;"` ;;
...@@ -113,7 +116,11 @@ case $PLATFORM in ...@@ -113,7 +116,11 @@ case $PLATFORM in
esac esac
# Change the distribution to a long descriptive name # Change the distribution to a long descriptive name
NEW_NAME=mysql@MYSQL_SERVER_SUFFIX@-@VERSION@-$PLATFORM$SUFFIX if [ x"$SHORT_PRODUCT_TAG" != x"" ] ; then
NEW_NAME=mysql-$SHORT_PRODUCT_TAG-@VERSION@-$PLATFORM$SUFFIX
else
NEW_NAME=mysql@MYSQL_SERVER_SUFFIX@-@VERSION@-$PLATFORM$SUFFIX
fi
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Define BASE, and remove the old BASE directory if any # Define BASE, and remove the old BASE directory if any
......
...@@ -6024,11 +6024,13 @@ ha_innobase::info( ...@@ -6024,11 +6024,13 @@ ha_innobase::info(
n_rows++; n_rows++;
} }
/* Fix bug#29507: TRUNCATE shows too many rows affected. /* Fix bug#40386: Not flushing query cache after truncate.
Do not show the estimates for TRUNCATE command. */ n_rows can not be 0 unless the table is empty, set to 1
instead. The original problem of bug#29507 is actually
fixed in the server code. */
if (thd_sql_command(user_thd) == SQLCOM_TRUNCATE) { if (thd_sql_command(user_thd) == SQLCOM_TRUNCATE) {
n_rows = 0; n_rows = 1;
/* We need to reset the prebuilt value too, otherwise /* We need to reset the prebuilt value too, otherwise
checks for values greater than the last value written checks for values greater than the last value written
......
...@@ -342,7 +342,7 @@ row_mysql_store_col_in_innobase_format( ...@@ -342,7 +342,7 @@ row_mysql_store_col_in_innobase_format(
/* In some cases we strip trailing spaces from UTF-8 and other /* In some cases we strip trailing spaces from UTF-8 and other
multibyte charsets, from FIXED-length CHAR columns, to save multibyte charsets, from FIXED-length CHAR columns, to save
space. UTF-8 would otherwise normally use 3 * the string length space. UTF-8 would otherwise normally use 3 * the string length
bytes to store a latin1 string! */ bytes to store an ASCII string! */
/* We assume that this CHAR field is encoded in a /* We assume that this CHAR field is encoded in a
variable-length character set where spaces have variable-length character set where spaces have
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment