mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge neptunus.(none):/home/msvensson/mysql/my41-nmj

Browse source 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


sql/sql_prepare.cc:
  Auto merged
This commit is contained in:
unknown 2007-02-06 14:42:40 +01:00
commit b93d81a8d1
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mysql-test/lib/mtr_cases.pl
View file

@ -537,6 +537,8 @@ sub collect_one_test_case($$$$$$$) {
$tinfo->{'comment'}= "No ndbcluster tests(--skip-ndbcluster)"; $tinfo->{'comment'}= "No ndbcluster tests(--skip-ndbcluster)";
return; return;
} }
# Ndb tests run with two mysqld masters
$tinfo->{'master_num'}= 2;
} }
else else
{ {
@ -552,7 +554,7 @@ sub collect_one_test_case($$$$$$$) {
if ( $tinfo->{'innodb_test'} ) if ( $tinfo->{'innodb_test'} )
{ {
# This is a test that need inndob # This is a test that need innodb
if ( $::mysqld_variables{'innodb'} eq "FALSE" ) if ( $::mysqld_variables{'innodb'} eq "FALSE" )
{ {
# innodb is not supported, skip it # innodb is not supported, skip it
@ -578,7 +580,6 @@ our @tags=
["include/have_debug.inc", "need_debug", 1], ["include/have_debug.inc", "need_debug", 1],
["include/have_ndb.inc", "ndb_test", 1], ["include/have_ndb.inc", "ndb_test", 1],
["include/have_ndb_extra.inc", "ndb_extra", 1], ["include/have_ndb_extra.inc", "ndb_extra", 1],
["include/have_multi_ndb.inc", "master_num", 2],
["require_manager", "require_manager", 1], ["require_manager", "require_manager", 1],
); );

11
sql/sql_prepare.cc
View file

@ -1781,8 +1781,9 @@ static void reset_stmt_params(Prepared_statement *stmt)
packet_length Query string length, including terminator character. packet_length Query string length, including terminator character.
*/ */
void mysql_stmt_execute(THD *thd, char *packet, uint packet_length) void mysql_stmt_execute(THD *thd, char *packet_arg, uint packet_length)
{ {
uchar* packet= (uchar*)packet_arg; // gcc 4.0 stgrict-aliasing
ulong stmt_id= uint4korr(packet); ulong stmt_id= uint4korr(packet);
/* /*
Query text for binary log, or empty string if the query is not put into Query text for binary log, or empty string if the query is not put into
@ -1790,7 +1791,7 @@ void mysql_stmt_execute(THD *thd, char *packet, uint packet_length)
*/ */
String expanded_query; String expanded_query;
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
uchar *packet_end= (uchar *) packet + packet_length - 1; uchar *packet_end= packet + packet_length - 1;
#endif #endif
Prepared_statement *stmt; Prepared_statement *stmt;
DBUG_ENTER("mysql_stmt_execute"); DBUG_ENTER("mysql_stmt_execute");
@ -1816,9 +1817,9 @@ void mysql_stmt_execute(THD *thd, char *packet, uint packet_length)
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
if (stmt->param_count) if (stmt->param_count)
{ {
uchar *null_array= (uchar *) packet; uchar *null_array= packet;
if (setup_conversion_functions(stmt, (uchar **) &packet, packet_end) || if (setup_conversion_functions(stmt, &packet, packet_end) ||
stmt->set_params(stmt, null_array, (uchar *) packet, packet_end, stmt->set_params(stmt, null_array, packet, packet_end,
&expanded_query)) &expanded_query))
goto set_params_data_err; goto set_params_data_err;
} }