post merge fixes

BitKeeper/deleted/.del-strict_autoinc_4bdb.test:
  Delete: mysql-test/t/strict_autoinc_4bdb.test
mysql-test/r/strict_autoinc_1myisam.result:
  post merge fixes, error message was changed
mysql-test/r/strict_autoinc_2innodb.result:
  post merge fixes, error message was changed
mysql-test/r/strict_autoinc_3heap.result:
  post merge fixes, error message was changed
mysql-test/r/strict_autoinc_5ndb.result:
  post merge fixes, error message was changed

mysql-test/r/strict_autoinc_1myisam.result

@@ -6,21 +6,21 @@ primary key (`a`)
 ) engine = 'MYISAM'  ;
 set @@sql_mode='strict_all_tables';
 insert into t1 values(1000);
-ERROR 22003: Out of range value adjusted for column 'a' at row 1
+ERROR 22003: Out of range value for column 'a' at row 1
 select count(*) from t1;
 count(*)
 0
 set auto_increment_increment=1000;
 set auto_increment_offset=700;
 insert into t1 values(null);
-ERROR 22003: Out of range value adjusted for column 'a' at row 1
+ERROR 22003: Out of range value for column 'a' at row 1
 select count(*) from t1;
 count(*)
 0
 set @@sql_mode=@org_mode;
 insert into t1 values(null);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 select * from t1;
 a
 127

mysql-test/r/strict_autoinc_2innodb.result

@@ -6,21 +6,21 @@ primary key (`a`)
 ) engine = 'InnoDB'  ;
 set @@sql_mode='strict_all_tables';
 insert into t1 values(1000);
-ERROR 22003: Out of range value adjusted for column 'a' at row 1
+ERROR 22003: Out of range value for column 'a' at row 1
 select count(*) from t1;
 count(*)
 0
 set auto_increment_increment=1000;
 set auto_increment_offset=700;
 insert into t1 values(null);
-ERROR 22003: Out of range value adjusted for column 'a' at row 1
+ERROR 22003: Out of range value for column 'a' at row 1
 select count(*) from t1;
 count(*)
 0
 set @@sql_mode=@org_mode;
 insert into t1 values(null);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 select * from t1;
 a
 127

mysql-test/r/strict_autoinc_3heap.result

@@ -6,21 +6,21 @@ primary key (`a`)
 ) engine = 'MEMORY'  ;
 set @@sql_mode='strict_all_tables';
 insert into t1 values(1000);
-ERROR 22003: Out of range value adjusted for column 'a' at row 1
+ERROR 22003: Out of range value for column 'a' at row 1
 select count(*) from t1;
 count(*)
 0
 set auto_increment_increment=1000;
 set auto_increment_offset=700;
 insert into t1 values(null);
-ERROR 22003: Out of range value adjusted for column 'a' at row 1
+ERROR 22003: Out of range value for column 'a' at row 1
 select count(*) from t1;
 count(*)
 0
 set @@sql_mode=@org_mode;
 insert into t1 values(null);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 select * from t1;
 a
 127

mysql-test/r/strict_autoinc_5ndb.result

@@ -6,21 +6,21 @@ primary key (`a`)
 ) engine = 'NDB'  ;
 set @@sql_mode='strict_all_tables';
 insert into t1 values(1000);
-ERROR 22003: Out of range value adjusted for column 'a' at row 1
+ERROR 22003: Out of range value for column 'a' at row 1
 select count(*) from t1;
 count(*)
 0
 set auto_increment_increment=1000;
 set auto_increment_offset=700;
 insert into t1 values(null);
-ERROR 22003: Out of range value adjusted for column 'a' at row 1
+ERROR 22003: Out of range value for column 'a' at row 1
 select count(*) from t1;
 count(*)
 0
 set @@sql_mode=@org_mode;
 insert into t1 values(null);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 select * from t1;
 a
 127

mysql-test/t/strict_autoinc_4bdb.test

@@ -1,10 +0,0 @@
--- source include/have_bdb.inc
-
-#
-# Bug#20573 Strict mode auto-increment
-#
-
-let $type= 'BDB' ;
---source include/strict_autoinc.inc
-
-# end of test

sql/handler.cc

@@ -1871,10 +1871,10 @@ int handler::update_auto_increment()
                                           variables->auto_increment_increment);
     /* Row-based replication does not need to store intervals in binlog */
     if (!thd->current_stmt_binlog_row_based)
-      result= result ||
         thd->auto_inc_intervals_in_cur_stmt_for_binlog.append(auto_inc_interval_for_cur_row.minimum(),
                                                               auto_inc_interval_for_cur_row.values(),
                                                               variables->auto_increment_increment);
+  }
 
   /*
     Record this autogenerated value. If the caller then
@@ -1890,7 +1890,7 @@ int handler::update_auto_increment()
   */
   set_next_insert_id(compute_next_insert_id(nr, variables));
 
-  DBUG_RETURN(result ? /* some failure occurred */ -1 : 0);
+  DBUG_RETURN(0);
 }