diff options
| author | unknown <monty@mysql.com> | 2004-03-06 10:43:53 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-06 10:43:53 +0200 |
| commit | 5bc89a964433cf323fe7a020cc992d9913c032a3 (patch) | |
| tree | 1fbe425dbef7c2935ed0368e7022ec59a9b8f01c /sql/sql_insert.cc | |
| parent | aa20bd9e8c44fbc14396fa418983b8c515b4e8ad (diff) | |
| parent | c0422729cf5b271d703564ff42afc621b069dfe5 (diff) | |
| download | mariadb-git-5bc89a964433cf323fe7a020cc992d9913c032a3.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index c6dcfd2c7dd..b09294cad6f 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -139,7 +139,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields, */ if ((lock_type == TL_WRITE_DELAYED && ((specialflag & (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE)) || - thd->slave_thread || !max_insert_delayed_threads)) || + thd->slave_thread || !thd->variables.max_insert_delayed_threads)) || (lock_type == TL_WRITE_CONCURRENT_INSERT && duplic == DUP_REPLACE)) lock_type=TL_WRITE; @@ -655,7 +655,7 @@ static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list) if (!(tmp=find_handler(thd,table_list))) { /* Don't create more than max_insert_delayed_threads */ - if (delayed_insert_threads >= max_insert_delayed_threads) + if (delayed_insert_threads >= thd->variables.max_insert_delayed_threads) DBUG_RETURN(0); thd->proc_info="Creating delayed handler"; pthread_mutex_lock(&LOCK_delayed_create); |