summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/ha_ndbcluster.cc85
-rw-r--r--sql/ha_ndbcluster.h2
-rw-r--r--sql/item_strfunc.cc76
-rw-r--r--sql/sql_base.cc1
-rw-r--r--sql/sql_insert.cc2
-rw-r--r--sql/sql_parse.cc3
-rw-r--r--sql/sql_prepare.cc14
-rw-r--r--sql/table.cc20
-rw-r--r--sql/table.h1
9 files changed, 113 insertions, 91 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 2d2bd12f425..4514974c289 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -212,6 +212,13 @@ Thd_ndb::~Thd_ndb()
{
if (ndb)
delete ndb;
+ ndb= 0;
+}
+
+inline
+Ndb *ha_ndbcluster::get_ndb()
+{
+ return ((Thd_ndb*)current_thd->transaction.thd_ndb)->ndb;
}
/*
@@ -245,8 +252,9 @@ void ha_ndbcluster::records_update()
info->no_uncommitted_rows_count));
// if (info->records == ~(ha_rows)0)
{
+ Ndb *ndb= get_ndb();
Uint64 rows;
- if(ndb_get_table_statistics(m_ndb, m_tabname, &rows, 0) == 0){
+ if(ndb_get_table_statistics(ndb, m_tabname, &rows, 0) == 0){
info->records= rows;
}
}
@@ -331,7 +339,8 @@ int ha_ndbcluster::ndb_err(NdbConnection *trans)
switch (err.classification) {
case NdbError::SchemaError:
{
- NDBDICT *dict= m_ndb->getDictionary();
+ Ndb *ndb= get_ndb();
+ NDBDICT *dict= ndb->getDictionary();
DBUG_PRINT("info", ("invalidateTable %s", m_tabname));
dict->invalidateTable(m_tabname);
table->version=0L; /* Free when thread is ready */
@@ -361,7 +370,7 @@ bool ha_ndbcluster::get_error_message(int error,
DBUG_ENTER("ha_ndbcluster::get_error_message");
DBUG_PRINT("enter", ("error: %d", error));
- Ndb *ndb= ((Thd_ndb*)current_thd->transaction.thd_ndb)->ndb;
+ Ndb *ndb= get_ndb();
if (!ndb)
DBUG_RETURN(FALSE);
@@ -692,7 +701,8 @@ bool ha_ndbcluster::uses_blob_value(bool all_fields)
int ha_ndbcluster::get_metadata(const char *path)
{
- NDBDICT *dict= m_ndb->getDictionary();
+ Ndb *ndb= get_ndb();
+ NDBDICT *dict= ndb->getDictionary();
const NDBTAB *tab;
int error;
bool invalidating_ndb_table= FALSE;
@@ -767,7 +777,8 @@ int ha_ndbcluster::build_index_list(TABLE *tab, enum ILBP phase)
static const char* unique_suffix= "$unique";
KEY* key_info= tab->key_info;
const char **key_name= tab->keynames.type_names;
- NdbDictionary::Dictionary *dict= m_ndb->getDictionary();
+ Ndb *ndb= get_ndb();
+ NdbDictionary::Dictionary *dict= ndb->getDictionary();
DBUG_ENTER("build_index_list");
// Save information about all known indexes
@@ -1739,7 +1750,8 @@ int ha_ndbcluster::write_row(byte *record)
if (table->primary_key == MAX_KEY)
{
// Table has hidden primary key
- Uint64 auto_value= m_ndb->getAutoIncrementValue((const NDBTAB *) m_table);
+ Ndb *ndb= get_ndb();
+ Uint64 auto_value= ndb->getAutoIncrementValue((const NDBTAB *) m_table);
if (set_hidden_key(op, table->fields, (const byte*)&auto_value))
ERR_RETURN(op->getNdbError());
}
@@ -1816,11 +1828,12 @@ int ha_ndbcluster::write_row(byte *record)
}
if ((has_auto_increment) && (m_skip_auto_increment))
{
+ Ndb *ndb= get_ndb();
Uint64 next_val= (Uint64) table->next_number_field->val_int() + 1;
DBUG_PRINT("info",
("Trying to set next auto increment value to %lu",
(ulong) next_val));
- if (m_ndb->setAutoIncrementValue((const NDBTAB *) m_table, next_val, TRUE))
+ if (ndb->setAutoIncrementValue((const NDBTAB *) m_table, next_val, TRUE))
DBUG_PRINT("info",
("Setting next auto increment value to %u", next_val));
}
@@ -2667,9 +2680,12 @@ void ha_ndbcluster::info(uint flag)
}
else
{
- Uint64 rows= 100;
+ if ((my_errno= check_ndb_connection()))
+ DBUG_VOID_RETURN;
+ Ndb *ndb= get_ndb();
+ Uint64 rows;
if (current_thd->variables.ndb_use_exact_count)
- ndb_get_table_statistics(m_ndb, m_tabname, &rows, 0);
+ ndb_get_table_statistics(ndb, m_tabname, &rows, 0);
records= rows;
}
}
@@ -2998,6 +3014,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
DBUG_RETURN(1);
Thd_ndb *thd_ndb= (Thd_ndb*)thd->transaction.thd_ndb;
+ Ndb *ndb= thd_ndb->ndb;
DBUG_PRINT("enter", ("transaction.thd_ndb->lock_count: %d",
thd_ndb->lock_count));
@@ -3015,9 +3032,9 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
DBUG_ASSERT(!thd->transaction.stmt.ndb_tid);
DBUG_PRINT("trans",("Starting transaction stmt"));
- trans= m_ndb->startTransaction();
+ trans= ndb->startTransaction();
if (trans == NULL)
- ERR_RETURN(m_ndb->getNdbError());
+ ERR_RETURN(ndb->getNdbError());
no_uncommitted_rows_reset(thd);
thd->transaction.stmt.ndb_tid= trans;
}
@@ -3029,9 +3046,9 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
// A "master" transaction ha not been started yet
DBUG_PRINT("trans",("starting transaction, all"));
- trans= m_ndb->startTransaction();
+ trans= ndb->startTransaction();
if (trans == NULL)
- ERR_RETURN(m_ndb->getNdbError());
+ ERR_RETURN(ndb->getNdbError());
no_uncommitted_rows_reset(thd);
/*
@@ -3081,7 +3098,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
m_retrieve_primary_key= FALSE;
m_ops_pending= 0;
{
- NDBDICT *dict= m_ndb->getDictionary();
+ NDBDICT *dict= ndb->getDictionary();
const NDBTAB *tab;
void *tab_info;
if (!(tab= dict->getTable(m_tabname, &tab_info)))
@@ -3108,7 +3125,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
We must in this case close the transaction to release resources
*/
DBUG_PRINT("trans",("ending non-updating transaction"));
- m_ndb->closeTransaction(m_active_trans);
+ ndb->closeTransaction(m_active_trans);
thd->transaction.stmt.ndb_tid= 0;
}
}
@@ -3154,16 +3171,17 @@ int ha_ndbcluster::start_stmt(THD *thd)
NdbConnection *trans= (NdbConnection*)thd->transaction.stmt.ndb_tid;
if (!trans){
+ Ndb *ndb= ((Thd_ndb*)thd->transaction.thd_ndb)->ndb;
DBUG_PRINT("trans",("Starting transaction stmt"));
NdbConnection *tablock_trans=
(NdbConnection*)thd->transaction.all.ndb_tid;
DBUG_PRINT("info", ("tablock_trans: %x", (uint)tablock_trans));
DBUG_ASSERT(tablock_trans);
-// trans= m_ndb->hupp(tablock_trans);
- trans= m_ndb->startTransaction();
+// trans= ndb->hupp(tablock_trans);
+ trans= ndb->startTransaction();
if (trans == NULL)
- ERR_RETURN(m_ndb->getNdbError());
+ ERR_RETURN(ndb->getNdbError());
no_uncommitted_rows_reset(thd);
thd->transaction.stmt.ndb_tid= trans;
}
@@ -3550,7 +3568,8 @@ int ha_ndbcluster::create(const char *name,
DBUG_RETURN(my_errno);
// Create the table in NDB
- NDBDICT *dict= m_ndb->getDictionary();
+ Ndb *ndb= get_ndb();
+ NDBDICT *dict= ndb->getDictionary();
if (dict->createTable(tab) != 0)
{
const NdbError err= dict->getNdbError();
@@ -3595,7 +3614,8 @@ int ha_ndbcluster::create_index(const char *name,
KEY *key_info,
bool unique)
{
- NdbDictionary::Dictionary *dict= m_ndb->getDictionary();
+ Ndb *ndb= get_ndb();
+ NdbDictionary::Dictionary *dict= ndb->getDictionary();
KEY_PART_INFO *key_part= key_info->key_part;
KEY_PART_INFO *end= key_part + key_info->key_parts;
@@ -3654,14 +3674,15 @@ int ha_ndbcluster::rename_table(const char *from, const char *to)
if (check_ndb_connection())
DBUG_RETURN(my_errno= HA_ERR_NO_CONNECTION);
- dict= m_ndb->getDictionary();
+ Ndb *ndb= get_ndb();
+ dict= ndb->getDictionary();
if (!(orig_tab= dict->getTable(m_tabname)))
ERR_RETURN(dict->getNdbError());
m_table= (void *)orig_tab;
// Change current database to that of target table
set_dbname(to);
- m_ndb->setDatabaseName(m_dbname);
+ ndb->setDatabaseName(m_dbname);
if (!(result= alter_table_name(new_tabname)))
{
// Rename .ndb file
@@ -3678,7 +3699,8 @@ int ha_ndbcluster::rename_table(const char *from, const char *to)
int ha_ndbcluster::alter_table_name(const char *to)
{
- NDBDICT * dict= m_ndb->getDictionary();
+ Ndb *ndb= get_ndb();
+ NDBDICT *dict= ndb->getDictionary();
const NDBTAB *orig_tab= (const NDBTAB *) m_table;
int ret;
DBUG_ENTER("alter_table_name_table");
@@ -3720,8 +3742,9 @@ int ha_ndbcluster::delete_table(const char *name)
int ha_ndbcluster::drop_table()
{
- NdbDictionary::Dictionary *dict= m_ndb->getDictionary();
-
+ Ndb *ndb= get_ndb();
+ NdbDictionary::Dictionary *dict= ndb->getDictionary();
+
DBUG_ENTER("drop_table");
DBUG_PRINT("enter", ("Deleting %s", m_tabname));
@@ -3756,6 +3779,7 @@ ulonglong ha_ndbcluster::get_auto_increment()
Uint64 auto_value;
DBUG_ENTER("get_auto_increment");
DBUG_PRINT("enter", ("m_tabname: %s", m_tabname));
+ Ndb *ndb= get_ndb();
cache_size=
(m_rows_to_insert - m_rows_inserted < m_autoincrement_prefetch) ?
m_rows_to_insert - m_rows_inserted
@@ -3764,8 +3788,8 @@ ulonglong ha_ndbcluster::get_auto_increment()
: m_autoincrement_prefetch;
auto_value=
(m_skip_auto_increment) ?
- m_ndb->readAutoIncrementValue((const NDBTAB *) m_table)
- : m_ndb->getAutoIncrementValue((const NDBTAB *) m_table, cache_size);
+ ndb->readAutoIncrementValue((const NDBTAB *) m_table)
+ : ndb->getAutoIncrementValue((const NDBTAB *) m_table, cache_size);
DBUG_RETURN((longlong)auto_value);
}
@@ -3778,7 +3802,6 @@ ha_ndbcluster::ha_ndbcluster(TABLE *table_arg):
handler(table_arg),
m_active_trans(NULL),
m_active_cursor(NULL),
- m_ndb(NULL),
m_table(NULL),
m_table_info(NULL),
m_table_flags(HA_REC_NOT_IN_SEQ |
@@ -3909,7 +3932,6 @@ int ha_ndbcluster::close(void)
DBUG_ENTER("close");
free_share(m_share); m_share= 0;
release_metadata();
- m_ndb= NULL;
DBUG_RETURN(0);
}
@@ -3971,11 +3993,12 @@ Ndb* check_ndb_in_thd(THD* thd)
int ha_ndbcluster::check_ndb_connection()
{
THD* thd= current_thd;
+ Ndb *ndb;
DBUG_ENTER("check_ndb_connection");
- if (!(m_ndb= check_ndb_in_thd(thd)))
+ if (!(ndb= check_ndb_in_thd(thd)))
DBUG_RETURN(HA_ERR_NO_CONNECTION);
- m_ndb->setDatabaseName(m_dbname);
+ ndb->setDatabaseName(m_dbname);
DBUG_RETURN(0);
}
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
index ca3fa929674..bfe414162b1 100644
--- a/sql/ha_ndbcluster.h
+++ b/sql/ha_ndbcluster.h
@@ -210,7 +210,6 @@ class ha_ndbcluster: public handler
NdbConnection *m_active_trans;
NdbResultSet *m_active_cursor;
- Ndb *m_ndb;
void *m_table;
void *m_table_info;
char m_dbname[FN_HEADLEN];
@@ -246,6 +245,7 @@ class ha_ndbcluster: public handler
bool m_transaction_on;
bool m_use_local_query_cache;
+ Ndb *get_ndb();
void set_rec_per_key();
void records_update();
void no_uncommitted_rows_execute_failure();
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 88f32067c6c..3c4ffd3e4f3 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -1185,21 +1185,29 @@ String *Item_func_substr_index::val_str(String *str)
String *Item_func_ltrim::val_str(String *str)
{
DBUG_ASSERT(fixed == 1);
- String *res =args[0]->val_str(str);
- if ((null_value=args[0]->null_value))
- return 0; /* purecov: inspected */
- char buff[MAX_FIELD_WIDTH];
- String tmp(buff,sizeof(buff),res->charset());
- String *remove_str= (arg_count==2) ? args[1]->val_str(&tmp) : &remove;
+ char buff[MAX_FIELD_WIDTH], *ptr, *end;
+ String tmp(buff,sizeof(buff),system_charset_info);
+ String *res, *remove_str;
uint remove_length;
LINT_INIT(remove_length);
- if (!remove_str || (remove_length=remove_str->length()) == 0 ||
+ res= args[0]->val_str(str);
+ if ((null_value=args[0]->null_value))
+ return 0;
+ remove_str= &remove; /* Default value. */
+ if (arg_count == 2)
+ {
+ remove_str= args[1]->val_str(&tmp);
+ if ((null_value= args[1]->null_value))
+ return 0;
+ }
+
+ if ((remove_length= remove_str->length()) == 0 ||
remove_length > res->length())
return res;
- char *ptr=(char*) res->ptr();
- char *end=ptr+res->length();
+ ptr= (char*) res->ptr();
+ end= ptr+res->length();
if (remove_length == 1)
{
char chr=(*remove_str)[0];
@@ -1224,21 +1232,29 @@ String *Item_func_ltrim::val_str(String *str)
String *Item_func_rtrim::val_str(String *str)
{
DBUG_ASSERT(fixed == 1);
- String *res =args[0]->val_str(str);
- if ((null_value=args[0]->null_value))
- return 0; /* purecov: inspected */
- char buff[MAX_FIELD_WIDTH];
- String tmp(buff,sizeof(buff),res->charset());
- String *remove_str= (arg_count==2) ? args[1]->val_str(&tmp) : &remove;
+ char buff[MAX_FIELD_WIDTH], *ptr, *end;
+ String tmp(buff, sizeof(buff), system_charset_info);
+ String *res, *remove_str;
uint remove_length;
LINT_INIT(remove_length);
- if (!remove_str || (remove_length=remove_str->length()) == 0 ||
+ res= args[0]->val_str(str);
+ if ((null_value=args[0]->null_value))
+ return 0;
+ remove_str= &remove; /* Default value. */
+ if (arg_count == 2)
+ {
+ remove_str= args[1]->val_str(&tmp);
+ if ((null_value= args[1]->null_value))
+ return 0;
+ }
+
+ if ((remove_length= remove_str->length()) == 0 ||
remove_length > res->length())
return res;
- char *ptr=(char*) res->ptr();
- char *end=ptr+res->length();
+ ptr= (char*) res->ptr();
+ end= ptr+res->length();
#ifdef USE_MB
char *p=ptr;
register uint32 l;
@@ -1297,31 +1313,31 @@ String *Item_func_rtrim::val_str(String *str)
String *Item_func_trim::val_str(String *str)
{
DBUG_ASSERT(fixed == 1);
- String *res =args[0]->val_str(str);
- if ((null_value=args[0]->null_value))
- return 0; /* purecov: inspected */
- char buff[MAX_FIELD_WIDTH];
- String tmp(buff,sizeof(buff),res->charset());
+ char buff[MAX_FIELD_WIDTH], *ptr, *end;
+ const char *r_ptr;
+ String tmp(buff, sizeof(buff), system_charset_info);
+ String *res, *remove_str;
uint remove_length;
LINT_INIT(remove_length);
- String *remove_str; /* The string to remove from res. */
+ res= args[0]->val_str(str);
+ if ((null_value=args[0]->null_value))
+ return 0;
+ remove_str= &remove; /* Default value. */
if (arg_count == 2)
{
remove_str= args[1]->val_str(&tmp);
if ((null_value= args[1]->null_value))
return 0;
}
- else
- remove_str= &remove; /* Default value. */
- if (!remove_str || (remove_length=remove_str->length()) == 0 ||
+ if ((remove_length= remove_str->length()) == 0 ||
remove_length > res->length())
return res;
- char *ptr=(char*) res->ptr();
- char *end=ptr+res->length();
- const char *r_ptr=remove_str->ptr();
+ ptr= (char*) res->ptr();
+ end= ptr+res->length();
+ r_ptr= remove_str->ptr();
while (ptr+remove_length <= end && !memcmp(ptr,r_ptr,remove_length))
ptr+=remove_length;
#ifdef USE_MB
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 950f6c7125d..4d34ce425b1 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -1069,6 +1069,7 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
table->outer_join= table->null_row= table->maybe_null= table->force_index= 0;
table->status=STATUS_NO_RECORD;
table->keys_in_use_for_query= table->keys_in_use;
+ table->insert_values= 0;
table->used_keys= table->keys_for_keyread;
if (table->timestamp_field)
table->timestamp_field_type= table->timestamp_field->get_auto_set_type();
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 7a271daa862..41cc6ebf101 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -501,7 +501,6 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
::send_ok(thd, (ulong) thd->row_count_func, id, buff);
}
free_underlaid_joins(thd, &thd->lex->select_lex);
- table_list->clear_insert_values();
thd->abort_on_warning= 0;
DBUG_RETURN(FALSE);
@@ -511,7 +510,6 @@ abort:
end_delayed_insert(thd);
#endif
free_underlaid_joins(thd, &thd->lex->select_lex);
- table_list->clear_insert_values();
thd->abort_on_warning= 0;
DBUG_RETURN(TRUE);
}
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 1e03af7626c..096d6fa8e45 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -3009,9 +3009,6 @@ create_error:
lex->select_lex.resolve_mode= SELECT_LEX::INSERT_MODE;
delete result;
}
- /* in case of error first_table->table can be 0 */
- if (first_table->table)
- first_table->table->insert_values= 0;
/* revert changes for SP */
lex->select_lex.table_list.first= (byte*) first_table;
}
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 92d92b73813..0a35b2dda8a 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -908,7 +908,11 @@ static bool mysql_test_insert(Prepared_statement *stmt,
Item *unused_conds= 0;
if (table_list->table)
- table_list->table->insert_values=(byte *)1; // don't allocate insert_values
+ {
+ // don't allocate insert_values
+ table_list->table->insert_values=(byte *)1;
+ }
+
if ((res= mysql_prepare_insert(thd, table_list, table_list->table,
fields, values, update_fields,
update_values, duplic,
@@ -934,8 +938,7 @@ static bool mysql_test_insert(Prepared_statement *stmt,
res= 0;
error:
lex->unit.cleanup();
- if (table_list->table)
- table_list->table->insert_values=0;
+ /* insert_values is cleared in open_table */
DBUG_RETURN(res);
}
@@ -1401,6 +1404,11 @@ static int mysql_test_insert_select(Prepared_statement *stmt,
DBUG_ASSERT(first_local_table != 0);
/* Skip first table, which is the table we are inserting in */
lex->select_lex.table_list.first= (byte*) first_local_table->next_local;
+ if (tables->table)
+ {
+ // don't allocate insert_values
+ tables->table->insert_values=(byte *)1;
+ }
/*
insert/replace from SELECT give its SELECT_LEX for SELECT,
diff --git a/sql/table.cc b/sql/table.cc
index ee204347b88..e9b89d6b124 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -2026,26 +2026,6 @@ bool st_table_list::set_insert_values(MEM_ROOT *mem_root)
}
-/*
- clear insert_values reference
-
- SYNOPSIS
- clear_insert_values()
-*/
-
-void st_table_list::clear_insert_values()
-{
- if (table)
- table->insert_values= 0;
- else
- {
- DBUG_ASSERT(view && ancestor && ancestor->next_local);
- for (TABLE_LIST *tbl= ancestor; tbl; tbl= tbl->next_local)
- tbl->clear_insert_values();
- }
-}
-
-
void Field_iterator_view::set(TABLE_LIST *table)
{
ptr= table->field_translation;
diff --git a/sql/table.h b/sql/table.h
index 4f01751ea76..404ca762615 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -387,7 +387,6 @@ typedef struct st_table_list
void restore_want_privilege();
bool check_single_table(st_table_list **table, table_map map);
bool set_insert_values(MEM_ROOT *mem_root);
- void clear_insert_values();
} TABLE_LIST;
class Item;
View Lorry Controller Status