A lot of fixes for prepared statements (PS):

New mysqltest that can run mysqltest with PS
Added support for ZEROFILL in PS
Fixed crash when one called mysql_stmt_store_result() without a preceding mysql_stmt_bind_result()
Updated test cases to support --ps-protocol
(Some tests are still run using old protocol)
Fixed crash in PS when using SELECT * FROM t1 NATURAL JOIN t2...
Fixed crash in PS when using sub queries
Create table didn't signal when table was created. This could cause a "DROP TABLE created_table" in another thread to wait "forever"
Fixed wrong permissions check in PS and multi-table updates (one could get permission denied for legal quries)
Fix for PS and SELECT ... PROCEDURE
Reset all warnings when executing a new PS query
group_concat(...ORDER BY) didn't work with PS
Fixed problem with test suite when not using innodb


BitKeeper/deleted/.del-innodb-lock-master.opt~f76a4a1999728f87:
  Delete: mysql-test/t/innodb-lock-master.opt
client/Makefile.am:
  mysqltest now uses regex
client/mysqltest.c:
  Added support for testing of prepared statements (with --ps-protocol)
  Main code was done by Kent, I did mainly some cleanups and minor bug fixes
  New test commands:
  --disable_ps_protocol
  --enable_ps_protocol
  NOTE: new code still has some things that needs to be cleaned up.
  For example run_query_stmt_handle_error() should be made more general so that same code can be used also by 'normal' queries
configure.in:
  mysqltest now uses regex
libmysql/libmysql.c:
  Reset warning_count after prepare (safety). In the future we should also provide warnings on prepare
  integer -> string conversion now handles ZEROFILL
  double -> string conversion is now closer to the one in the server
  Fixed crash when one called mysql_stmt_store_result() without preceding mysql_stmt_bind_result()
libmysqld/examples/Makefile.am:
  mysqltest now uses regex
mysql-test/include/have_query_cache.inc:
  Fixes for --ps-protocol
mysql-test/include/ps_conv.inc:
  Fixes for --ps-protocol
mysql-test/mysql-test-run.sh:
  Added options --ps-protocol
mysql-test/r/ctype_utf8.result:
  Fixed test case
mysql-test/r/fulltext_cache.result:
  Changed output of MATCH to use round() to get same numbers with --ps-protocol
mysql-test/r/fulltext_left_join.result:
  Changed output of MATCH to use round() to get same numbers with --ps-protocol
mysql-test/r/fulltext_multi.result:
  Changed output of MATCH to use round() to get same numbers with --ps-protocol
mysql-test/r/innodb-lock.result:
  Fixed test to work even if Innodb is not compiled in.
mysql-test/t/create.test:
  Fixes for --ps-protocol
mysql-test/t/ctype_utf8.test:
  Remove warnings
mysql-test/t/date_formats.test:
  Fixes for --ps-protocol
mysql-test/t/fulltext_cache.test:
  Changed output of MATCH to use round() to get same numbers with --ps-protocol
mysql-test/t/fulltext_left_join.test:
  Changed output of MATCH to use round() to get same numbers with --ps-protocol
mysql-test/t/fulltext_multi.test:
  Changed output of MATCH to use round() to get same numbers with --ps-protocol
mysql-test/t/func_group.test:
  Fixes for --ps-protocol
mysql-test/t/func_sapdb.test:
  Fixes for --ps-protocol
mysql-test/t/innodb-lock.test:
  Fixed test to work even if Innodb is not compiled in.
mysql-test/t/insert.test:
  Fixes for --ps-protocol
mysql-test/t/insert_select.test:
  Fixes for --ps-protocol
mysql-test/t/insert_update.test:
  Fixes for --ps-protocol
mysql-test/t/metadata.test:
  Fixes for --ps-protocol
mysql-test/t/multi_statement.test:
  Fixes for --ps-protocol
mysql-test/t/ps_1general.test:
  Fixes for --ps-protocol
mysql-test/t/rollback.test:
  Fixes for --ps-protocol
mysql-test/t/rpl_redirect.test:
  Fixes for --ps-protocol
mysql-test/t/rpl_user_variables.test:
  Fixes for --ps-protocol
mysql-test/t/select.test:
  Fixes for --ps-protocol
mysql-test/t/status.test:
  Fixes for --ps-protocol
mysql-test/t/type_blob.test:
  Fixes for --ps-protocol
mysql-test/t/type_float.test:
  Fixes for --ps-protocol
mysql-test/t/union.test:
  Fixes for --ps-protocol
mysql-test/t/warnings.test:
  Fixes for --ps-protocol
mysys/my_alloc.c:
  More debugging information
sql-common/client.c:
  More debugging information
sql-common/my_time.c:
  TIME didn't support full range with PS
sql/field.cc:
  TIME didn't support full range with PS
sql/item_cmpfunc.cc:
  IN(constants,...) didn't work with PS
sql/item_subselect.cc:
  Some subqueries didn't work with PS
sql/item_sum.cc:
  group_concat(...ORDER BY) didn't work with PS
  Removed variable warning_available as 'warning' can be used for this.
sql/item_sum.h:
  Removed not needed variable
sql/protocol.cc:
  TIME didn't support full range with PS
sql/set_var.cc:
  Style fix
sql/sql_base.cc:
  setup_wild() didn't properly restore old arena, which caused core dump in PS when using
  SELECT * FROM t1 NATURAL JOIN t2...
sql/sql_class.cc:
  Style fix
sql/sql_error.cc:
  Style fix
sql/sql_insert.cc:
  Create table didn't signal when table was created. This could cause a "DROP TABLE created_table" in another thread to wait "forever"
sql/sql_lex.h:
  Fix for PS and procedures
sql/sql_parse.cc:
  More debugging information
  Make a copy of 'db' in PS as this may change
  Fixed wrong permissions check in PS and multi-table updates
sql/sql_prepare.cc:
  Fix for PS and SELECT ... PROCEDURE
  Reset all warnings when executing a new query
sql/sql_union.cc:
  Fixes for PS and SELECT ... PROCEDURE
  Reset 'with_wild' as 'wild' is resolved on prepare

5 files changed, 41 insertions, 42 deletions

diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/r/ctype_utf8.result
index e65eb96cb68..482a6502490 100644
--- a/mysql-test/r/ctype_utf8.result
+++ b/mysql-test/r/ctype_utf8.result
@@ -766,9 +766,7 @@ list_id smallint unsigned NOT NULL,
 term text NOT NULL,
 PRIMARY KEY(id),
 INDEX(list_id, term(19))
-) TYPE=MyISAM CHARSET=utf8;
-Warnings:
-Warning	1287	'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
+) ENGINE=MyISAM CHARSET=utf8;
 INSERT INTO t1 set list_id = 1, term = "testétest";
 INSERT INTO t1 set list_id = 1, term = "testetest";
 INSERT INTO t1 set list_id = 1, term = "testètest";
diff --git a/mysql-test/r/fulltext_cache.result b/mysql-test/r/fulltext_cache.result
index c489bdefeb8..6a94189d8b4 100644
--- a/mysql-test/r/fulltext_cache.result
+++ b/mysql-test/r/fulltext_cache.result
@@ -21,17 +21,17 @@ INSERT INTO t2 VALUES (5,2,'um copo de Vodka');
 INSERT INTO t2 VALUES (6,2,'um chocolate Snickers');
 INSERT INTO t2 VALUES (7,1,'Bife');
 INSERT INTO t2 VALUES (8,1,'Pizza de Salmao');
-SELECT t1.q, t2.item, t2.id, MATCH t2.item AGAINST ('sushi')
+SELECT t1.q, t2.item, t2.id, round(MATCH t2.item AGAINST ('sushi'),8)
 as x FROM t1, t2 WHERE (t2.id2 = t1.id) ORDER BY x DESC,t2.id;
 q	item	id	x
-aaaaaaaaa dsaass de	sushi	1	1.92378664016724
-aaaaaaaaa dsaass de	Bolo de Chocolate	2	0
-aaaaaaaaa dsaass de	Feijoada	3	0
-aaaaaaaaa dsaass de	Mousse de Chocolate	4	0
-ssde df s fsda sad er	um copo de Vodka	5	0
-ssde df s fsda sad er	um chocolate Snickers	6	0
-aaaaaaaaa dsaass de	Bife	7	0
-aaaaaaaaa dsaass de	Pizza de Salmao	8	0
+aaaaaaaaa dsaass de	sushi	1	1.92378664
+aaaaaaaaa dsaass de	Bolo de Chocolate	2	0.00000000
+aaaaaaaaa dsaass de	Feijoada	3	0.00000000
+aaaaaaaaa dsaass de	Mousse de Chocolate	4	0.00000000
+ssde df s fsda sad er	um copo de Vodka	5	0.00000000
+ssde df s fsda sad er	um chocolate Snickers	6	0.00000000
+aaaaaaaaa dsaass de	Bife	7	0.00000000
+aaaaaaaaa dsaass de	Pizza de Salmao	8	0.00000000
 SELECT t1.q, t2.item, t2.id, MATCH t2.item AGAINST ('sushi' IN BOOLEAN MODE)
 as x FROM t1, t2 WHERE (t2.id2 = t1.id) ORDER BY x DESC,t2.id;
 q	item	id	x
@@ -43,17 +43,17 @@ ssde df s fsda sad er	um copo de Vodka	5	0
 ssde df s fsda sad er	um chocolate Snickers	6	0
 aaaaaaaaa dsaass de	Bife	7	0
 aaaaaaaaa dsaass de	Pizza de Salmao	8	0
-SELECT t1.q, t2.item, t2.id, MATCH t2.item AGAINST ('sushi')
+SELECT t1.q, t2.item, t2.id, round(MATCH t2.item AGAINST ('sushi'),8)
 as x FROM t2, t1 WHERE (t2.id2 = t1.id) ORDER BY x DESC,t2.id;
 q	item	id	x
-aaaaaaaaa dsaass de	sushi	1	1.92378664016724
-aaaaaaaaa dsaass de	Bolo de Chocolate	2	0
-aaaaaaaaa dsaass de	Feijoada	3	0
-aaaaaaaaa dsaass de	Mousse de Chocolate	4	0
-ssde df s fsda sad er	um copo de Vodka	5	0
-ssde df s fsda sad er	um chocolate Snickers	6	0
-aaaaaaaaa dsaass de	Bife	7	0
-aaaaaaaaa dsaass de	Pizza de Salmao	8	0
+aaaaaaaaa dsaass de	sushi	1	1.92378664
+aaaaaaaaa dsaass de	Bolo de Chocolate	2	0.00000000
+aaaaaaaaa dsaass de	Feijoada	3	0.00000000
+aaaaaaaaa dsaass de	Mousse de Chocolate	4	0.00000000
+ssde df s fsda sad er	um copo de Vodka	5	0.00000000
+ssde df s fsda sad er	um chocolate Snickers	6	0.00000000
+aaaaaaaaa dsaass de	Bife	7	0.00000000
+aaaaaaaaa dsaass de	Pizza de Salmao	8	0.00000000
 SELECT t1.q, t2.item, t2.id, MATCH t2.item AGAINST ('sushi' IN BOOLEAN MODE)
 as x FROM t2, t1 WHERE (t2.id2 = t1.id) ORDER BY x DESC,t2.id;
 q	item	id	x
diff --git a/mysql-test/r/fulltext_left_join.result b/mysql-test/r/fulltext_left_join.result
index bf3fe73690a..f3dad290525 100644
--- a/mysql-test/r/fulltext_left_join.result
+++ b/mysql-test/r/fulltext_left_join.result
@@ -16,13 +16,13 @@ author     VARCHAR(255) NOT NULL
 INSERT INTO t2 VALUES('123', 'moi');
 INSERT INTO t2 VALUES('123', 'lui');
 INSERT INTO t2 VALUES('456', 'lui');
-select match(t1.texte,t1.sujet,t1.motsclefs) against('droit')
+select round(match(t1.texte,t1.sujet,t1.motsclefs) against('droit'),5)
 from t1 left join t2 on t2.id=t1.id;
-match(t1.texte,t1.sujet,t1.motsclefs) against('droit')
-0
-0
-0.67003107070923
-0
+round(match(t1.texte,t1.sujet,t1.motsclefs) against('droit'),5)
+0.00000
+0.00000
+0.67003
+0.00000
 select match(t1.texte,t1.sujet,t1.motsclefs) against('droit' IN BOOLEAN MODE)
 from t1 left join t2 on t2.id=t1.id;
 match(t1.texte,t1.sujet,t1.motsclefs) against('droit' IN BOOLEAN MODE)
diff --git a/mysql-test/r/fulltext_multi.result b/mysql-test/r/fulltext_multi.result
index 968b00020e2..289ee004395 100644
--- a/mysql-test/r/fulltext_multi.result
+++ b/mysql-test/r/fulltext_multi.result
@@ -11,19 +11,19 @@ FULLTEXT KEY a(b,c)
 INSERT INTO t1 VALUES (1,'lala lolo lili','oooo aaaa pppp');
 INSERT INTO t1 VALUES (2,'asdf fdsa','lkjh fghj');
 INSERT INTO t1 VALUES (3,'qpwoei','zmxnvb');
-SELECT a, MATCH  b  AGAINST ('lala lkjh') FROM t1;
-a	MATCH  b  AGAINST ('lala lkjh')
-1	0.67003107070923
-2	0
-3	0
-SELECT a, MATCH  c  AGAINST ('lala lkjh') FROM t1;
-a	MATCH  c  AGAINST ('lala lkjh')
-1	0
-2	0.67756325006485
-3	0
-SELECT a, MATCH b,c AGAINST ('lala lkjh') FROM t1;
-a	MATCH b,c AGAINST ('lala lkjh')
-1	0.64840710163116
-2	0.66266459226608
-3	0
+SELECT a, round(MATCH  b  AGAINST ('lala lkjh'),5) FROM t1;
+a	round(MATCH  b  AGAINST ('lala lkjh'),5)
+1	0.67003
+2	0.00000
+3	0.00000
+SELECT a, round(MATCH  c  AGAINST ('lala lkjh'),5) FROM t1;
+a	round(MATCH  c  AGAINST ('lala lkjh'),5)
+1	0.00000
+2	0.67756
+3	0.00000
+SELECT a, round(MATCH b,c AGAINST ('lala lkjh'),5) FROM t1;
+a	round(MATCH b,c AGAINST ('lala lkjh'),5)
+1	0.64841
+2	0.66266
+3	0.00000
 drop table t1;
diff --git a/mysql-test/r/innodb-lock.result b/mysql-test/r/innodb-lock.result
index 407a85ed038..4ace4065c34 100644
--- a/mysql-test/r/innodb-lock.result
+++ b/mysql-test/r/innodb-lock.result
@@ -1,3 +1,4 @@
+set global innodb_table_locks=1;
 select @@innodb_table_locks;
 @@innodb_table_locks
 1