mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Update VC++ files

Browse source 
Portability fixes
After merge fixes


VC++Files/mysql.dsw:
  Added dependencys
VC++Files/mysys/mysys.dsp:
  Add missing files
client/mysqlcheck.c:
  Added comment
client/mysqltest.c:
  Remove not used variables
include/keycache.h:
  Removed not used element
include/m_ctype.h:
  Portability fix
include/my_base.h:
  Removed not used define
myisam/mi_keycache.c:
  Added mutex for extra safety
mysql-test/r/count_distinct3.result:
  Faster test
mysql-test/r/rpl_change_master.result:
  updated results
mysql-test/t/count_distinct3.test:
  Faster test
mysql-test/t/rpl_change_master.test:
  Make test repeatable
mysys/default.c:
  Remove compiler warning
mysys/mf_keycache.c:
  Removed not used 'action' element
mysys/my_getopt.c:
  Remove not used variable
sql/ha_myisam.cc:
  Remove compiler warning
sql/item.cc:
  Fixed wrong patch from last changeset
sql/item_timefunc.cc:
  Remove compiler warnings
sql/set_var.cc:
  Remove compiler warnings
sql/sql_prepare.cc:
  Remove not used variables
sql/sql_repl.cc:
  After merge fix
sql/sql_select.h:
  Added comments
sql/sql_table.cc:
  Remove not used define
strings/ctype-tis620.c:
  Remove not used variables
This commit is contained in:
unknown 2003-11-21 01:53:01 +02:00
commit 3ca0fa1525
24 changed files with 96 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mysys/default.c
View file

@ -251,6 +251,7 @@ int load_defaults(const char *conf_file, const char **groups,
err:
fprintf(stderr,"Fatal error in defaults handling. Program aborted\n");
exit(1);
return 0; /* Keep compiler happy */
}

8
mysys/mf_keycache.c
View file

@ -15,8 +15,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/*
These functions are to handle keyblock cacheing
for NISAM, MISAM and PISAM databases.
These functions handle keyblock cacheing for ISAM and MyISAM tables.
One cache can handle many files.
It must contain buffers of the same blocksize.
init_key_cache() should be used to init cache handler.
@ -282,6 +282,7 @@ int init_key_cache(KEY_CACHE *keycache, uint key_cache_block_size,
if (! keycache->key_cache_inited)
{
keycache->key_cache_inited= 1;
keycache->in_init= 0;
pthread_mutex_init(&keycache->cache_lock, MY_MUTEX_INIT_FAST);
}
@ -2159,9 +2160,6 @@ restart:
}
}
if (type == FLUSH_REMOVE && keycache->action)
(*keycache->action)(keycache);
#ifndef DBUG_OFF
DBUG_EXECUTE("check_keycache",
test_key_cache(keycache, "end of flush_key_blocks", 0););

4
mysys/my_getopt.c
View file

@ -83,7 +83,7 @@ int handle_options(int *argc, char ***argv,
char *))
{
uint opt_found, argvpos= 0, length, i;
my_bool end_of_options= 0, must_be_var, set_maximum_value, special_used,
my_bool end_of_options= 0, must_be_var, set_maximum_value,
option_is_loose;
char **pos, **pos_end, *optend, *prev_found,
*opt_str, key_name[FN_REFLEN];
@ -104,7 +104,6 @@ int handle_options(int *argc, char ***argv,
char *argument= 0;
must_be_var= 0;
set_maximum_value= 0;
special_used= 0;
option_is_loose= 0;
cur_arg++; /* skip '-' */
@ -202,7 +201,6 @@ int handle_options(int *argc, char ***argv,
/*
We were called with a special prefix, we can reuse opt_found
*/
special_used= 1;
opt_str+= (special_opt_prefix_lengths[i] + 1);
if (i == OPT_LOOSE)
option_is_loose= 1;