merge with 5.3

sql/sql_insert.cc:
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
  ******
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
  small cleanup
  ******
  small cleanup

1 files changed, 1 insertions, 18 deletions

diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh
index 5ceaebfbae2..d605f6ef02d 100644
--- a/scripts/mysqlhotcopy.sh
+++ b/scripts/mysqlhotcopy.sh
@@ -1,22 +1,5 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2000, 2008 MySQL AB, 2009 Sun Microsystems, Inc.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; version 2
-# of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
-
 use strict;
 use Getopt::Long;
 use Data::Dumper;
@@ -878,7 +861,7 @@ A sample log-pos table definition:
 
 CREATE TABLE log_pos (
   host            varchar(60) NOT null,
-  time_stamp      timestamp(14) NOT NULL,
+  time_stamp      timestamp NOT NULL,
   log_file        varchar(32) default NULL,
   log_pos         int(11)     default NULL,
   master_host     varchar(60) NULL,