List:Commits« Previous MessageNext Message »
From:konstantin Date:January 17 2006 6:10pm
Subject:bk commit into 5.0 tree (konstantin:1.2033) BUG#15206
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja 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
  1.2033 06/01/17 21:10:47 konstantin@stripped +7 -0
  Bug#15206: "Misleading message "No data to FETCH":
  reword the misleading message.

  sql/share/errmsg.txt
    1.57 06/01/17 21:10:41 konstantin@stripped +2 -2
    Bug#15206: "Misleading message "No data to FETCH":
    reword the misleading message.

  mysql-test/t/type_decimal.test
    1.30 06/01/17 21:10:41 konstantin@stripped +0 -12
    Remove an unportable (QNX) test case (Bug#7670). The test output
    depends on system-specific sprintf() implementation.
    The original complain was about erroneous conversion to long long,
    which was applied prior to conversion to double: but the expected
    behaviour can't be achieved until we have an own string -> double
    conversion function.

  mysql-test/r/view_grant.result
    1.9 06/01/17 21:10:41 konstantin@stripped +4 -4
    Test results fixed (Bug#15206)

  mysql-test/r/variables.result
    1.77 06/01/17 21:10:41 konstantin@stripped +2 -2
    Test results fixed (Bug#15206)

  mysql-test/r/type_decimal.result
    1.40 06/01/17 21:10:41 konstantin@stripped +0 -13
    Disable an unportable test case (Bug#7670)

  mysql-test/r/sp.result
    1.181 06/01/17 21:10:41 konstantin@stripped +8 -8
    Test results fixed (Bug#15206)

  mysql-test/r/sp-error.result
    1.99 06/01/17 21:10:41 konstantin@stripped +1 -1
    Test results fixed (Bug#15206)

# 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:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-5.0-root

--- 1.56/sql/share/errmsg.txt	2005-12-20 21:42:13 +03:00
+++ 1.57/sql/share/errmsg.txt	2006-01-17 21:10:41 +03:00
@@ -5175,8 +5175,8 @@
 	eng "Incorrect number of FETCH variables"
 	ger "Falsche Anzahl von FETCH-Variablen"
 ER_SP_FETCH_NO_DATA 02000 
-	eng "No data to FETCH"
-	ger "Keine Daten mit FETCH abzuholen"
+	eng "No data - zero rows fetched, selected, or processed"
 ER_SP_DUP_PARAM 42000 
 	eng "Duplicate parameter: %s"
 	ger "Doppelter Parameter: %s"

--- 1.8/mysql-test/r/view_grant.result	2005-11-21 22:10:59 +03:00
+++ 1.9/mysql-test/r/view_grant.result	2006-01-17 21:10:41 +03:00
@@ -348,12 +348,12 @@
 f2()
 NULL
 Warnings:
-Warning	1329	No data to FETCH
+Warning	1329	No data - zero rows fetched, selected, or processed
 select * from v2;
 f2()
 NULL
 Warnings:
-Warning	1329	No data to FETCH
+Warning	1329	No data - zero rows fetched, selected, or processed
 select * from v3;
 ERROR HY000: View 'mysqltest.v3' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 select * from v4;
@@ -394,12 +394,12 @@
 f2()
 NULL
 Warnings:
-Warning	1329	No data to FETCH
+Warning	1329	No data - zero rows fetched, selected, or processed
 select * from v4;
 f2()
 NULL
 Warnings:
-Warning	1329	No data to FETCH
+Warning	1329	No data - zero rows fetched, selected, or processed
 select * from v5;
 ERROR HY000: View 'mysqltest.v5' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 drop view v1, v2, v3, v4, v5;

--- 1.39/mysql-test/r/type_decimal.result	2006-01-16 22:30:59 +03:00
+++ 1.40/mysql-test/r/type_decimal.result	2006-01-17 21:10:41 +03:00
@@ -772,16 +772,3 @@
 003trans	39.98
 004trans	31.18
 drop table t1, t2;
-create table t1 (a double(53,0));
-insert into t1 values (9988317491112007680) ,(99883133042600208184115200);
-select a from t1;
-a
-9988317491112007680
-99883133042600208184115200
-truncate t1;
-insert into t1 values (9988317491112007680.0) ,(99883133042600208184115200.0);
-select a from t1;
-a
-9988317491112007680
-99883133042600208184115200
-drop table t1;

--- 1.76/mysql-test/r/variables.result	2005-11-23 02:11:05 +03:00
+++ 1.77/mysql-test/r/variables.result	2006-01-17 21:10:41 +03:00
@@ -537,10 +537,10 @@
 create table t1 (a int);
 select a into @x from t1;
 Warnings:
-Warning	1329	No data to FETCH
+Warning	1329	No data - zero rows fetched, selected, or processed
 show warnings;
 Level	Code	Message
-Warning	1329	No data to FETCH
+Warning	1329	No data - zero rows fetched, selected, or processed
 drop table t1;
 set @@warning_count=1;
 ERROR HY000: Variable 'warning_count' is a read only variable

--- 1.29/mysql-test/t/type_decimal.test	2006-01-16 22:30:59 +03:00
+++ 1.30/mysql-test/t/type_decimal.test	2006-01-17 21:10:41 +03:00
@@ -377,15 +377,3 @@
 select * from t2; 
 drop table t1, t2;
 
-# 
-# A test case for Bug#7670 "Loss of precision for some integer values stored
-# into DOUBLE column": check that there is no truncation
-# when inserting big integers into double columns.
-#
-create table t1 (a double(53,0));
-insert into t1 values (9988317491112007680) ,(99883133042600208184115200);
-select a from t1;
-truncate t1;
-insert into t1 values (9988317491112007680.0) ,(99883133042600208184115200.0);
-select a from t1;
-drop table t1;

--- 1.98/mysql-test/r/sp-error.result	2005-12-07 16:55:08 +03:00
+++ 1.99/mysql-test/r/sp-error.result	2006-01-17 21:10:41 +03:00
@@ -535,7 +535,7 @@
 end|
 delete from t1|
 call bug7299()|
-ERROR 02000: No data to FETCH
+ERROR 02000: No data - zero rows fetched, selected, or processed
 drop procedure bug7299|
 create procedure bug9073()
 begin

--- 1.180/mysql-test/r/sp.result	2006-01-17 14:44:47 +03:00
+++ 1.181/mysql-test/r/sp.result	2006-01-17 21:10:41 +03:00
@@ -522,7 +522,7 @@
 create table t3 ( s char(16), d int)|
 call into_test4()|
 Warnings:
-Warning	1329	No data to FETCH
+Warning	1329	No data - zero rows fetched, selected, or processed
 select * from t3|
 s	d
 into4	NULL
@@ -1787,10 +1787,10 @@
 call bug1863(10)|
 Warnings:
 Note	1051	Unknown table 'temp_t1'
-Warning	1329	No data to FETCH
+Warning	1329	No data - zero rows fetched, selected, or processed
 call bug1863(10)|
 Warnings:
-Warning	1329	No data to FETCH
+Warning	1329	No data - zero rows fetched, selected, or processed
 select * from t4|
 f1	rc	t3
 2	0	NULL
@@ -2084,10 +2084,10 @@
 call bug4579_1()|
 call bug4579_1()|
 Warnings:
-Warning	1329	No data to FETCH
+Warning	1329	No data - zero rows fetched, selected, or processed
 call bug4579_1()|
 Warnings:
-Warning	1329	No data to FETCH
+Warning	1329	No data - zero rows fetched, selected, or processed
 drop procedure bug4579_1|
 drop procedure bug4579_2|
 drop table t3|
@@ -2566,7 +2566,7 @@
 var
 NULL
 Warnings:
-Warning	1329	No data to FETCH
+Warning	1329	No data - zero rows fetched, selected, or processed
 call bug7743("anotherword")|
 var
 2
@@ -2574,7 +2574,7 @@
 var
 NULL
 Warnings:
-Warning	1329	No data to FETCH
+Warning	1329	No data - zero rows fetched, selected, or processed
 drop procedure bug7743|
 drop table t4|
 delete from t3|
@@ -4496,7 +4496,7 @@
 xid	xdone
 1	0
 Warnings:
-Warning	1329	No data to FETCH
+Warning	1329	No data - zero rows fetched, selected, or processed
 call bug15231_3()|
 Result
 Missed it (correct)
Thread
bk commit into 5.0 tree (konstantin:1.2033) BUG#15206konstantin17 Jan