Commit f8c0b06a authored by unknown's avatar unknown
Browse files

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

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


Makefile.am:
  Auto merged
parents 20c63a30 c8c0140e

Makefile.am

+4 −3
Original line number Diff line number Diff line
@@ -102,12 +102,13 @@ tags: 
# Test installation



test:

	cd mysql-test; ./mysql-test-run && ./mysql-test-run --ps-protocol

	cd mysql-test; \

	perl mysql-test-run.pl && perl mysql-test-run.pl --ps-protocol



test-force:

	cd mysql-test; \

	./mysql-test-run --force ;\

	./mysql-test-run --ps-protocol --force

	perl mysql-test-run.pl --force ;\

	perl mysql-test-run.pl --ps-protocol --force



# Don't update the files from bitkeeper

%::SCCS/s.%

sql/share/errmsg.txt

+1 −1
Original line number Diff line number Diff line
@@ -5355,6 +5355,6 @@ ER_BINLOG_CREATE_ROUTINE_NEED_SUPER 
ER_EXEC_STMT_WITH_OPEN_CURSOR

	eng "You can't execute a prepared statement which has an open cursor associated with it. Reset the statement to re-execute it."

ER_STMT_HAS_NO_OPEN_CURSOR

	eng "The statement (%d) has no open cursor."

	eng "The statement (%lu) has no open cursor."

ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG

        eng "Explicit or implicit commit is not allowed in stored function or trigger."

sql/sql_prepare.cc

+1 −1
Original line number Diff line number Diff line
@@ -2209,7 +2209,7 @@ void mysql_stmt_fetch(THD *thd, char *packet, uint packet_length) 


  if (!stmt->cursor || !stmt->cursor->is_open())

  {

    my_error(ER_STMT_HAS_NO_OPEN_CURSOR, MYF(0));

    my_error(ER_STMT_HAS_NO_OPEN_CURSOR, MYF(0), stmt_id);

    DBUG_VOID_RETURN;

  }

tests/mysql_client_test.c

+14 −1
Original line number Diff line number Diff line
@@ -12995,6 +12995,19 @@ static void test_bug9478() 
    rc= mysql_stmt_fetch(stmt);

    DIE_UNLESS(rc == MYSQL_NO_DATA);



    {

      char buff[8];

      /* Fill in the fethc packet */

      int4store(buff, stmt->stmt_id);

      buff[4]= 1;                               /* prefetch rows */

      rc= ((*mysql->methods->advanced_command)(mysql, COM_STMT_FETCH, buff,

                                               sizeof(buff), 0,0,1) ||

           (*mysql->methods->read_query_result)(mysql));

      DIE_UNLESS(rc);

      if (!opt_silent && i == 0)

        printf("Got error (as expected): %s\n", mysql_error(mysql));

    }



    rc= mysql_stmt_execute(stmt);

    check_execute(stmt, rc);
@@ -13039,7 +13052,7 @@ static void test_bug9478() 
      /* Fill in the execute packet */

      int4store(buff, stmt->stmt_id);

      buff[4]= 0;                               /* Flag */

      int4store(buff+5, 1);                     /* Return 1 row */

      int4store(buff+5, 1);                     /* Reserved for array bind */

      rc= ((*mysql->methods->advanced_command)(mysql, COM_STMT_EXECUTE, buff,

                                               sizeof(buff), 0,0,1) ||

           (*mysql->methods->read_query_result)(mysql));