1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

5.5 merge

This commit is contained in:
Sergei Golubchik
2013-07-17 21:24:29 +02:00
1704 changed files with 7802 additions and 3315 deletions

View File

@ -12,7 +12,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
/***************************************************************************
This is a test sample to test the new features in MySQL client-server
@ -18775,6 +18775,76 @@ static void test_bug11754979()
DBUG_VOID_RETURN;
}
static void test_ps_sp_out_params()
{
MYSQL *my;
MYSQL_STMT *stmt;
MYSQL_BIND bind[1];
char buffer[20];
int status, rc;
myheader("test_ps_sp_out_params");
my= mysql_client_init(NULL);
if (!mysql_real_connect(my, opt_host, opt_user,
opt_password, current_db, opt_port,
opt_unix_socket, CLIENT_MULTI_RESULTS))
DIE("mysql_real_connect failed");
rc= mysql_query(my, "DROP PROCEDURE IF EXISTS p1");
myquery(rc);
rc= mysql_query(my,
"CREATE PROCEDURE p1(OUT out_param VARCHAR(19)) "
"BEGIN"
" SELECT 'foo' FROM DUAL;"
" SET out_param='foo';"
" SELECT 'foo' FROM DUAL;"
"END");
myquery(rc);
stmt= mysql_stmt_init(my);
rc= mysql_stmt_prepare(stmt, "CALL P1(?)", 10);
DIE_UNLESS(rc==0);
DIE_UNLESS(mysql_stmt_param_count(stmt) == 1);
memset(bind, 0, sizeof(MYSQL_BIND));
bind[0].buffer= buffer;
bind[0].buffer_length= sizeof(buffer);
bind[0].buffer_type= MYSQL_TYPE_STRING;
mysql_stmt_bind_param(stmt, bind);
rc= mysql_stmt_execute(stmt);
check_execute(stmt, rc);
do {
if (mysql_stmt_field_count(stmt))
{
/* since server sends a status packet at the end,
there must follow at least one additional packet */
DIE_UNLESS(mysql_more_results(stmt->mysql));
mysql_stmt_bind_result(stmt, bind);
rc= mysql_stmt_fetch(stmt);
DIE_UNLESS(rc== 0);
DIE_UNLESS(strcmp(buffer, "foo") == 0);
}
status= mysql_stmt_next_result(stmt);
} while (status == 0);
rc= mysql_stmt_reset(stmt);
DIE_UNLESS(rc== 0);
mysql_stmt_close(stmt);
mysql_close(my);
printf("end\n");
}
/*
Bug#13001491: MYSQL_REFRESH CRASHES WHEN STORED ROUTINES ARE RUN CONCURRENTLY.
@ -19224,6 +19294,7 @@ static struct my_tests_st my_tests[]= {
{ "test_bug11754979", test_bug11754979 },
{ "test_bug13001491", test_bug13001491 },
{ "test_mdev4326", test_mdev4326 },
{ "test_ps_sp_out_params", test_ps_sp_out_params },
{ 0, 0 }
};