diff options
| author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-05-28 14:37:39 +0300 |
|---|---|---|
| committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-05-28 14:37:39 +0300 |
| commit | 64a82941b440b0ef4a73ebabda342d250e24c5ea (patch) | |
| tree | d48a62e875abb58e12ad6ba1fb0c283e47bedea6 /sql | |
| parent | de6d58e6a26a158bd2060b1321cedbe7e1fc408c (diff) | |
| download | mariadb-git-64a82941b440b0ef4a73ebabda342d250e24c5ea.tar.gz | |
Changed accidently added tabs back into spaces.
Fixed a bug that came in merge.
client/mysqltest.c:
Changed accidently added tabs back into spaces.
mysys/array.c:
Changed accidently added tabs back into spaces.
sql/set_var.cc:
Changed accidently added tabs back into spaces.
sql/sql_insert.cc:
Removed accidently included line in merge.
sql/sql_yacc.yy:
Changed accidently added tabs back into spaces.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/set_var.cc | 2 | ||||
| -rw-r--r-- | sql/sql_insert.cc | 1 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 95f55be587a..bf6a503762c 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1864,7 +1864,7 @@ void sys_var_collation_sv::set_default(THD *thd, enum_var_type type) uchar *sys_var_collation_sv::value_ptr(THD *thd, enum_var_type type, - LEX_STRING *base) + LEX_STRING *base) { CHARSET_INFO *cs= ((type == OPT_GLOBAL) ? global_system_variables.*offset : thd->variables.*offset); diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index c75bd2c215d..5c8d2cb0c30 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1866,7 +1866,6 @@ bool delayed_get_table(THD *thd, TABLE_LIST *table_list) DBUG_RETURN((table_list->table == NULL)); end_create: - thd->fatal_error(); pthread_mutex_unlock(&LOCK_delayed_create); DBUG_RETURN(thd->net.report_error); } diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 5c21adf3c8f..33112cd8390 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -10191,7 +10191,7 @@ option_type_value: qbuff.length= lip->tok_end - sp->m_tmp_query; if (!(qbuff.str= (char*) alloc_root(thd->mem_root, - qbuff.length + 5))) + qbuff.length + 5))) MYSQL_YYABORT; strmake(strmake(qbuff.str, "SET ", 4), sp->m_tmp_query, |