merge with 3.23

BitKeeper/deleted/.del-rpl_empty_master_crash.result:
  Delete: mysql-test/r/rpl_empty_master_crash.result
BitKeeper/deleted/.del-rpl_empty_master_crash.test:
  Delete: mysql-test/t/rpl_empty_master_crash.test
configure.in:
  Auto merged
include/my_net.h:
  Auto merged
include/my_pthread.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/t/func_math.test:
  Auto merged
mysys/my_gethostbyname.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_func.cc:
  Auto merged

1 files changed, 16 insertions, 0 deletions

diff --git a/Docs/manual.texi b/Docs/manual.texi
index 305ed69fce0..4362aaa3569 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -31379,6 +31379,17 @@ mysql> SELECT 'David!' LIKE 'David_';
         -> 1
 mysql> SELECT 'David!' LIKE '%D%v%';
         -> 1
+mysql> select TRUNCATE(-1,999,1);
+        -> -1.9
+@end example
+
+Starting from MySQL 3.23.51 all numbers are rounded towards zero.
+
+If @code{D} is negative, then the whole part of the number is zeroed out:
+
+@example
+mysql> select truncate(122,-2);
+       -> 100
 @end example
 
 To test for literal instances of a wildcard character, precede the character
@@ -47075,6 +47086,11 @@ the following things:
 
 @itemize @bullet
 @item
+Cleaned up @code{NULL} handling for default values in @code{DESCRIBE
+table_name}.
+@item
+Fixed @code{truncate()} to round up negative values to the nearest integer.
+@item
 Take down the @code{mysqld} daemon with @code{mysqladmin shutdown}, run
 @code{myisamchk --silent --force */*.MYI} on all tables, and restart the
 @code{mysqld} daemon.  This will ensure that you are running from a clean