Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

10 files changed, 26 insertions, 55 deletions

diff --git a/client/mysqltest.c b/client/mysqltest.c
index 6a2a7b072de..ca28419fa4f 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -2143,19 +2143,8 @@ int connect_n_handle_errors(struct st_query *q, MYSQL* con, const char* host,
     *create_conn= 0;
     goto err;
   }
-  else
-  {
-    handle_no_error(q);
 
-    /*
-      Fail if there was no error but we expected it.
-      We also don't want to have connection in this case.
-    */
-    mysql_close(con);
-    *create_conn= 0;
-    error= 1;
-    goto err;
-  }
+  handle_no_error(q);
 
   /*
    TODO: change this to 0 in future versions, but the 'kill' test relies on
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index 067054510c2..df530eda285 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -362,6 +362,7 @@ OK
 mysqltest: In included file "./var/tmp/con.sql": At line 7: Connection limit exhausted - increase MAX_CONS in mysqltest.c
 mysqltest: In included file "./var/tmp/con.sql": At line 3: connection 'test_con1' not found in connection pool
 mysqltest: In included file "./var/tmp/con.sql": At line 2: Connection test_con1 already exists
+connect(localhost,root,,test,MASTER_PORT,MASTER_SOCKET);
 Output from mysqltest-x.inc
 Output from mysqltest-x.inc
 Output from mysqltest-x.inc
diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result
index d7bed7e88a7..9a148c3516e 100644
--- a/mysql-test/r/sp-error.result
+++ b/mysql-test/r/sp-error.result
@@ -535,7 +535,7 @@ fetch c into v;
 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
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index 4c2f7b7f03b..19f3d033f53 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -522,7 +522,7 @@ delete from t1|
 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 @@ end|
 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 @@ end|
 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 @@ call bug7743("OneWord")|
 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 @@ call bug7743("AnotherWord")|
 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 @@ After NOT FOUND condtition is triggered
 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)
diff --git a/mysql-test/r/type_decimal.result b/mysql-test/r/type_decimal.result
index df5abfe8ae3..d7f5f9fa328 100644
--- a/mysql-test/r/type_decimal.result
+++ b/mysql-test/r/type_decimal.result
@@ -772,16 +772,3 @@ productid	zlevelprice
 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;
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index df180218a09..4f6a6569443 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -537,10 +537,10 @@ select @@query_prealloc_size = @test;
 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
diff --git a/mysql-test/r/view_grant.result b/mysql-test/r/view_grant.result
index e2ee02351d7..ede69343a29 100644
--- a/mysql-test/r/view_grant.result
+++ b/mysql-test/r/view_grant.result
@@ -348,12 +348,12 @@ select * from v1;
 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 @@ select * from v3;
 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;
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index 5cf49185c30..e6dc4d356c2 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -910,7 +910,13 @@ select "a" as col1, "c" as col2;
 --error 1
 --exec echo "source var/tmp/con.sql;" | $MYSQL_TEST 2>&1
 
-
+# connect when "disable_abort_on_error" caused "connection not found"
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+--disable_abort_on_error
+connect (con1,localhost,root,,);
+connection default;
+connection con1;
+--enable_abort_on_error
 
 # ----------------------------------------------------------------------------
 # Test mysqltest arguments
diff --git a/mysql-test/t/type_decimal.test b/mysql-test/t/type_decimal.test
index e06b828f9e6..07347322453 100644
--- a/mysql-test/t/type_decimal.test
+++ b/mysql-test/t/type_decimal.test
@@ -377,15 +377,3 @@ insert INTO t2 SELECT * FROM t1;
 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;
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 185b4326c5c..577173a36a1 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5175,8 +5175,8 @@ ER_SP_WRONG_NO_OF_FETCH_ARGS
 	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"
+	ger "Keine Daten - null Zeilen geholt (fetch), ausgewählt oder verarbeitet"
 ER_SP_DUP_PARAM 42000 
 	eng "Duplicate parameter: %s"
 	ger "Doppelter Parameter: %s"