bzr push into mysql-trunk-wl6292 branch (gopal.shankar:3927 to 3928)

[Gopal Shankar]

 3928 Gopal Shankar	2012-06-12
      Updating result file for mysqld--help-win.result.

    modified:
      mysql-test/r/mysqld--help-win.result
 3927 Gopal Shankar	2012-06-12
      Updating .result files for main.mysqld--help-notwin 
      and funcs_1.is_columns_myisam_embedded MTR tests.

    modified:
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2012-06-11 02:27:08 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2012-06-12 09:40:14 +0000
@@ -194,12 +194,10 @@ The following options may be given as th
  and at binary log rotation
  --explicit-defaults-for-timestamp 
  This option causes CREATE TABLE to make all TIMESTAMP
- columns to have DEFAULT NULL property, same behavior as
- that of other column types. Old behavior is that the
- TIMESTAMP columns get implicit DEFAULT clauses.
-It is
- recommend to start the server with this option enabled, 
- because old behavior will be deprecated.
+ columns to have DEFAULT NULL property, the same behavior
+ as that of other column types. TIMESTAMP columns get
+ implicit DEFAULT clauses when this options is disabled.
+ The old behavior is deprecated.
  --external-locking  Use system (external) locking (disabled by default). 
  With this option enabled you can run myisamchk to test
  (not repair) tables while the MySQL server is running.

No bundle (reason: useless for push emails).