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 bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into mysql.com:/home/my/mysql-5.0
This commit is contained in:
monty@mysql.com
2005-04-27 17:19:32 +03:00
parent 79f049f7b0 69b813a901
commit 215be0264b
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysqladmin.cc
View File

@ -727,7 +727,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
void (*func) (MYSQL_RES*, MYSQL_ROW, uint); void (*func) (MYSQL_RES*, MYSQL_ROW, uint);
new_line = 1; new_line = 1;
if (mysql_query(mysql, "show status") || if (mysql_query(mysql, "show /*!50002 GLOBAL */ status") ||
!(res = mysql_store_result(mysql))) !(res = mysql_store_result(mysql)))
{ {
my_printf_error(0, "unable to show status; error: '%s'", MYF(ME_BELL), my_printf_error(0, "unable to show status; error: '%s'", MYF(ME_BELL),

7
sql/handler.cc
View File

@ -185,9 +185,10 @@ enum db_type ha_checktype(enum db_type database_type)
thd= current_thd; thd= current_thd;
return ((enum db_type) thd->variables.table_type != DB_TYPE_UNKNOWN ? return ((enum db_type) thd->variables.table_type != DB_TYPE_UNKNOWN ?
(enum db_type) thd->variables.table_type : (enum db_type) thd->variables.table_type :
(enum db_type) global_system_variables.table_type != ((enum db_type) global_system_variables.table_type !=
DB_TYPE_UNKNOWN ? DB_TYPE_UNKNOWN ?
(enum db_type) global_system_variables.table_type : DB_TYPE_MYISAM); (enum db_type) global_system_variables.table_type : DB_TYPE_MYISAM)
);
} /* ha_checktype */ } /* ha_checktype */

7
tests/mysql_client_test.c
View File

@ -7046,6 +7046,7 @@ static void test_set_option()
bug #89 (reported by mark@mysql.com) bug #89 (reported by mark@mysql.com)
*/ */
#ifndef EMBEDDED_LIBRARY
static void test_prepare_grant() static void test_prepare_grant()
{ {
int rc; int rc;
@ -7138,7 +7139,7 @@ static void test_prepare_grant()
} }
} }
#endif
/* /*
Test a crash when invalid/corrupted .frm is used in the Test a crash when invalid/corrupted .frm is used in the
@ -12597,7 +12598,7 @@ static void test_bug8330()
const char *stmt_text; const char *stmt_text;
MYSQL_STMT *stmt[2]; MYSQL_STMT *stmt[2];
int i, rc; int i, rc;
char *query= "select a,b from t1 where a=?"; const char *query= "select a,b from t1 where a=?";
MYSQL_BIND bind[2]; MYSQL_BIND bind[2];
long lval[2]; long lval[2];
@ -12788,7 +12789,7 @@ static void test_bug8722()
} }
MYSQL_STMT *open_cursor(char *query) MYSQL_STMT *open_cursor(const char *query)
{ {
int rc; int rc;
const ulong type= (ulong)CURSOR_TYPE_READ_ONLY; const ulong type= (ulong)CURSOR_TYPE_READ_ONLY;