diff options
| author | unknown <monty@donna.mysql.fi> | 2001-03-03 03:03:12 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-03-03 03:03:12 +0200 |
| commit | 73e3499987b138af0bd6ab7df2c69999e2ffbeec (patch) | |
| tree | cd2f65141c35a1998982970704a3f854a987c568 /client/mysqladmin.c | |
| parent | 3ab1788501f7d967a0260e78230674aaa67ec16e (diff) | |
| download | mariadb-git-73e3499987b138af0bd6ab7df2c69999e2ffbeec.tar.gz | |
Fixes for innobase usage
Fixed bug when using TEXT columns with BDB tables
Allow LOAD DATA INFILE to use numbers with ENUM and SET columns
BUILD/compile-pentium:
Added --with-innobase-db
Docs/manual.texi:
Added more documentation to Innobase and KILL
client/mysqladmin.c:
Quote database names for CREATE and DROP
mysql-test/install_test_db.sh:
Don't use innobase, bdb or gemini when installing privilege tables
mysql-test/mysql-test-run.sh:
Added testing of innobase tables
mysql-test/r/bdb.result:
Added test of TEXT column bug
mysql-test/t/bdb.test:
Added test of TEXT column bug
mysql-test/t/innobase.test:
Cleanup innobase tests
scripts/mysql_install_db.sh:
Added testing of innobase tables
sql/field.cc:
Allow LOAD DATA INFILE to use numbers with ENUM and SET columns
sql/filesort.cc:
Fixed typo
sql/ha_berkeley.cc:
Fixed problem with TEXT columns in BDB tables
sql/mysqld.cc:
Always support the --innobase-data-file-path option
sql/share/swedish/errmsg.OLD:
Added swedish error messages
sql/share/swedish/errmsg.txt:
Added swedish error messages
sql/sql_base.cc:
Reset tables after usage (to fix problem with BDB and TEXT columns)
sql/sql_delete.cc:
Use generate table if --skip-innobase is used
Diffstat (limited to 'client/mysqladmin.c')
| -rw-r--r-- | client/mysqladmin.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/client/mysqladmin.c b/client/mysqladmin.c index 98da2df3aba..a8bda38d8cc 100644 --- a/client/mysqladmin.c +++ b/client/mysqladmin.c @@ -28,7 +28,7 @@ #include <my_pthread.h> /* because of signal() */ #endif -#define ADMIN_VERSION "8.16" +#define ADMIN_VERSION "8.17" #define MAX_MYSQL_VAR 64 #define MAX_TIME_TO_WAIT 3600 /* Wait for shutdown */ #define MAX_TRUNC_LENGTH 3 @@ -402,32 +402,32 @@ static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) my_printf_error(0,"Too few arguments to create",MYF(ME_BELL)); return 1; } - sprintf(buff,"create database %.*s",FN_REFLEN,argv[1]); + sprintf(buff,"create database `%.*s`",FN_REFLEN,argv[1]); if (mysql_query(mysql,buff)) { - my_printf_error(0,"Create failed; error: '%-.200s'",MYF(ME_BELL), - mysql_error(mysql)); + my_printf_error(0,"CREATE DATABASE failed; error: '%-.200s'", + MYF(ME_BELL), mysql_error(mysql)); return 1; } - else - { - argc--; argv++; - } + argc--; argv++; break; } case ADMIN_DROP: { + char buff[FN_REFLEN+20]; if (argc < 2) { my_printf_error(0,"Too few arguments to drop",MYF(ME_BELL)); return 1; } - if (drop_db(mysql,argv[1])) - return 1; - else + sprintf(buff,"drop database `%.*s`",FN_REFLEN,argv[1]); + if (mysql_query(mysql,buff)) { - argc--; argv++; + my_printf_error(0,"DROP DATABASE failed; error: '%-.200s'", + MYF(ME_BELL), mysql_error(mysql)); + return 1; } + argc--; argv++; break; } case ADMIN_SHUTDOWN: |