From: Alexander Nozdrin Date: November 13 2010 3:03pm Subject: bzr commit into mysql-5.5-bugteam branch (alexander.nozdrin:3122) Bug#56934 List-Archive: http://lists.mysql.com/commits/123784 X-Bug: 56934 Message-Id: <201011131503.oADF3XpB017246@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6094041595106308091==" --===============6094041595106308091== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/alik/MySQL/bzr/00/bug56934/mysql-5.5-bugteam-bug56934/ based on revid:joerg@stripped 3122 Alexander Nozdrin 2010-11-13 Fix for Bug#56934 (mysql_stmt_fetch() incorrectly fills MYSQL_TIME structure buffer). This is a follow-up for WL#4435. The bug actually existed not only MYSQL_TYPE_DATETIME type. The problem was that Item_param::set_value() was written in an assumption that it's working with expressions, i.e. with basic data types. There are two different quick fixes here: a) Change Item_param::make_field() -- remove setting of Send_field::length, Send_field::charsetnr, Send_field::flags and Send_field::type. That would lead to marshalling all data using basic types to the client (MYSQL_TYPE_LONGLONG, MYSQL_TYPE_DOUBLE, MYSQL_TYPE_STRING and MYSQL_TYPE_NEWDECIMAL). In particular, that means, DATETIME would be sent as MYSQL_TYPE_STRING, TINYINT -- as MYSQL_TYPE_LONGLONG, etc. That could be Ok for the client, because the client library does reverse conversion automatically (the client program would see DATETIME as MYSQL_TIME object). However, there is a problem with metadata -- the metadata would be wrong (misleading): it would say that DATETIME is marshaled as MYSQL_TYPE_DATETIME, not as MYSQL_TYPE_STRING. b) Set Item_param::param_type properly to actual underlying field type. That would lead to double conversion inside the server: for example, MYSQL_TIME-object would be converted into STRING-object (in Item_param::set_value()), and then converted back to MYSQL_TIME-object (in Item_param::send()). The data however would be marshalled more properly, and also metadata would be correct. This patch implements b). There is also a possibility to avoid double conversion either by clonning the data field, or by storing a reference to it and using it on Item::send() time. That requires more work and might be done later. modified: mysql-test/r/ps.result mysql-test/t/ps.test sql/item.cc sql/sp_rcontext.h sql/sql_prepare.cc tests/mysql_client_test.c === modified file 'mysql-test/r/ps.result' --- a/mysql-test/r/ps.result 2010-10-06 10:02:11 +0000 +++ b/mysql-test/r/ps.result 2010-11-13 15:03:33 +0000 @@ -3202,6 +3202,510 @@ test1 DROP PROCEDURE p1; DROP PROCEDURE p2; +TINYINT + +CREATE PROCEDURE p1(OUT v TINYINT) +SET v = 127; +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` bigint(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = 127; +@a @a = 127 +127 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +SMALLINT + +CREATE PROCEDURE p1(OUT v SMALLINT) +SET v = 32767; +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` bigint(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = 32767; +@a @a = 32767 +32767 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +MEDIUMINT + +CREATE PROCEDURE p1(OUT v MEDIUMINT) +SET v = 8388607; +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` bigint(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = 8388607; +@a @a = 8388607 +8388607 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +INT + +CREATE PROCEDURE p1(OUT v INT) +SET v = 2147483647; +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` bigint(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = 2147483647; +@a @a = 2147483647 +2147483647 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +BIGINT + +CREATE PROCEDURE p1(OUT v BIGINT) +SET v = 9223372036854775807; +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` bigint(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = 9223372036854775807; +@a @a = 9223372036854775807 +9223372036854775807 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +BIT(11) + +CREATE PROCEDURE p1(OUT v BIT(11)) +SET v = b'10100100101'; +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` bigint(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = b'10100100101'; +@a @a = b'10100100101' +1317 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +TIMESTAMP + +CREATE PROCEDURE p1(OUT v TIMESTAMP) +SET v = '2007-11-18 15:01:02'; +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` longblob +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = '2007-11-18 15:01:02'; +@a @a = '2007-11-18 15:01:02' +2007-11-18 15:01:02 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +DATETIME + +CREATE PROCEDURE p1(OUT v DATETIME) +SET v = '1234-11-12 12:34:59'; +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` longblob +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = '1234-11-12 12:34:59'; +@a @a = '1234-11-12 12:34:59' +1234-11-12 12:34:59 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +TIME + +CREATE PROCEDURE p1(OUT v TIME) +SET v = '123:45:01'; +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` longblob +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = '123:45:01'; +@a @a = '123:45:01' +123:45:01 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +DATE + +CREATE PROCEDURE p1(OUT v DATE) +SET v = '1234-11-12'; +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` longblob +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = '1234-11-12'; +@a @a = '1234-11-12' +1234-11-12 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +YEAR + +CREATE PROCEDURE p1(OUT v YEAR) +SET v = 2010; +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` bigint(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = 2010; +@a @a = 2010 +2010 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +FLOAT(7, 4) + +CREATE PROCEDURE p1(OUT v FLOAT(7, 4)) +SET v = 123.4567; +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` double DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a - 123.4567 < 0.00001; +@a @a - 123.4567 < 0.00001 +123.45670318603516 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +DOUBLE(8, 5) + +CREATE PROCEDURE p1(OUT v DOUBLE(8, 5)) +SET v = 123.45678; +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` double DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a - 123.45678 < 0.000001; +@a @a - 123.45678 < 0.000001 +123.45678 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +DECIMAL(9, 6) + +CREATE PROCEDURE p1(OUT v DECIMAL(9, 6)) +SET v = 123.456789; +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` decimal(65,30) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = 123.456789; +@a @a = 123.456789 +123.456789 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +CHAR(32) + +CREATE PROCEDURE p1(OUT v CHAR(32)) +SET v = REPEAT('a', 16); +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` longblob +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = REPEAT('a', 16); +@a @a = REPEAT('a', 16) +aaaaaaaaaaaaaaaa 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +VARCHAR(32) + +CREATE PROCEDURE p1(OUT v VARCHAR(32)) +SET v = REPEAT('b', 16); +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` longblob +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = REPEAT('b', 16); +@a @a = REPEAT('b', 16) +bbbbbbbbbbbbbbbb 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +TINYTEXT + +CREATE PROCEDURE p1(OUT v TINYTEXT) +SET v = REPEAT('c', 16); +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` longblob +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = REPEAT('c', 16); +@a @a = REPEAT('c', 16) +cccccccccccccccc 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +TEXT + +CREATE PROCEDURE p1(OUT v TEXT) +SET v = REPEAT('d', 16); +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` longblob +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = REPEAT('d', 16); +@a @a = REPEAT('d', 16) +dddddddddddddddd 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +MEDIUMTEXT + +CREATE PROCEDURE p1(OUT v MEDIUMTEXT) +SET v = REPEAT('e', 16); +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` longblob +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = REPEAT('e', 16); +@a @a = REPEAT('e', 16) +eeeeeeeeeeeeeeee 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +LONGTEXT + +CREATE PROCEDURE p1(OUT v LONGTEXT) +SET v = REPEAT('f', 16); +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` longblob +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = REPEAT('f', 16); +@a @a = REPEAT('f', 16) +ffffffffffffffff 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +BINARY(32) + +CREATE PROCEDURE p1(OUT v BINARY(32)) +SET v = REPEAT('g', 32); +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` longblob +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = REPEAT('g', 32); +@a @a = REPEAT('g', 32) +gggggggggggggggggggggggggggggggg 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +VARBINARY(32) + +CREATE PROCEDURE p1(OUT v VARBINARY(32)) +SET v = REPEAT('h', 16); +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` longblob +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = REPEAT('h', 16); +@a @a = REPEAT('h', 16) +hhhhhhhhhhhhhhhh 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +TINYBLOB + +CREATE PROCEDURE p1(OUT v TINYBLOB) +SET v = REPEAT('i', 16); +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` longblob +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = REPEAT('i', 16); +@a @a = REPEAT('i', 16) +iiiiiiiiiiiiiiii 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +BLOB + +CREATE PROCEDURE p1(OUT v BLOB) +SET v = REPEAT('j', 16); +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` longblob +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = REPEAT('j', 16); +@a @a = REPEAT('j', 16) +jjjjjjjjjjjjjjjj 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +MEDIUMBLOB + +CREATE PROCEDURE p1(OUT v MEDIUMBLOB) +SET v = REPEAT('k', 16); +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` longblob +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = REPEAT('k', 16); +@a @a = REPEAT('k', 16) +kkkkkkkkkkkkkkkk 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +LONGBLOB + +CREATE PROCEDURE p1(OUT v LONGBLOB) +SET v = REPEAT('l', 16); +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` longblob +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = REPEAT('l', 16); +@a @a = REPEAT('l', 16) +llllllllllllllll 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +SET('aaa', 'bbb') + +CREATE PROCEDURE p1(OUT v SET('aaa', 'bbb')) +SET v = 'aaa'; +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` longblob +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = 'aaa'; +@a @a = 'aaa' +aaa 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + +ENUM('aaa', 'bbb') + +CREATE PROCEDURE p1(OUT v ENUM('aaa', 'bbb')) +SET v = 'aaa'; +PREPARE stmt1 FROM 'CALL p1(?)'; +EXECUTE stmt1 USING @a; +CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1; +SHOW CREATE TABLE tmp1; +Table Create Table +tmp1 CREATE TEMPORARY TABLE `tmp1` ( + `c1` longblob +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a, @a = 'aaa'; +@a @a = 'aaa' +aaa 1 +DROP TEMPORARY TABLE tmp1; +DROP PROCEDURE p1; + # End of WL#4435. # # WL#4284: Transactional DDL locking === modified file 'mysql-test/t/ps.test' --- a/mysql-test/t/ps.test 2010-10-06 10:02:11 +0000 +++ b/mysql-test/t/ps.test 2010-11-13 15:03:33 +0000 @@ -3296,6 +3296,12 @@ SELECT @a; DROP PROCEDURE p1; DROP PROCEDURE p2; +########################################################################### + +--source t/wl4435_generated.inc + +########################################################################### + --echo --echo # End of WL#4435. === modified file 'sql/item.cc' --- a/sql/item.cc 2010-11-04 08:36:04 +0000 +++ b/sql/item.cc 2010-11-13 15:03:33 +0000 @@ -226,8 +226,6 @@ bool Item::val_bool() */ String *Item::val_str_ascii(String *str) { - DBUG_ASSERT(fixed == 1); - if (!(collation.collation->state & MY_CS_NONASCII)) return val_str(str); @@ -3459,19 +3457,16 @@ Item_param::set_value(THD *thd, sp_rcont str_value.charset()); collation.set(str_value.charset(), DERIVATION_COERCIBLE); decimals= 0; - param_type= MYSQL_TYPE_STRING; break; } case REAL_RESULT: set_double(arg->val_real()); - param_type= MYSQL_TYPE_DOUBLE; break; case INT_RESULT: set_int(arg->val_int(), arg->max_length); - param_type= MYSQL_TYPE_LONG; break; case DECIMAL_RESULT: @@ -3483,8 +3478,6 @@ Item_param::set_value(THD *thd, sp_rcont return TRUE; set_decimal(dv); - param_type= MYSQL_TYPE_NEWDECIMAL; - break; } @@ -3516,6 +3509,7 @@ void Item_param::set_out_param_info(Send_field *info) { m_out_param_info= info; + param_type= m_out_param_info->type; } @@ -3561,6 +3555,7 @@ void Item_param::make_field(Send_field * field->org_table_name= m_out_param_info->org_table_name; field->col_name= m_out_param_info->col_name; field->org_col_name= m_out_param_info->org_col_name; + field->length= m_out_param_info->length; field->charsetnr= m_out_param_info->charsetnr; field->flags= m_out_param_info->flags; === modified file 'sql/sp_rcontext.h' --- a/sql/sp_rcontext.h 2010-07-30 15:28:36 +0000 +++ b/sql/sp_rcontext.h 2010-11-13 15:03:33 +0000 @@ -220,6 +220,7 @@ private: during execution. */ bool m_return_value_set; + /** TRUE if the context is created for a sub-statement. */ === modified file 'sql/sql_prepare.cc' --- a/sql/sql_prepare.cc 2010-11-03 14:15:18 +0000 +++ b/sql/sql_prepare.cc 2010-11-13 15:03:33 +0000 @@ -1185,7 +1185,7 @@ static bool insert_params_from_vars_with uint32 length= 0; THD *thd= stmt->thd; - DBUG_ENTER("insert_params_from_vars"); + DBUG_ENTER("insert_params_from_vars_with_log"); if (query->copy(stmt->query(), stmt->query_length(), default_charset_info)) DBUG_RETURN(1); === modified file 'tests/mysql_client_test.c' --- a/tests/mysql_client_test.c 2010-11-03 14:15:18 +0000 +++ b/tests/mysql_client_test.c 2010-11-13 15:03:33 +0000 @@ -2103,6 +2103,255 @@ static void test_wl4435_2() } +#define WL4435_TEST(sql_type, sql_value, \ + c_api_in_type, c_api_out_type, \ + c_type, c_type_ext, \ + printf_args, assert_condition) \ +\ + do { \ + int rc; \ + MYSQL_STMT *ps; \ + MYSQL_BIND psp; \ + MYSQL_RES *rs_metadata; \ + MYSQL_FIELD *fields; \ + c_type pspv c_type_ext; \ + my_bool psp_null; \ + \ + bzero(&pspv, sizeof (pspv)); \ + \ + rc= mysql_query(mysql, "DROP PROCEDURE IF EXISTS p1"); \ + myquery(rc); \ + \ + rc= mysql_query(mysql, \ + "CREATE PROCEDURE p1(OUT v " sql_type ") SET v = " sql_value ";"); \ + myquery(rc); \ + \ + ps = mysql_simple_prepare(mysql, "CALL p1(?)"); \ + check_stmt(ps); \ + \ + bzero(&psp, sizeof (psp)); \ + psp.buffer_type= c_api_in_type; \ + psp.is_null= &psp_null; \ + psp.buffer= (char *) &pspv; \ + psp.buffer_length= sizeof (psp); \ + \ + rc= mysql_stmt_bind_param(ps, &psp); \ + check_execute(ps, rc); \ + \ + rc= mysql_stmt_execute(ps); \ + check_execute(ps, rc); \ + \ + DIE_UNLESS(mysql->server_status & SERVER_PS_OUT_PARAMS); \ + DIE_UNLESS(mysql_stmt_field_count(ps) == 1); \ + \ + rs_metadata= mysql_stmt_result_metadata(ps); \ + fields= mysql_fetch_fields(rs_metadata); \ + \ + rc= mysql_stmt_bind_result(ps, &psp); \ + check_execute(ps, rc); \ + \ + rc= mysql_stmt_fetch(ps); \ + DIE_UNLESS(rc == 0); \ + \ + DIE_UNLESS(fields[0].type == c_api_out_type); \ + printf printf_args; \ + printf("; in type: %d; out type: %d\n", \ + (int) c_api_in_type, (int) c_api_out_type); \ + \ + rc= mysql_stmt_fetch(ps); \ + DIE_UNLESS(rc == MYSQL_NO_DATA); \ + \ + rc= mysql_stmt_next_result(ps); \ + DIE_UNLESS(rc == 0); \ + \ + mysql_stmt_free_result(ps); \ + mysql_stmt_close(ps); \ + \ + DIE_UNLESS(assert_condition); \ + \ + } while (0) + +static void test_wl4435_3() +{ + char tmp[255]; + + puts(""); + + // The following types are not supported: + // - ENUM + // - SET + // + // The following types are supported but can not be used for + // OUT-parameters: + // - MEDIUMINT; + // - BIT(..); + // + // The problem is that those types are not supported for IN-parameters, + // and OUT-parameters should be bound as IN-parameters before execution. + // + // The following types should not be used: + // - MYSQL_TYPE_YEAR (use MYSQL_TYPE_SHORT instead); + // - MYSQL_TYPE_TINY_BLOB, MYSQL_TYPE_MEDIUM_BLOB, MYSQL_TYPE_LONG_BLOB + // (use MYSQL_TYPE_BLOB instead); + + WL4435_TEST("TINYINT", "127", + MYSQL_TYPE_TINY, MYSQL_TYPE_TINY, + char, , + (" - TINYINT / char / MYSQL_TYPE_TINY:\t\t\t %d", (int) pspv), + pspv == 127); + + WL4435_TEST("SMALLINT", "32767", + MYSQL_TYPE_SHORT, MYSQL_TYPE_SHORT, + short, , + (" - SMALLINT / short / MYSQL_TYPE_SHORT:\t\t %d", (int) pspv), + pspv == 32767); + + WL4435_TEST("INT", "2147483647", + MYSQL_TYPE_LONG, MYSQL_TYPE_LONG, + int, , + (" - INT / int / MYSQL_TYPE_LONG:\t\t\t %d", pspv), + pspv == 2147483647l); + + WL4435_TEST("BIGINT", "9223372036854775807", + MYSQL_TYPE_LONGLONG, MYSQL_TYPE_LONGLONG, + long long, , + (" - BIGINT / long long / MYSQL_TYPE_LONGLONG:\t\t %lld", pspv), + pspv == 9223372036854775807ll); + + WL4435_TEST("TIMESTAMP", "'2007-11-18 15:01:02'", + MYSQL_TYPE_TIMESTAMP, MYSQL_TYPE_TIMESTAMP, + MYSQL_TIME, , + (" - TIMESTAMP / MYSQL_TIME / MYSQL_TYPE_TIMESTAMP:\t " + "%.4d-%.2d-%.2d %.2d:%.2d:%.2d", + (int) pspv.year, (int) pspv.month, (int) pspv.day, + (int) pspv.hour, (int) pspv.minute, (int) pspv.second), + pspv.year == 2007 && pspv.month == 11 && pspv.day == 18 && + pspv.hour == 15 && pspv.minute == 1 && pspv.second == 2); + + WL4435_TEST("DATETIME", "'1234-11-12 12:34:59'", + MYSQL_TYPE_DATETIME, MYSQL_TYPE_DATETIME, + MYSQL_TIME, , + (" - DATETIME / MYSQL_TIME / MYSQL_TYPE_DATETIME:\t " + "%.4d-%.2d-%.2d %.2d:%.2d:%.2d", + (int) pspv.year, (int) pspv.month, (int) pspv.day, + (int) pspv.hour, (int) pspv.minute, (int) pspv.second), + pspv.year == 1234 && pspv.month == 11 && pspv.day == 12 && + pspv.hour == 12 && pspv.minute == 34 && pspv.second == 59); + + WL4435_TEST("TIME", "'123:45:01'", + MYSQL_TYPE_TIME, MYSQL_TYPE_TIME, + MYSQL_TIME, , + (" - TIME / MYSQL_TIME / MYSQL_TYPE_TIME:\t\t " + "%.3d:%.2d:%.2d", + (int) pspv.hour, (int) pspv.minute, (int) pspv.second), + pspv.hour == 123 && pspv.minute == 45 && pspv.second == 1); + + WL4435_TEST("DATE", "'1234-11-12'", + MYSQL_TYPE_DATE, MYSQL_TYPE_DATE, + MYSQL_TIME, , + (" - DATE / MYSQL_TIME / MYSQL_TYPE_DATE:\t\t " + "%.4d-%.2d-%.2d", + (int) pspv.year, (int) pspv.month, (int) pspv.day), + pspv.year == 1234 && pspv.month == 11 && pspv.day == 12); + + WL4435_TEST("YEAR", "'2010'", + MYSQL_TYPE_SHORT, MYSQL_TYPE_YEAR, + short, , + (" - YEAR / short / MYSQL_TYPE_SHORT:\t\t\t %.4d", (int) pspv), + pspv == 2010); + + WL4435_TEST("FLOAT(7, 4)", "123.4567", + MYSQL_TYPE_FLOAT, MYSQL_TYPE_FLOAT, + float, , + (" - FLOAT / float / MYSQL_TYPE_FLOAT:\t\t\t %g", (double) pspv), + pspv - 123.4567 < 0.0001); + + WL4435_TEST("DOUBLE(8, 5)", "123.45678", + MYSQL_TYPE_DOUBLE, MYSQL_TYPE_DOUBLE, + double, , + (" - DOUBLE / double / MYSQL_TYPE_DOUBLE:\t\t %g", (double) pspv), + pspv - 123.45678 < 0.00001); + + WL4435_TEST("DECIMAL(9, 6)", "123.456789", + MYSQL_TYPE_NEWDECIMAL, MYSQL_TYPE_NEWDECIMAL, + char, [255], + (" - DECIMAL / char[] / MYSQL_TYPE_NEWDECIMAL:\t\t '%s'", (char *) pspv), + !strcmp(pspv, "123.456789")); + + WL4435_TEST("CHAR(32)", "REPEAT('C', 16)", + MYSQL_TYPE_STRING, MYSQL_TYPE_STRING, + char, [255], + (" - CHAR(32) / char[] / MYSQL_TYPE_STRING:\t\t '%s'", (char *) pspv), + !strcmp(pspv, "CCCCCCCCCCCCCCCC")); + + WL4435_TEST("VARCHAR(32)", "REPEAT('V', 16)", + MYSQL_TYPE_VAR_STRING, MYSQL_TYPE_VAR_STRING, + char, [255], + (" - VARCHAR(32) / char[] / MYSQL_TYPE_VAR_STRING:\t '%s'", (char *) pspv), + !strcmp(pspv, "VVVVVVVVVVVVVVVV")); + + WL4435_TEST("TINYTEXT", "REPEAT('t', 16)", + MYSQL_TYPE_TINY_BLOB, MYSQL_TYPE_BLOB, + char, [255], + (" - TINYTEXT / char[] / MYSQL_TYPE_TINY_BLOB:\t\t '%s'", (char *) pspv), + !strcmp(pspv, "tttttttttttttttt")); + + WL4435_TEST("TEXT", "REPEAT('t', 16)", + MYSQL_TYPE_BLOB, MYSQL_TYPE_BLOB, + char, [255], + (" - TEXT / char[] / MYSQL_TYPE_BLOB:\t\t\t '%s'", (char *) pspv), + !strcmp(pspv, "tttttttttttttttt")); + + WL4435_TEST("MEDIUMTEXT", "REPEAT('t', 16)", + MYSQL_TYPE_MEDIUM_BLOB, MYSQL_TYPE_BLOB, + char, [255], + (" - MEDIUMTEXT / char[] / MYSQL_TYPE_MEDIUM_BLOB:\t '%s'", (char *) pspv), + !strcmp(pspv, "tttttttttttttttt")); + + WL4435_TEST("LONGTEXT", "REPEAT('t', 16)", + MYSQL_TYPE_LONG_BLOB, MYSQL_TYPE_BLOB, + char, [255], + (" - LONGTEXT / char[] / MYSQL_TYPE_LONG_BLOB:\t\t '%s'", (char *) pspv), + !strcmp(pspv, "tttttttttttttttt")); + + WL4435_TEST("BINARY(32)", "REPEAT('\1', 16)", + MYSQL_TYPE_STRING, MYSQL_TYPE_STRING, + char, [255], + (" - BINARY(32) / char[] / MYSQL_TYPE_STRING:\t\t '%s'", (char *) pspv), + memset(tmp, 1, 16) && !memcmp(tmp, pspv, 16)); + + WL4435_TEST("VARBINARY(32)", "REPEAT('\1', 16)", + MYSQL_TYPE_VAR_STRING, MYSQL_TYPE_VAR_STRING, + char, [255], + (" - VARBINARY(32) / char[] / MYSQL_TYPE_VAR_STRING:\t '%s'", (char *) pspv), + memset(tmp, 1, 16) && !memcmp(tmp, pspv, 16)); + + WL4435_TEST("TINYBLOB", "REPEAT('\2', 16)", + MYSQL_TYPE_TINY_BLOB, MYSQL_TYPE_BLOB, + char, [255], + (" - TINYBLOB / char[] / MYSQL_TYPE_TINY_BLOB:\t\t '%s'", (char *) pspv), + memset(tmp, 2, 16) && !memcmp(tmp, pspv, 16)); + + WL4435_TEST("BLOB", "REPEAT('\2', 16)", + MYSQL_TYPE_BLOB, MYSQL_TYPE_BLOB, + char, [255], + (" - BLOB / char[] / MYSQL_TYPE_BLOB:\t\t\t '%s'", (char *) pspv), + memset(tmp, 2, 16) && !memcmp(tmp, pspv, 16)); + + WL4435_TEST("MEDIUMBLOB", "REPEAT('\2', 16)", + MYSQL_TYPE_MEDIUM_BLOB, MYSQL_TYPE_BLOB, + char, [255], + (" - MEDIUMBLOB / char[] / MYSQL_TYPE_MEDIUM_BLOB:\t '%s'", (char *) pspv), + memset(tmp, 2, 16) && !memcmp(tmp, pspv, 16)); + + WL4435_TEST("LONGBLOB", "REPEAT('\2', 16)", + MYSQL_TYPE_LONG_BLOB, MYSQL_TYPE_BLOB, + char, [255], + (" - LONGBLOB / char[] / MYSQL_TYPE_LONG_BLOB:\t\t '%s'", (char *) pspv), + memset(tmp, 2, 16) && !memcmp(tmp, pspv, 16)); +} + + /* Test simple prepare field results */ static void test_prepare_field_result() @@ -19468,6 +19717,7 @@ static struct my_tests_st my_tests[]= { { "test_wl4284_1", test_wl4284_1 }, { "test_wl4435", test_wl4435 }, { "test_wl4435_2", test_wl4435_2 }, + { "test_wl4435_3", test_wl4435_3 }, { "test_bug38486", test_bug38486 }, { "test_bug33831", test_bug33831 }, { "test_bug40365", test_bug40365 }, --===============6094041595106308091== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/alexander.nozdrin@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: alexander.nozdrin@stripped\ # f82olspsqv7vo16g # target_branch: file:///home/alik/MySQL/bzr/00/bug56934/mysql-5.5-\ # bugteam-bug56934/ # testament_sha1: 1d3c599bfe0d53d0e69bd9b66bae6765f58f23fa # timestamp: 2010-11-13 18:03:39 +0300 # base_revision_id: joerg@stripped # # Begin bundle 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 --===============6094041595106308091==--