database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge with global tree

Browse Source 
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
sql/examples/ha_archive.cc:
  Merge with global tree
  (Use my changes)
sql/sql_parse.cc:
  Remove 'tmp' fix to be able to run tests
This commit is contained in:
unknown
2005-02-25 17:12:06 +02:00
parent c5d4d50ab7 248e449451
commit 08b3e79e40
65 changed files with 233 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/mysql_client_test.c
View File

@ -3351,7 +3351,7 @@ static void test_bind_result()
MYSQL_STMT *stmt;
int rc;
int nData;
ulong length, length1;
ulong length1;
char szData[100];
MYSQL_BIND bind[2];
my_bool is_null[2];
@ -3416,7 +3416,6 @@ static void test_bind_result()
DIE_UNLESS(strcmp(szData, "MySQL") == 0);
DIE_UNLESS(length1 == 5);
length= 99;
rc= mysql_stmt_fetch(stmt);
check_execute(stmt, rc);
@ -5350,7 +5349,6 @@ static void test_prepare_alter()
{
MYSQL_STMT *stmt;
int rc, id;
long length;
MYSQL_BIND bind[1];
my_bool is_null;
@ -5385,7 +5383,6 @@ static void test_prepare_alter()
check_execute(stmt, rc);
id= 30;
length= 0;
rc= mysql_stmt_execute(stmt);
check_execute(stmt, rc);
@ -11620,14 +11617,13 @@ static void test_bug6059()
{
MYSQL_STMT *stmt;
const char *stmt_text;
int rc;
myheader("test_bug6059");
stmt_text= "SELECT 'foo' INTO OUTFILE 'x.3'";
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text));
(void) mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text));
DIE_UNLESS(mysql_stmt_field_count(stmt) == 0);
mysql_stmt_close(stmt);
}