Commit f0263ac4 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge 

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


client/mysqltest.c:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/mysql-test-run.pl:
  SCCS merged
sql/sql_yacc.yy:
  Manual merge: resolve the conflict with moved sp_if rule
parents 7088b39d 13f908c2

client/mysqltest.c

+1 −12
Original line number Diff line number Diff line
@@ -2500,19 +2500,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

mysql-test/r/alter_table.result

+4 −0
Original line number Diff line number Diff line
@@ -617,3 +617,7 @@ select * from t1 where i between 2 and 4 and v in ('def','3r4f','lmn'); 
i	v

4	3r4f

drop table t1;

create table t1 (t varchar(255) default null, key t (t(80)))

engine=myisam default charset=latin1;

alter table t1 change t t text;

drop table t1;

mysql-test/r/mysqltest.result

+1 −0
Original line number Diff line number Diff line
@@ -361,6 +361,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

mysql-test/r/sp-code.result

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ Pos Instruction 
9	set err@1 1

10	hreturn 5

11	cfetch c@0 n@4

12	jump_if_not 15 isnull(n@4)

12	jump_if_not 15(17) isnull(n@4)

13	set nulls@2 (nulls@2 + 1)

14	jump 17

15	set count@3 (count@3 + 1)

mysql-test/r/sp-error.result

+1 −1
Original line number Diff line number Diff line
@@ -522,7 +522,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