Post-merge fixes.

Multiple result sets from stored procedures now works with the
mysql and mysqltest clients.


client/mysqltest.c:
  Post-merge fixes.
mysql-test/r/index_merge_innodb.result:
  Post-merge fixes.
mysql-test/r/sp-error.result:
  Post-merge fixes.
  Removed now obsolete error test for multiple selects (without "into").
mysql-test/r/sp.result:
  Post-merge fixes.
  Added test for mulple result sets.
mysql-test/r/variables.result:
  Post-merge fixes.
mysql-test/t/index_merge_innodb.test:
  Post-merge fixes.
mysql-test/t/sp-error.test:
  Post-merge fixes.
  Removed now obsolete error test for multiple selects (without "into").
mysql-test/t/sp.test:
  Post-merge fixes.
  Added test for mulple result sets.
sql/lex.h:
  Post-merge fixes.
This commit is contained in:
unknown 2003-12-16 18:09:22 +01:00
commit bc748bef53
9 changed files with 541 additions and 527 deletions

View file

@ -14,7 +14,7 @@ create table t1
INDEX i1(key1),
INDEX i2(key2),
) type=innodb;
) engine=innodb;
--disable_query_log
let $1=200;