diff options
| author | antony@ltantony.rdg.cyberkinetica.homeunix.net <> | 2003-12-02 20:57:34 +0000 |
|---|---|---|
| committer | antony@ltantony.rdg.cyberkinetica.homeunix.net <> | 2003-12-02 20:57:34 +0000 |
| commit | 55d4248daed338af0a37709b3930431f1fa7d3fa (patch) | |
| tree | 28430fb68ab7df9013fbdd16332a80afc913c5aa /sql/mysqld.cc | |
| parent | 1be4a37fa2762cf4ffd484d0c7e48b20a2fa2c8e (diff) | |
| parent | afc619f0a2e4351bd39acac53ec2fbc6be266a28 (diff) | |
| download | mariadb-git-55d4248daed338af0a37709b3930431f1fa7d3fa.tar.gz | |
Merge for update
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 99ab926c479..2a5f639a440 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5403,13 +5403,12 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), break; case OPT_TABLE_TYPE: { - int type; - if ((type=find_type(argument, &ha_table_typelib, 2)) <= 0) + if ((enum db_type)((global_system_variables.table_type= + ha_resolve_by_name(argument, strlen(argument)))) == DB_TYPE_UNKNOWN) { fprintf(stderr,"Unknown table type: %s\n",argument); exit(1); } - global_system_variables.table_type= type-1; break; } case OPT_SERVER_ID: |