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

[Gopal Shankar]

 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
 3926 Gopal Shankar	2012-06-11
      WL#6292 - Make TIMESTAMP columns nullable by default.
      
      This additional patch contains,
      
      * Fix comments from Jon Olav.
      * Added test case for CREATE SELECT.

    modified:
      mysql-test/include/mtr_warnings.sql
      mysql-test/r/type_timestamp.result
      mysql-test/t/type_timestamp.test
      sql/mysqld.cc
      sql/sql_class.h
      sql/sys_vars.cc
=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result	2012-06-11 05:25:14 +0000
+++ b/mysql-test/r/mysqld--help-notwin.result	2012-06-12 05:36:08 +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, the behavior as
- that of other column types. TIMESTAMP columns get
- implicit DEFAULT clauses when this options is
- disabled.
-It is recommended to start the server with this
- option enabled, because old behavior is 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.

=== modified file 'mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result	2012-05-24 22:21:16 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result	2012-06-12 05:36:08 +0000
@@ -262,7 +262,7 @@ f217 float(53) unsigned zerofill,
 f218 date,
 f219 time,
 f220 datetime,
-f221 timestamp,
+f221 timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 f222 year,
 f223 year(3),
 f224 year(4),

No bundle (reason: useless for push emails).