1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Fixed failing tests for not 32 bit intel machines

Fixed bug in mysql_stmt_fetch() when retrieving rows to return


mysql-test/r/ps.result:
  Fix to not get warnings if mysql_client_test.test fails
mysql-test/t/index_merge_ror.test:
  Proper fix for 64 bit intel (which gives uses another, equal good index)
mysql-test/t/ps.test:
  Fix to not get warnings if mysql_client_test.test fails
sql-common/client.c:
  More debugging
sql/sql_prepare.cc:
  Fixed bug in mysql_stmt_fetch() when retrieving rows to return
sql/sql_select.cc:
  More debugging
tests/mysql_client_test.c:
  More debugging
This commit is contained in:
unknown
2005-05-16 13:34:23 +03:00
parent 577f140e3f
commit 70c4325d67
7 changed files with 25 additions and 13 deletions

View File

@ -71,7 +71,7 @@ static const char *embedded_server_groups[]= {
static time_t start_time, end_time;
static double total_time;
const char *default_dbug_option= "d:t:o,/tmp/client_test.trace";
const char *default_dbug_option= "d:t:o,/tmp/mysql_client_test.trace";
struct my_tests_st
{
@ -12942,6 +12942,7 @@ static void test_bug9478()
char a[6];
ulong a_len;
int rc, i;
DBUG_ENTER("test_bug9478");
myheader("test_bug9478");
@ -13014,6 +13015,7 @@ static void test_bug9478()
for (i= 0; i < 5; i++)
{
DBUG_PRINT("loop",("i: %d", i));
rc= mysql_stmt_execute(stmt);
check_execute(stmt, rc);
rc= mysql_stmt_fetch(stmt);
@ -13029,10 +13031,10 @@ static void test_bug9478()
*/
{
char buff[9];
bzero(buff, sizeof(buff));
/* Fill in the execute packet */
int4store(buff, stmt->stmt_id);
int4store(buff+5, 1);
buff[4]= 0; /* Flag */
int4store(buff+5, 1); /* Return 1 row */
rc= ((*mysql->methods->advanced_command)(mysql, COM_EXECUTE, buff,
sizeof(buff), 0,0,1) ||
(*mysql->methods->read_query_result)(mysql));
@ -13072,6 +13074,7 @@ static void test_bug9478()
rc= mysql_query(mysql, "drop table t1");
myquery(rc);
DBUG_VOID_RETURN;
}