summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
diff options
context:
space:
mode:
authorunknown <monty@mishka.mysql.fi>2003-10-06 22:56:34 +0300
committerunknown <monty@mishka.mysql.fi>2003-10-06 22:56:34 +0300
commit0e93376e71bd719658bbf99e413d51d7ee349dee (patch)
tree42623f3710505740b5171a6d3e6cdcb4aa119084 /sql/sql_insert.cc
parentbd7470241b0883b5bacc0f741e828a13773e7eec (diff)
downloadmariadb-git-0e93376e71bd719658bbf99e413d51d7ee349dee.tar.gz
Move init_compiled_charsets to own file
Remove dependency of charsets (in my_init) to get smaller binaries when charsets are not used Simple code cleanup client/mysql.cc: Fixed indentation include/my_sys.h: Move init_compiled_charsets to own file include/mysql.h: Remove compiler warning libmysql/Makefile.shared: Move init_compiled_charsets to own file mysys/Makefile.am: Move init_compiled_charsets to own file mysys/charset.c: Move init_compiled_charsets to own file mysys/my_init.c: Remove dependency of charsets scripts/mysql_create_system_tables.sh: Remove run time warning scripts/mysql_fix_privilege_tables.sql: Add help tables sql/sql_insert.cc: Code cleanup
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r--sql/sql_insert.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index af28d48ed8a..d523d868514 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -172,13 +172,15 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list,
}
}
if ((table= delayed_get_table(thd,table_list)) && !thd->is_fatal_error)
- if (table_list->next && table)
+ {
+ res= 0;
+ if (table_list->next) /* if sub select */
res= open_and_lock_tables(thd, table_list->next);
- else
- res= (table == 0);
+ }
else
{
- lock_type=TL_WRITE;
+ /* Too many delayed insert threads; Use a normal insert */
+ table_list->lock_type= lock_type= TL_WRITE;
res= open_and_lock_tables(thd, table_list);
}
}