From fe4cccd6a43496395ec52e9043cd4350e5eac69d Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 12 Sep 2000 03:02:33 +0300 Subject: Update to new root alloc, OPTIMIZE TABLE and some other changes Docs/manual.texi: Added chapter for binary log, updated the changelog, linux section, OPTIMIZE TABLE... client/mysqladmin.c: Fixed bug with pid-file handling. client/mysqldump.c: Version change configure.in: Version change include/Makefile.am: Fix for SCO to get sched.h removed. include/global.h: Increased MY_NFILE; Added thread_safe_increment include/my_sys.h: Better root_alloc include/mysql.h: Better root_alloc include/mysys_err.h: Fix for PREAD/PWRITE on windows libmysql/libmysql.c: Better root_alloc myisam/mi_locking.c: Fix for PREAD/PWRITE on windows myisam/mi_static.c: Fix for PREAD/PWRITE on windows mysys/default.c: Better root_alloc mysys/errors.c: Fix for PREAD/PWRITE on windows mysys/my_alloc.c: Better root_alloc mysys/my_create.c: Fix for PREAD/PWRITE on windows mysys/my_fopen.c: Fix for PREAD/PWRITE on windows mysys/my_open.c: Fix for PREAD/PWRITE on windows mysys/my_pread.c: Fix for PREAD/PWRITE on windows mysys/tree.c: Better root_alloc readline/bind.c: Removed compiler warning readline/isearch.c: Removed compiler warning scripts/safe_mysqld.sh: Allow use of MYSQL_UNIX_PORT and MYSQL_TCP_PORT sql-bench/crash-me.sh: Version change sql-bench/limits/mysql-3.23.cfg: Update to latest MySQL version sql/filesort.cc: Added more statistics sql/ha_berkeley.h: Fixed bug with ORDER BY sql/ha_myisam.cc: Added OPTIMIZE TABLE and cleaned up the repair code sql/ha_myisam.h: Added OPTIMIZE TABLE and cleaned up the repair code sql/handler.cc: Added OPTIMIZE TABLE and cleaned up the repair code sql/handler.h: Added OPTIMIZE TABLE and cleaned up the repair code sql/item_func.cc: Fixed comment sql/item_timefunc.cc: Fixed possible month bug sql/mini_client.cc: Use of new root_alloc sql/mysql_priv.h: Added OPTIMIZE TABLE and cleaned up the repair code sql/mysqld.cc: Added more statistics sql/opt_range.cc: Use of new root_alloc sql/slave.cc: Use of new root_alloc sql/sql_acl.cc: Use of new root_alloc sql/sql_class.cc: Use of new root_alloc sql/sql_parse.cc: Use of new root_alloc sql/sql_select.cc: Added more statistics sql/sql_table.cc: Added OPTIMIZE TABLE and cleaned up the repair code sql/sql_udf.cc: Use of new root_alloc sql/sql_yacc.yy: Fixed that OPTIMIZE TABLE can take many tables as arguments sql/table.cc: Use of new root_alloc sql/thr_malloc.cc: Use of new root_alloc support-files/mysql.server.sh: Removed usage of AWK --- sql/sql_parse.cc | 55 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 26 deletions(-) (limited to 'sql/sql_parse.cc') diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 007e90e7ec0..2e559b54b48 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -394,11 +394,13 @@ pthread_handler_decl(handle_one_connection,arg) thd->proc_info=0; // Remove 'login' thd->version=refresh_version; thd->set_time(); + init_sql_alloc(&thd->mem_root,8192,8192); while (!net->error && net->vio != 0 && !thd->killed) { if (do_command(thd)) break; } + free_root(&thd->mem_root,MYF(0)); if (net->error && net->vio != 0) { sql_print_error(ER(ER_NEW_ABORTING_CONNECTION), @@ -453,13 +455,13 @@ int handle_bootstrap(THD *thd,FILE *file) thd->version=refresh_version; char *buff= (char*) thd->net.buff; + init_sql_alloc(&thd->mem_root,8192,8192); while (fgets(buff, thd->net.max_packet, file)) { uint length=(uint) strlen(buff); while (length && (isspace(buff[length-1]) || buff[length-1] == ';')) length--; buff[length]=0; - init_sql_alloc(&thd->mem_root,8192); thd->current_tablenr=0; thd->query= thd->memdup(buff,length+1); thd->query_id=query_id++; @@ -469,8 +471,9 @@ int handle_bootstrap(THD *thd,FILE *file) { DBUG_RETURN(-1); } - free_root(&thd->mem_root); + free_root(&thd->mem_root,MYF(MY_KEEP_PREALLOC)); } + free_root(&thd->mem_root,MYF(0)); DBUG_RETURN(0); } @@ -537,7 +540,6 @@ bool do_command(THD *thd) enum enum_server_command command; DBUG_ENTER("do_command"); - init_sql_alloc(&thd->mem_root,8192); net= &thd->net; thd->current_tablenr=0; @@ -741,7 +743,7 @@ bool do_command(THD *thd) send_eof(net); // This is for 'quit request' close_connection(net); close_thread_tables(thd); // Free before kill - free_root(&thd->mem_root); + free_root(&thd->mem_root,MYF(0)); kill_mysql(); error=TRUE; break; @@ -822,7 +824,7 @@ bool do_command(THD *thd) thread_running--; VOID(pthread_mutex_unlock(&LOCK_thread_count)); thd->packet.shrink(net_buffer_length); // Reclaim some memory - free_root(&thd->mem_root); + free_root(&thd->mem_root,MYF(MY_KEEP_PREALLOC)); DBUG_RETURN(error); } @@ -1191,33 +1193,34 @@ mysql_execute_command(void) if (check_db_used(thd,tables) || check_table_access(thd,SELECT_ACL | INSERT_ACL, tables)) goto error; /* purecov: inspected */ - res = mysql_analyze_table(thd, tables); + res = mysql_analyze_table(thd, tables, &lex->check_opt); break; } + case SQLCOM_OPTIMIZE: { HA_CREATE_INFO create_info; - /* This is now done with ALTER TABLE, but should be done with isamchk */ - if (!tables->db) - tables->db=thd->db; - if (check_access(thd,SELECT_ACL | INSERT_ACL,tables->db, - &tables->grant.privilege)) + if (check_db_used(thd,tables) || + check_table_access(thd,SELECT_ACL | INSERT_ACL, tables)) goto error; /* purecov: inspected */ - if (grant_option && check_grant(thd,SELECT_ACL | INSERT_ACL,tables)) - goto error; - - lex->create_list.empty(); - lex->key_list.empty(); - lex->col_list.empty(); - lex->drop_list.empty(); - lex->alter_list.empty(); - bzero((char*) &create_info,sizeof(create_info)); - create_info.db_type=DB_TYPE_DEFAULT; - create_info.row_type=ROW_TYPE_DEFAULT; - res= mysql_alter_table(thd, NullS, NullS, &create_info, - tables, lex->create_list, - lex->key_list, lex->drop_list, lex->alter_list, - 0,DUP_ERROR); + if (specialflag & (SPECIAL_SAFE_MODE | SPECIAL_NO_NEW_FUNC)) + { + /* Use ALTER TABLE */ + lex->create_list.empty(); + lex->key_list.empty(); + lex->col_list.empty(); + lex->drop_list.empty(); + lex->alter_list.empty(); + bzero((char*) &create_info,sizeof(create_info)); + create_info.db_type=DB_TYPE_DEFAULT; + create_info.row_type=ROW_TYPE_DEFAULT; + res= mysql_alter_table(thd, NullS, NullS, &create_info, + tables, lex->create_list, + lex->key_list, lex->drop_list, lex->alter_list, + 0,DUP_ERROR); + } + else + res = mysql_optimize_table(thd, tables, &lex->check_opt); break; } case SQLCOM_UPDATE: -- cgit v1.2.1