Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions client/mysqltest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8614,12 +8614,13 @@ static void execute_replay_queries(const char *sql_script, DYNAMIC_STRING *ds)
log_replay_query(query_start, query_len);

/* Execute the query */
if (mysql_real_query(replay_server_mysql, query_start, query_len))
if (mysql_real_query(replay_server_mysql, query_start,
(ulong) query_len))
{
char buf[512];
int len= my_snprintf(buf, sizeof(buf),
"ReplayTest: Query error: %s\n",
mysql_error(replay_server_mysql));
size_t len=
my_snprintf(buf, sizeof(buf), "ReplayTest: Query error: %s\n",
mysql_error(replay_server_mysql));
fputs(buf, stdout);
print_replay_test_location(stdout);
verbose_msg("%s", buf);
Expand Down Expand Up @@ -8664,9 +8665,9 @@ static void execute_replay_queries(const char *sql_script, DYNAMIC_STRING *ds)
if (mysql_errno(replay_server_mysql))
{
char buf[512];
int len= my_snprintf(buf, sizeof(buf),
"ReplayTest: Query error: %s\n",
mysql_error(replay_server_mysql));
size_t len=
my_snprintf(buf, sizeof(buf), "ReplayTest: Query error: %s\n",
mysql_error(replay_server_mysql));
fputs(buf, stdout);
if (is_explain)
dynstr_append_mem(&result, buf, len);
Expand Down Expand Up @@ -8722,8 +8723,9 @@ static void execute_replay_queries(const char *sql_script, DYNAMIC_STRING *ds)

/* Log the query */
log_replay_query(query_start, query_len);

if (mysql_real_query(replay_server_mysql, query_start, query_len))

if (mysql_real_query(replay_server_mysql, query_start,
(ulong) query_len))
{
fprintf(stdout, "ReplayTest: Query failed on replay server: %d %s\n",
mysql_errno(replay_server_mysql),
Expand Down Expand Up @@ -8836,10 +8838,10 @@ static void run_explain_directly_on_replay(const char *query, size_t query_len,
if (mysql_real_query(replay_server_mysql, query, (ulong)query_len))
{
char buf[512];
int len= my_snprintf(buf, sizeof(buf),
"ReplayTest: Direct EXPLAIN failed on replay server: %d %s\n",
mysql_errno(replay_server_mysql),
mysql_error(replay_server_mysql));
size_t len= my_snprintf(
buf, sizeof(buf),
"ReplayTest: Direct EXPLAIN failed on replay server: %d %s\n",
mysql_errno(replay_server_mysql), mysql_error(replay_server_mysql));
fputs(buf, stdout);
fprintf(stdout, "ReplayTest: Failed query was: %.*s\n",
(int)query_len, query);
Expand Down
1 change: 1 addition & 0 deletions mysql-test/main/costs.test
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
--source include/have_sequence.inc
--source include/have_innodb.inc
--source include/innodb_stable_estimates.inc
--disable_replay testfile Uses Last_query_cost for most queries

create table t1 (a int primary key, b int, c int, d int, e int, key ba (b,a), key bda (b,d,a), key cba (c,b,a), key cb (c,b), key d (d)) engine=aria;
insert into t1 select seq,seq,seq,seq,seq from seq_1_to_10;
Expand Down
Loading
Loading