diff options
author | unknown <monty@donna.mysql.fi> | 2001-03-09 03:38:18 +0200 |
---|---|---|
committer | unknown <monty@donna.mysql.fi> | 2001-03-09 03:38:18 +0200 |
commit | 7957ec7e339177d246a34491ccdda9851fc00956 (patch) | |
tree | 816c1657d4d15fbff641ddc882052d6536790ed5 /sql | |
parent | f34ebbd06a4522f37c7528ec3692a7a6fb6aaa0a (diff) | |
download | mariadb-git-7957ec7e339177d246a34491ccdda9851fc00956.tar.gz |
Fixed wrong option in mysql_install_db
Added delayed_user for delayed_threads
Don't use record cache when doing deletes
Docs/manual.texi:
Added link to activestate perl
mysql-test/t/delayed.test:
Added sleep for slow machines
scripts/mysql_install_db.sh:
Fixed wrong option
sql-bench/crash-me.sh:
Intialize some variables
sql/mysql_priv.h:
Added delayed_user for delayed_threads
sql/mysqld.cc:
Added delayed_user for delayed_threads
sql/sql_class.cc:
Added delayed_user for delayed_threads
sql/sql_delete.cc:
Don't use record cache when doing deletes
sql/sql_insert.cc:
Added delayed_user for delayed_threads
tests/fork3_test.pl:
Added periodic check/repair of table
Diffstat (limited to 'sql')
-rw-r--r-- | sql/mysql_priv.h | 2 | ||||
-rw-r--r-- | sql/mysqld.cc | 3 | ||||
-rw-r--r-- | sql/sql_class.cc | 3 | ||||
-rw-r--r-- | sql/sql_delete.cc | 2 | ||||
-rw-r--r-- | sql/sql_insert.cc | 3 |
5 files changed, 8 insertions, 5 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index b9fd954486b..7348563cee6 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -477,7 +477,7 @@ extern uint32 server_id; extern char mysql_data_home[2],server_version[SERVER_VERSION_LENGTH], max_sort_char, mysql_real_data_home[]; extern my_string mysql_unix_port,mysql_tmpdir; -extern const char *first_keyword, *localhost; +extern const char *first_keyword, *localhost, *delayed_user; extern ulong refresh_version,flush_version, thread_id,query_id,opened_tables, created_tmp_tables, created_tmp_disk_tables, aborted_threads,aborted_connects, diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 22e44b2b325..a25ac8bdbfb 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -243,6 +243,7 @@ volatile ulong cached_thread_count=0; my_string master_user = (char*) "test", master_password = 0, master_host=0, master_info_file = (char*) "master.info"; const char *localhost=LOCAL_HOST; +const char *delayed_user="DELAYED"; uint master_port = MYSQL_PORT, master_connect_retry = 60; ulong max_tmp_tables,max_heap_table_size; @@ -2364,7 +2365,7 @@ pthread_handler_decl(handle_connections_namedpipes,arg) continue; } /* host name is unknown */ - thd->host = my_strdup("localhost",MYF(0)); /* Host is unknown */ + thd->host = my_strdup(localhost,MYF(0)); /* Host is unknown */ create_new_thread(thd); } diff --git a/sql/sql_class.cc b/sql/sql_class.cc index abe7fad822c..30eeb2e5e2c 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -176,7 +176,8 @@ THD::~THD() if (host != localhost) // If not pointer to constant safeFree(host); - safeFree(user); + if (user != delayed_user) + safeFree(user); safeFree(db); safeFree(ip); free_root(&mem_root,MYF(0)); diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index e1196341bef..fc150b08a69 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -192,7 +192,7 @@ int mysql_delete(THD *thd,TABLE_LIST *table_list,COND *conds,ha_rows limit, (void) table->file->extra(HA_EXTRA_NO_READCHECK); if (options & OPTION_QUICK) (void) table->file->extra(HA_EXTRA_QUICK); - init_read_record(&info,thd,table,select,1,1); + init_read_record(&info,thd,table,select,0,1); ulong deleted=0L; thd->proc_info="updating"; while (!(error=info.read_record(&info)) && !thd->killed) diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 8e8f46b2e1f..e92c5255ef8 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -489,7 +489,8 @@ public: table(0),tables_in_use(0),stacked_inserts(0), status(0), dead(0), group_count(0) { - thd.user=0; thd.host=(char*) localhost; + thd.user=thd.priv_user=(char*) delayed_user; + thd.host=(char*) localhost; thd.current_tablenr=0; thd.version=refresh_version; thd.command=COM_DELAYED_INSERT; |