mirror of
				https://github.com/MariaDB/server.git
				synced 2025-11-03 14:33:32 +03:00 
			
		
		
		
	Faster thr_alarm() Added 'Opened_files' status variable to track calls to my_open() Don't give warnings when running mysql_install_db Added option --source-install to mysql_install_db I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems index_read() -> index_read_map() index_read_idx() -> index_read_idx_map() index_read_last() -> index_read_last_map() BUILD/compile-solaris-sparc-forte: Updated script to current Solaris installations Now we compile by default for 64 bits client/mysql.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) client/mysql_upgrade.c: Fixed compiler warning (on Forte) client/mysqladmin.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) client/mysqlcheck.c: Fixed compiler warning (on Forte) client/mysqldump.c: Fixed compiler warning (on Forte) client/mysqlslap.c: Fixed compiler warning (on Forte) client/mysqltest.c: Fixed compiler warning (on Forte) client/sql_string.cc: Avoid compiler warnings when using C function pointers in C++ configure.in: Added detection of mtmalloc and ieeefp.h extra/replace.c: Fixed compiler warning (on Forte) include/m_ctype.h: Added some typedef's to make it easy to use C function pointers in C++ include/my_sys.h: Added my_file_total_opened (counter for calls to my_open()) include/myisam.h: Fixed compiler warning (on Forte) libmysql/libmysql.c: Fixed compiler warning (on Forte) by adding casts and change types libmysql/manager.c: Fixed compiler warning (on Forte) by adding casts and change types mysql-test/r/ctype_cp932_binlog_stm.result: Updated positions (Needed because we didn't before correctly restore collation_database after running stored procedure mysys/my_fopen.c: Count number of opened files mysys/my_open.c: Count number of opened files mysys/my_static.c: Count number of opened files mysys/thr_alarm.c: Optimization to do less alarm() and pthread_sigmask() calls. Idea is to remember time for next pending alarm and not reschedule a new alarm if it's after the current one. Before we only did this if there was other pending alarms. We don't have to use pthread_sigmask() in case of 'USE_ONE_SIGNAL_HAND' as the alarm() signal will be blocked for the calling thread anyway and no other thread will have the alarm() signal enabled to call process_alarm() regex/regcomp.c: Fixed compiler warning (on Forte) by adding casts and change types scripts/mysql_install_db.sh: Added option --source-install to allow one to create a mysql database from the source tree without installing MySQL Don't give (unnecessary) warnings server-tools/instance-manager/angel.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) server-tools/instance-manager/thread_registry.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/event_db_repository.cc: index_read() -> index_read_map() sql/event_queue.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/field.cc: Fixed compiler warnings about hidden fields sql/ha_partition.cc: Fixed compiler warnings about hidden fields index_read() -> index_read_map() sql/ha_partition.h: index_read() -> index_read_map() sql/handler.cc: Added PAGE option to row types (to prepare for future) index_read() -> index_read_map() sql/handler.h: Added ROW_TYPE_PAGE (for future) Added flag to signal if table was to be created transactionally I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems index_read() -> index_read_map() index_read_idx() -> index_read_idx_map() index_read_last() -> index_read_last_map() sql/item.cc: Fixed indentation Renamed local variable to avoid hiding class variable sql/item_cmpfunc.cc: Renamed local variable to avoid hiding class variable sql/item_cmpfunc.h: Removed not used variable sql/item_func.cc: Renamed local variable to avoid hiding class variable sql/item_strfunc.cc: Moved functions from Item_strfunc.cc sql/item_strfunc.h: Move functions to item_strfunc.cc Use C function pointer type to avoid compiler warnings (with Forte) sql/item_subselect.cc: index_read() -> index_read_map() sql/item_xmlfunc.cc: Renamed local variable to avoid hiding class variable Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/key.cc: Fixed indentation sql/log.cc: Renamed local variable to avoid hiding class variable sql/log_event.cc: Removed call to my_time() when creating class instance of Log_event() as this may have static instances. (One can't call my_time() before my_init()) index_read() -> index_read_map() Renamed local variable to avoid hiding class variable sql/log_event_old.cc: Renamed local variable to avoid hiding class variable sql/mysql_priv.h: Made all create_backup_ctx() declarations identical. This lifted up a bug where wrong create_backup_ctx() was called in some cases. Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/mysqld.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) Fixed indentation Don't call end_thr_alarm() when calling unireg_abort() as unireg_abort() already calls end_thr_alarm() Added variable 'Opened_files' (number of calls to my_open() or my_fopen()) Don't print 'loose' warnings when using --bootstrap (to avoid warnings when running mysql_install_db) Fixed compiler warnings sql/opt_range.cc: index_read() -> index_read_map() sql/opt_sum.cc: index_read() -> index_read_map() sql/partition_info.cc: Renamed local variable to avoid hiding class variable sql/rpl_filter.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/set_var.cc: Renamed local variable to avoid hiding class variable Added 'process_key_cache_t' type to avoid compiler warning (on Forte) sql/set_var.h: Added 'process_key_cache_t' type to avoid compiler warning (on Forte) sql/sp.cc: More debugging index_read() -> index_read_map() sql/sp_cache.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/sp_head.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) Moved 'saved_creation_ctx' higher up to be able to free objects allocated by create_backup_ctx() sql/sql_acl.cc: index_read() -> index_read_map() sql/sql_class.cc: Renamed local variable to avoid hiding class variable Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/sql_class.h: Renamed local variable to avoid hiding class variable sql/sql_db.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/sql_delete.cc: Renamed local variable to avoid hiding class variable sql/sql_handler.cc: index_read() -> index_read_map() sql/sql_help.cc: index_read() -> index_read_map() sql/sql_insert.cc: index_read() -> index_read_map() Renamed local variable to avoid hiding class variable sql/sql_lex.cc: Renamed local variable to avoid hiding class variable sql/sql_plugin.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) index_read() -> index_read_map() Don't give warnings about not used plugins if we are using --warnings=0 sql/sql_select.cc: index_read() -> index_read_map() sql-common/client.c: Fixed compiler warning (on Forte) sql-common/my_time.c: Removed never accessed code Fixed compiler warning (on Forte) sql/sql_servers.cc: index_read() -> index_read_map() sql/sql_show.cc: Added TRANSACTIONAL to SHOW CREATE Fixed ROW_TYPE_PAGE sql/sql_string.cc: Avoid compiler warnings when using C function pointers in C++ sql/sql_table.cc: Set create_info->transactional if we used TRANSACTIONAL=1 sql/sql_udf.cc: index_read() -> index_read_map() sql/sql_yacc.yy: Added TRANSACTIONAL=0|1 to CREATE (for future) Added row type PAGE (was only partionally handled before) sql/strfunc.cc: Avoid compiler warnings when using C function pointers in C++ sql/table.cc: More DBUG statements Declare all create_backup_ctx() functions identically Remember if table was created with TRANSACTIONAL flag or not (future safe) Renamed local variable to avoid hiding class variable sql/table.h: Remember if table was created with TRANSACTIONAL=1 sql/tztime.cc: index_read() -> index_read_map() sql-common/pack.c: Fixed compiler warning (on Forte) storage/archive/archive_reader.c: Fixed compiler warning (on Forte) storage/archive/azio.c: Fixed compiler warning (on Forte) storage/blackhole/ha_blackhole.cc: index_read() -> index_read_map() storage/blackhole/ha_blackhole.h: index_read() -> index_read_map() storage/csv/ha_tina.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) storage/example/ha_example.cc: index_read() -> index_read_map() storage/example/ha_example.h: index_read() -> index_read_map() storage/heap/ha_heap.cc: index_read() -> index_read_map() storage/heap/ha_heap.h: index_read() -> index_read_map() storage/heap/hp_test1.c: Fixed compiler warning (on Forte) storage/heap/hp_test2.c: Fixed compiler warning (on Forte) storage/myisam/ft_boolean_search.c: Fixed compiler warning (on Forte) storage/myisam/ft_nlq_search.c: Fixed compiler warning (on Forte) storage/myisam/ft_parser.c: Fixed compiler warning (on Forte) storage/myisam/ft_stopwords.c: Fixed compiler warning (on Forte) storage/myisam/ha_myisam.cc: index_read() -> index_read_map() storage/myisam/ha_myisam.h: index_read() -> index_read_map() storage/myisam/mi_check.c: Fixed compiler warning (on Forte) storage/myisam/mi_delete.c: Fixed compiler warning (on Forte) storage/myisam/mi_dynrec.c: Fixed compiler warning (on Forte) storage/myisam/mi_extra.c: Fixed compiler warning (on Forte) storage/myisam/mi_key.c: Fixed compiler warning (on Forte) storage/myisam/mi_keycache.c: Fixed compiler warning (on Forte) storage/myisam/mi_locking.c: Fixed compiler warning (on Forte) storage/myisam/mi_log.c: Fixed compiler warning (on Forte) storage/myisam/mi_open.c: Fixed compiler warning (on Forte) storage/myisam/mi_packrec.c: Fixed compiler warning (on Forte) storage/myisam/mi_page.c: Fixed compiler warning (on Forte) storage/myisam/mi_rkey.c: Added comment storage/myisam/mi_search.c: Fixed compiler warning (on Forte) storage/myisam/mi_statrec.c: Fixed compiler warning (on Forte) storage/myisam/mi_test1.c: Fixed compiler warning (on Forte) storage/myisam/mi_test2.c: Fixed compiler warning (on Forte) storage/myisam/mi_test3.c: Fixed compiler warning (on Forte) storage/myisam/mi_update.c: Fixed compiler warning (on Forte) storage/myisam/mi_write.c: Fixed compiler warning (on Forte) storage/myisam/myisamdef.h: Fixed that file_read/file_write returns type size_t Changed some functions to use uchar * as argument/return value instead of char* This fixed some compiler warnings on Forte storage/myisam/myisamlog.c: Fixed compiler warning (on Forte) storage/myisam/myisampack.c: Fixed compiler warning (on Forte) storage/myisam/rt_test.c: Fixed compiler warning (on Forte) storage/myisam/sort.c: Fixed compiler warning (on Forte) by adding casts or changing variables to uchar* storage/myisam/sp_test.c: Fixed compiler warning (on Forte) by adding casts or changing variables to uchar* storage/myisammrg/ha_myisammrg.cc: index_read() -> index_read_map() storage/myisammrg/ha_myisammrg.h: index_read() -> index_read_map() storage/myisammrg/myrg_create.c: Fixed compiler warning (on Forte) by adding casts or changing variable types storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Tdummy -> align (as in other part of cluster code) storage/ndb/src/kernel/vm/DynArr256.cpp: Removed not used variable storage/ndb/src/ndbapi/Ndb.cpp: Removed not used variable strings/strtod.c: Include ieeefp.h to avoid compiler warning tests/bug25714.c: Fixed compiler warning tests/mysql_client_test.c: Remove not used variable Fixed indentation Removed never reached code Fixed compiler warning (on Forte) by adding casts or changing variable types vio/viosocket.c: Fixed compiler warning (on Forte) by adding casts or changing variable types
		
			
				
	
	
		
			196 lines
		
	
	
		
			5.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			196 lines
		
	
	
		
			5.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/* Copyright (C) 2000-2003, 2006 MySQL AB
 | 
						|
 | 
						|
   This program is free software; you can redistribute it and/or modify
 | 
						|
   it under the terms of the GNU General Public License as published by
 | 
						|
   the Free Software Foundation; version 2 of the License.
 | 
						|
 | 
						|
   This program is distributed in the hope that it will be useful,
 | 
						|
   but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
						|
   GNU General Public License for more details.
 | 
						|
 | 
						|
   You should have received a copy of the GNU General Public License
 | 
						|
   along with this program; if not, write to the Free Software
 | 
						|
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 | 
						|
 | 
						|
/* Test av heap-database */
 | 
						|
/* Programmet skapar en heap-databas. Till denna skrivs ett antal poster.
 | 
						|
   Databasen st{ngs. D{refter |ppnas den p} nytt och en del av posterna
 | 
						|
   raderas.
 | 
						|
*/
 | 
						|
 | 
						|
#include <my_global.h>
 | 
						|
#include <my_sys.h>
 | 
						|
#include <m_string.h>
 | 
						|
#include "heap.h"
 | 
						|
 | 
						|
static int get_options(int argc, char *argv[]);
 | 
						|
 | 
						|
static int flag=0,verbose=0,remove_ant=0,flags[50];
 | 
						|
 | 
						|
int main(int argc, char **argv)
 | 
						|
{
 | 
						|
  int i,j,error,deleted;
 | 
						|
  HP_INFO *file;
 | 
						|
  uchar record[128],key[32];
 | 
						|
  const char *filename;
 | 
						|
  HP_KEYDEF keyinfo[10];
 | 
						|
  HA_KEYSEG keyseg[4];
 | 
						|
  HP_CREATE_INFO hp_create_info;
 | 
						|
  HP_SHARE *tmp_share;
 | 
						|
  MY_INIT(argv[0]);
 | 
						|
 | 
						|
  filename= "test1";
 | 
						|
  get_options(argc,argv);
 | 
						|
 | 
						|
  bzero(&hp_create_info, sizeof(hp_create_info));
 | 
						|
  hp_create_info.max_table_size= 1024L*1024L;
 | 
						|
 | 
						|
  keyinfo[0].keysegs=1;
 | 
						|
  keyinfo[0].seg=keyseg;
 | 
						|
  keyinfo[0].algorithm= HA_KEY_ALG_HASH;
 | 
						|
  keyinfo[0].seg[0].type=HA_KEYTYPE_BINARY;
 | 
						|
  keyinfo[0].seg[0].start=1;
 | 
						|
  keyinfo[0].seg[0].length=6;
 | 
						|
  keyinfo[0].seg[0].charset= &my_charset_latin1;
 | 
						|
  keyinfo[0].seg[0].null_bit= 0;
 | 
						|
  keyinfo[0].flag = HA_NOSAME;
 | 
						|
  
 | 
						|
  deleted=0;
 | 
						|
  bzero((uchar*) flags,sizeof(flags));
 | 
						|
 | 
						|
  printf("- Creating heap-file\n");
 | 
						|
  if (heap_create(filename,1,keyinfo,30,(ulong) flag*100000L,10L,
 | 
						|
		  &hp_create_info, &tmp_share) ||
 | 
						|
      !(file= heap_open(filename, 2)))
 | 
						|
    goto err;
 | 
						|
  printf("- Writing records:s\n");
 | 
						|
  strmov((char*) record,"          ..... key           ");
 | 
						|
 | 
						|
  for (i=49 ; i>=1 ; i-=2 )
 | 
						|
  {
 | 
						|
    j=i%25 +1;
 | 
						|
    sprintf((char*) key,"%6d",j);
 | 
						|
    bmove(record+1,key,6);
 | 
						|
    error=heap_write(file,record);
 | 
						|
    if (heap_check_heap(file,0))
 | 
						|
    {
 | 
						|
      puts("Heap keys crashed");
 | 
						|
      goto err;
 | 
						|
    }
 | 
						|
    flags[j]=1;
 | 
						|
    if (verbose || error) printf("J= %2d  heap_write: %d  my_errno: %d\n",
 | 
						|
       j,error,my_errno);
 | 
						|
  }
 | 
						|
  if (heap_close(file))
 | 
						|
    goto err;
 | 
						|
  printf("- Reopening file\n");
 | 
						|
  if (!(file=heap_open(filename, 2)))
 | 
						|
    goto err;
 | 
						|
 | 
						|
  printf("- Removing records\n");
 | 
						|
  for (i=1 ; i<=10 ; i++)
 | 
						|
  {
 | 
						|
    if (i == remove_ant) { VOID(heap_close(file)) ; return (0) ; }
 | 
						|
    sprintf((char*) key,"%6d",(j=(int) ((rand() & 32767)/32767.*25)));
 | 
						|
    if ((error = heap_rkey(file,record,0,key,6,HA_READ_KEY_EXACT)))
 | 
						|
    {
 | 
						|
      if (verbose || (flags[j] == 1 ||
 | 
						|
		      (error && my_errno != HA_ERR_KEY_NOT_FOUND)))
 | 
						|
	printf("key: %s  rkey:   %3d  my_errno: %3d\n",(char*) key,error,my_errno);
 | 
						|
    }
 | 
						|
    else
 | 
						|
    {
 | 
						|
      error=heap_delete(file,record);
 | 
						|
      if (error || verbose)
 | 
						|
	printf("key: %s  delete: %d  my_errno: %d\n",(char*) key,error,my_errno);
 | 
						|
      flags[j]=0;
 | 
						|
      if (! error)
 | 
						|
	deleted++;
 | 
						|
    }
 | 
						|
    if (heap_check_heap(file,0))
 | 
						|
    {
 | 
						|
      puts("Heap keys crashed");
 | 
						|
      goto err;
 | 
						|
    }
 | 
						|
  }
 | 
						|
 | 
						|
  printf("- Reading records with key\n");
 | 
						|
  for (i=1 ; i<=25 ; i++)
 | 
						|
  {
 | 
						|
    sprintf((char*) key,"%6d",i);
 | 
						|
    bmove(record+1,key,6);
 | 
						|
    my_errno=0;
 | 
						|
    error=heap_rkey(file,record,0,key,6,HA_READ_KEY_EXACT);
 | 
						|
    if (verbose ||
 | 
						|
	(error == 0 && flags[i] != 1) ||
 | 
						|
	(error && (flags[i] != 0 || my_errno != HA_ERR_KEY_NOT_FOUND)))
 | 
						|
    {
 | 
						|
      printf("key: %s  rkey: %3d  my_errno: %3d  record: %s\n",
 | 
						|
             (char*) key,error,my_errno,record+1);
 | 
						|
    }
 | 
						|
  }
 | 
						|
 | 
						|
#ifdef OLD_HEAP_VERSION
 | 
						|
  {
 | 
						|
    int found;
 | 
						|
    printf("- Reading records with position\n");
 | 
						|
    for (i=1,found=0 ; i <= 30 ; i++)
 | 
						|
    {
 | 
						|
      my_errno=0;
 | 
						|
      if ((error=heap_rrnd(file,record,i == 1 ? 0L : (ulong) -1)) ==
 | 
						|
	  HA_ERR_END_OF_FILE)
 | 
						|
      {
 | 
						|
	if (found != 25-deleted)
 | 
						|
	  printf("Found only %d of %d records\n",found,25-deleted);
 | 
						|
	break;
 | 
						|
      }
 | 
						|
      if (!error)
 | 
						|
	found++;
 | 
						|
      if (verbose || (error != 0 && error != HA_ERR_RECORD_DELETED))
 | 
						|
      {
 | 
						|
	printf("pos: %2d  ni_rrnd: %3d  my_errno: %3d  record: %s\n",
 | 
						|
	       i-1,error,my_errno,(char*) record+1);
 | 
						|
      }
 | 
						|
    }
 | 
						|
  }
 | 
						|
#endif
 | 
						|
 | 
						|
  if (heap_close(file) || hp_panic(HA_PANIC_CLOSE))
 | 
						|
    goto err;
 | 
						|
  my_end(MY_GIVE_INFO);
 | 
						|
  return(0);
 | 
						|
err:
 | 
						|
  printf("got error: %d when using heap-database\n",my_errno);
 | 
						|
  return(1);
 | 
						|
} /* main */
 | 
						|
 | 
						|
 | 
						|
/* Read options */
 | 
						|
 | 
						|
static int get_options(int argc, char **argv)
 | 
						|
{
 | 
						|
  char *pos;
 | 
						|
 | 
						|
  while (--argc >0 && *(pos = *(++argv)) == '-' ) {
 | 
						|
    switch(*++pos) {
 | 
						|
    case 'B':				/* Big file */
 | 
						|
      flag=1;
 | 
						|
      break;
 | 
						|
    case 'v':				/* verbose */
 | 
						|
      verbose=1;
 | 
						|
      break;
 | 
						|
    case 'm':
 | 
						|
      remove_ant=atoi(++pos);
 | 
						|
      break;
 | 
						|
    case 'V':
 | 
						|
      printf("hp_test1    Ver 3.0 \n");
 | 
						|
      exit(0);
 | 
						|
    case '#':
 | 
						|
      DBUG_PUSH (++pos);
 | 
						|
      break;
 | 
						|
    }
 | 
						|
  }
 | 
						|
  return 0;
 | 
						|
} /* get options */
 |