diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-07-23 20:39:36 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-07-23 20:39:36 +0300 |
| commit | 570c7cd594fcf9d7c8bf311f7b666876cbdcc2c7 (patch) | |
| tree | dd3586b209432966efbbf77cd272760438711106 /client | |
| parent | 8bb2989af5be377ba8a15038a9fbddb1cb2d75aa (diff) | |
| parent | 728cc2e2fdad9d6fb1567291905ceaf6c1d4f726 (diff) | |
| download | mariadb-git-570c7cd594fcf9d7c8bf311f7b666876cbdcc2c7.tar.gz | |
merge
include/my_sys.h:
Auto merged
include/myisam.h:
Auto merged
myisam/mi_check.c:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_myisam.h:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_myisammrg.h:
Auto merged
sql/handler.cc:
Auto merged
sql/item.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/structs.h:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/client_priv.h | 2 | ||||
| -rw-r--r-- | client/mysql.cc | 10 | ||||
| -rw-r--r-- | client/mysqladmin.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index b527bdf201c..acf9455bf9c 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -19,8 +19,8 @@ #include <my_global.h> #include <my_sys.h> #include <m_string.h> -#include <mysql_embed.h> #include <mysql.h> +#include <mysql_embed.h> #include <errmsg.h> #include <my_getopt.h> diff --git a/client/mysql.cc b/client/mysql.cc index 726a7924b70..6de6a97a22a 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1487,7 +1487,7 @@ com_go(String *buffer,char *line __attribute__((unused))) static void init_pager() { -#if !defined( __WIN__) && !defined( OS2) && !(defined(HAVE_mit_thread) && defined(THREAD)) +#if !defined( __WIN__) && !defined( OS2) && (!defined(HAVE_mit_thread) || !defined(THREAD)) if (!opt_nopager) { if (!(PAGER= popen(pager, "w"))) @@ -2336,11 +2336,11 @@ com_status(String *buffer __attribute__((unused)), if ((status=mysql_stat(&mysql)) && !mysql_error(&mysql)[0]) { - char *pos,buff[40]; ulong sec; - pos=strchr(status,' '); - *pos++=0; - tee_fprintf(stdout, "%s\t\t\t", status); /* print label */ + char buff[40]; + const char *pos= strchr(status,' '); + /* print label */ + tee_fprintf(stdout, "%.*s\t\t\t", (int) (pos-status), status); if ((status=str2int(pos,10,0,LONG_MAX,(long*) &sec))) { nice_time((double) sec,buff,0); diff --git a/client/mysqladmin.c b/client/mysqladmin.c index b790880be6f..d890a096542 100644 --- a/client/mysqladmin.c +++ b/client/mysqladmin.c @@ -23,7 +23,7 @@ #include <my_pthread.h> /* because of signal() */ #endif -#define ADMIN_VERSION "8.35" +#define ADMIN_VERSION "8.36" #define MAX_MYSQL_VAR 128 #define SHUTDOWN_DEF_TIMEOUT 3600 /* Wait for shutdown */ #define MAX_TRUNC_LENGTH 3 @@ -588,7 +588,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) MYSQL_ROW row; new_line=1; - if (mysql_query(mysql,"show variables") || + if (mysql_query(mysql,"show /*!40003 GLOBAL */ variables") || !(res=mysql_store_result(mysql))) { my_printf_error(0,"unable to show variables; error: '%s'",MYF(ME_BELL), |