bk commit into 5.1 tree (acurtis:1.2335)

[antony]

Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-18 15:52:16-07:00, acurtis@stripped +6 -0
  post merge fixes

  BitKeeper/deleted/.del-strict_autoinc_4bdb.test@stripped, 2006-09-18 13:34:09-07:00,
acurtis@stripped +0 -0
    Delete: mysql-test/t/strict_autoinc_4bdb.test

  mysql-test/r/strict_autoinc_1myisam.result@stripped, 2006-09-18 15:52:12-07:00,
acurtis@stripped +3 -3
    post merge fixes, error message was changed

  mysql-test/r/strict_autoinc_2innodb.result@stripped, 2006-09-18 15:52:12-07:00,
acurtis@stripped +3 -3
    post merge fixes, error message was changed

  mysql-test/r/strict_autoinc_3heap.result@stripped, 2006-09-18 15:52:12-07:00,
acurtis@stripped +3 -3
    post merge fixes, error message was changed

  mysql-test/r/strict_autoinc_5ndb.result@stripped, 2006-09-18 15:52:12-07:00,
acurtis@stripped +3 -3
    post merge fixes, error message was changed

  sql/handler.cc@stripped, 2006-09-18 15:52:12-07:00, acurtis@stripped +2 -2
    post merge fixes

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	acurtis
# Host:	ltamd64.xiphis.org
# Root:	/home/antony/work2/engines-merge

--- 1.268/sql/handler.cc	2006-09-18 15:52:29 -07:00
+++ 1.269/sql/handler.cc	2006-09-18 15:52:29 -07:00
@@ -1871,10 +1871,10 @@
                                           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 @@
   */
   set_next_insert_id(compute_next_insert_id(nr, variables));
 
-  DBUG_RETURN(result ? /* some failure occurred */ -1 : 0);
+  DBUG_RETURN(0);
 }
 
 

--- 1.1/mysql-test/r/strict_autoinc_1myisam.result	2006-09-18 15:52:29 -07:00
+++ 1.2/mysql-test/r/strict_autoinc_1myisam.result	2006-09-18 15:52:29 -07:00
@@ -6,21 +6,21 @@
 ) 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

--- 1.1/mysql-test/r/strict_autoinc_2innodb.result	2006-09-18 15:52:29 -07:00
+++ 1.2/mysql-test/r/strict_autoinc_2innodb.result	2006-09-18 15:52:29 -07:00
@@ -6,21 +6,21 @@
 ) 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

--- 1.1/mysql-test/r/strict_autoinc_3heap.result	2006-09-18 15:52:29 -07:00
+++ 1.2/mysql-test/r/strict_autoinc_3heap.result	2006-09-18 15:52:29 -07:00
@@ -6,21 +6,21 @@
 ) 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

--- 1.1/mysql-test/r/strict_autoinc_5ndb.result	2006-09-18 15:52:29 -07:00
+++ 1.2/mysql-test/r/strict_autoinc_5ndb.result	2006-09-18 15:52:29 -07:00
@@ -6,21 +6,21 @@
 ) 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