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

Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, mysys/mf_keycache.c, mysql-test/t/*myisam*

Browse Source 
since previous merge. MARIA_PAGECACHE_READS in maria-preload.test are down a little bit (5%), which must be a good
side-effect of some sql/ change.
This commit is contained in:
Guilhem Bichot
2008-12-10 10:02:25 +01:00
parent ba816c14a9 7f91cf0861
commit 926aaf4635
608 changed files with 210523 additions and 6061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/mysql_client_test.c
View File

@ -40,7 +40,9 @@
#define MAX_SERVER_ARGS 64
/* set default options */
#ifdef NOT_USED
static int opt_testcase = 0;
#endif
static char *opt_db= 0;
static char *opt_user= 0;
static char *opt_password= 0;
@ -12600,7 +12602,7 @@ static void test_conversion()
const char *stmt_text;
int rc;
MYSQL_BIND my_bind[1];
char buff[4];
uchar buff[4];
ulong length;
myheader("test_conversion");
@ -12623,7 +12625,7 @@ static void test_conversion()
check_execute(stmt, rc);
bzero((char*) my_bind, sizeof(my_bind));
my_bind[0].buffer= buff;
my_bind[0].buffer= (char*) buff;
my_bind[0].length= &length;
my_bind[0].buffer_type= MYSQL_TYPE_STRING;
@ -12648,7 +12650,7 @@ static void test_conversion()
rc= mysql_stmt_fetch(stmt);
DIE_UNLESS(rc == 0);
DIE_UNLESS(length == 1);
DIE_UNLESS((uchar) buff[0] == 0xE0);
DIE_UNLESS(buff[0] == 0xE0);
rc= mysql_stmt_fetch(stmt);
DIE_UNLESS(rc == MYSQL_NO_DATA);
@ -15873,11 +15875,10 @@ static void test_bug21206()
static void test_status()
{
const char *status;
DBUG_ENTER("test_status");
myheader("test_status");
if (!(status= mysql_stat(mysql)))
if (!mysql_stat(mysql))
{
myerror("mysql_stat failed"); /* purecov: inspected */
die(__FILE__, __LINE__, "mysql_stat failed"); /* purecov: inspected */
@ -17980,7 +17981,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
DBUG_PUSH(argument ? argument : default_dbug_option);
break;
case 'c':
#ifdef NOT_USED
opt_testcase = 1;
#endif
break;
case 'p':
if (argument)