List:Commits« Previous MessageNext Message »
From:Konstantin Osipov Date:November 18 2008 3:43pm
Subject:bzr push into mysql-6.0-runtime branch (kostja:2745 to 2746) WL#4264
View as plain text  
 2746 Konstantin Osipov	2008-11-18
      WL#4264 "Backup: Stabilize Service Interface": update a falcon
      test to have "more correct" row numbers in warnings.
      Neither old nor new row numbers were meaningful, since the execution
      is performing index retrieval, and we get rows in index order.
modified:
  mysql-test/suite/falcon/r/falcon_bug_28049.result
  mysql-test/suite/falcon/r/falcon_bugs.result

 2745 Konstantin Osipov	2008-11-14
      A pre-requisite patch for WL#4264 "Backup: Stabilize Service Interface"
      Move all warning-related information to Warning_info structure,
      to be able to reset and restore this structure.
modified:
  libmysqld/emb_qcache.cc
  libmysqld/lib_sql.cc
  mysql-test/r/query_cache.result
  sql/backup/kernel.cc
  sql/event_scheduler.cc
  sql/field.cc
  sql/ha_ndbcluster_binlog.cc
  sql/handler.cc
  sql/log.cc
  sql/log_event.cc
  sql/mysqld.cc
  sql/protocol.cc
  sql/set_var.cc
  sql/slave.cc
  sql/sp.cc
  sql/sp_rcontext.cc
  sql/sp_rcontext.h
  sql/sql_acl.cc
  sql/sql_base.cc
  sql/sql_class.cc
  sql/sql_class.h
  sql/sql_error.cc
  sql/sql_error.h
  sql/sql_insert.cc
  sql/sql_load.cc
  sql/sql_parse.cc
  sql/sql_prepare.cc
  sql/sql_select.cc
  sql/sql_show.cc
  sql/sql_table.cc
  sql/sql_update.cc
  sql/time.cc
  sql/unireg.cc

=== modified file 'mysql-test/suite/falcon/r/falcon_bug_28049.result'
--- a/mysql-test/suite/falcon/r/falcon_bug_28049.result	2007-09-20 15:44:25 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_28049.result	2008-11-18 15:42:54 +0000
@@ -2018,69 +2018,69 @@ v
 v
 999
 Warnings:
-Warning	1264	Out of range value for column 's1' at row 3
-Warning	1264	Out of range value for column 's1' at row 3
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 2
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
+Warning	1264	Out of range value for column 's1' at row 4
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 4
+Warning	1264	Out of range value for column 's1' at row 4
 DROP TABLE t1//
 DROP PROCEDURE p//

=== modified file 'mysql-test/suite/falcon/r/falcon_bugs.result'
--- a/mysql-test/suite/falcon/r/falcon_bugs.result	2008-10-02 21:05:39 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bugs.result	2008-11-18 15:42:54 +0000
@@ -3183,70 +3183,70 @@ v
 v
 999
 Warnings:
-Warning	1264	Out of range value for column 's1' at row 3
-Warning	1264	Out of range value for column 's1' at row 3
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 4
-Warning	1264	Out of range value for column 's1' at row 2
-Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 5
+Warning	1264	Out of range value for column 's1' at row 4
+Warning	1264	Out of range value for column 's1' at row 5
 Warning	1264	Out of range value for column 's1' at row 3
+Warning	1264	Out of range value for column 's1' at row 4
+Warning	1264	Out of range value for column 's1' at row 4
 DROP TABLE t1//
 DROP PROCEDURE p//
 *** Bug 216 ***

Thread
bzr push into mysql-6.0-runtime branch (kostja:2745 to 2746) WL#4264Konstantin Osipov18 Nov