diff options
author | unknown <monty@mysql.com> | 2005-04-27 17:16:08 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2005-04-27 17:16:08 +0300 |
commit | 0e1e0ddf23a9aa89ee89022bd018f3eb47e84d86 (patch) | |
tree | 1659e377a1ee83ee3fe2a8d2ccbd1ec06f8643ee /tests | |
parent | 81e8630e2fb55dbd4da7cf4e4c20b44223d80857 (diff) | |
download | mariadb-git-0e1e0ddf23a9aa89ee89022bd018f3eb47e84d86.tar.gz |
mysqladmin extended-status now displays global status
Fixed problem with NULL in VARCHAR/BLOB keys for multi-part keys where VARCHAR/BLOB is first part
client/mysqladmin.cc:
Show GLOBAL status
myisam/mi_key.c:
Fixed problem with NULL in VARCHAR/BLOB keys for multi-part keys where VARCHAR/BLOB is first part
(Ramil will soon push test cases)
sql/handler.cc:
Indentation fix
tests/mysql_client_test.c:
Portability fixes
Diffstat (limited to 'tests')
-rw-r--r-- | tests/mysql_client_test.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 2dd5fda6f05..ae000a4273d 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -7046,6 +7046,7 @@ static void test_set_option() bug #89 (reported by mark@mysql.com) */ +#ifndef EMBEDDED_LIBRARY static void test_prepare_grant() { int rc; @@ -7138,7 +7139,7 @@ static void test_prepare_grant() } } - +#endif /* Test a crash when invalid/corrupted .frm is used in the @@ -12598,7 +12599,7 @@ static void test_bug8330() const char *stmt_text; MYSQL_STMT *stmt[2]; 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]; long lval[2]; @@ -12789,7 +12790,7 @@ static void test_bug8722() } -MYSQL_STMT *open_cursor(char *query) +MYSQL_STMT *open_cursor(const char *query) { int rc; const ulong type= (ulong)CURSOR_TYPE_READ_ONLY; |