Commit 29cd5363 authored by Alexander Barkov's avatar Alexander Barkov

Removing unused code.

modified:
  storage/connect/ha_connect.cc
parent 59e95fe6
...@@ -3653,7 +3653,6 @@ int ha_connect::create(const char *name, TABLE *table_arg, ...@@ -3653,7 +3653,6 @@ int ha_connect::create(const char *name, TABLE *table_arg,
TABLE *st= table; // Probably unuseful TABLE *st= table; // Probably unuseful
PIXDEF xdp, pxd= NULL, toidx= NULL; PIXDEF xdp, pxd= NULL, toidx= NULL;
PGLOBAL g= GetPlug(table_arg->in_use); PGLOBAL g= GetPlug(table_arg->in_use);
const CHARSET_INFO *data_charset;
DBUG_ENTER("ha_connect::create"); DBUG_ENTER("ha_connect::create");
PTOS options= GetTableOptionStruct(table_arg); PTOS options= GetTableOptionStruct(table_arg);
...@@ -3663,6 +3662,7 @@ int ha_connect::create(const char *name, TABLE *table_arg, ...@@ -3663,6 +3662,7 @@ int ha_connect::create(const char *name, TABLE *table_arg,
if (options->data_charset) if (options->data_charset)
{ {
const CHARSET_INFO *data_charset;
if (!(data_charset= get_charset_by_csname(options->data_charset, if (!(data_charset= get_charset_by_csname(options->data_charset,
MY_CS_PRIMARY, MYF(0)))) MY_CS_PRIMARY, MYF(0))))
{ {
...@@ -3678,12 +3678,6 @@ int ha_connect::create(const char *name, TABLE *table_arg, ...@@ -3678,12 +3678,6 @@ int ha_connect::create(const char *name, TABLE *table_arg,
DBUG_RETURN(HA_ERR_INTERNAL_ERROR); DBUG_RETURN(HA_ERR_INTERNAL_ERROR);
} }
} }
else
{
data_charset= create_info->default_table_charset ?
create_info->default_table_charset :
&my_charset_latin1;
}
if (!g) { if (!g) {
rc= HA_ERR_INTERNAL_ERROR; rc= HA_ERR_INTERNAL_ERROR;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment