mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
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
This commit is contained in:
unknown
@ -2419,7 +2419,7 @@ static uint query_cache_hits(MYSQL *conn)
|
||||
*/
|
||||
static void test_ps_query_cache()
|
||||
{
|
||||
MYSQL *org_mysql= mysql, *lmysql;
|
||||
MYSQL *lmysql;
|
||||
MYSQL_STMT *stmt;
|
||||
int rc;
|
||||
MYSQL_BIND p_bind[2],r_bind[2]; /* p: param bind; r: result bind */
|
||||
@ -2563,8 +2563,7 @@ static void test_ps_query_cache()
|
||||
check_execute(stmt, rc);
|
||||
test_ps_query_cache_result(1, "hh", 2, 2, "hh", 2, 1, "ii", 2);
|
||||
hits2= query_cache_hits(mysql);
|
||||
switch(iteration)
|
||||
{
|
||||
switch(iteration) {
|
||||
case TEST_QCACHE_ON_WITH_OTHER_CONN:
|
||||
case TEST_QCACHE_ON: /* should have hit */
|
||||
DIE_UNLESS(hits2-hits1 == 1);
|
||||
@ -2572,6 +2571,7 @@ static void test_ps_query_cache()
|
||||
case TEST_QCACHE_OFF_ON:
|
||||
case TEST_QCACHE_ON_OFF: /* should not have hit */
|
||||
DIE_UNLESS(hits2-hits1 == 0);
|
||||
break;
|
||||
}
|
||||
|
||||
/* now modify parameter values and see qcache hits */
|
||||
@ -2582,8 +2582,7 @@ static void test_ps_query_cache()
|
||||
test_ps_query_cache_result(1, "hh", 2, 1, "ii", 2, 2, "ii", 2);
|
||||
hits1= query_cache_hits(mysql);
|
||||
|
||||
switch(iteration)
|
||||
{
|
||||
switch(iteration) {
|
||||
case TEST_QCACHE_ON:
|
||||
case TEST_QCACHE_OFF_ON:
|
||||
case TEST_QCACHE_ON_OFF: /* should not have hit */
|
||||
@ -2591,6 +2590,7 @@ static void test_ps_query_cache()
|
||||
break;
|
||||
case TEST_QCACHE_ON_WITH_OTHER_CONN: /* should have hit */
|
||||
DIE_UNLESS(hits1-hits2 == 1);
|
||||
break;
|
||||
}
|
||||
|
||||
rc= mysql_stmt_execute(stmt);
|
||||
@ -2601,8 +2601,7 @@ static void test_ps_query_cache()
|
||||
|
||||
mysql_stmt_close(stmt);
|
||||
|
||||
switch(iteration)
|
||||
{
|
||||
switch(iteration) {
|
||||
case TEST_QCACHE_ON: /* should have hit */
|
||||
DIE_UNLESS(hits2-hits1 == 1);
|
||||
break;
|
||||
@ -2613,8 +2612,6 @@ static void test_ps_query_cache()
|
||||
case TEST_QCACHE_ON_WITH_OTHER_CONN: /* should have hit */
|
||||
DIE_UNLESS(hits2-hits1 == 1);
|
||||
break;
|
||||
mysql_close(lmysql);
|
||||
mysql= org_mysql;
|
||||
}
|
||||
|
||||
} /* for(iteration=...) */
|
||||
@ -12296,24 +12293,24 @@ static void test_bug6081()
|
||||
int rc;
|
||||
myheader("test_bug6081");
|
||||
|
||||
rc= simple_command(mysql, COM_DROP_DB, current_db,
|
||||
rc= simple_command(mysql, COM_DROP_DB, (uchar*) current_db,
|
||||
(ulong)strlen(current_db), 0);
|
||||
if (rc == 0 && mysql_errno(mysql) != ER_UNKNOWN_COM_ERROR)
|
||||
{
|
||||
myerror(NULL); /* purecov: inspected */
|
||||
die(__FILE__, __LINE__, "COM_DROP_DB failed"); /* purecov: inspected */
|
||||
}
|
||||
rc= simple_command(mysql, COM_DROP_DB, current_db,
|
||||
rc= simple_command(mysql, COM_DROP_DB, (uchar*) current_db,
|
||||
(ulong)strlen(current_db), 0);
|
||||
myquery_r(rc);
|
||||
rc= simple_command(mysql, COM_CREATE_DB, current_db,
|
||||
rc= simple_command(mysql, COM_CREATE_DB, (uchar*) current_db,
|
||||
(ulong)strlen(current_db), 0);
|
||||
if (rc == 0 && mysql_errno(mysql) != ER_UNKNOWN_COM_ERROR)
|
||||
{
|
||||
myerror(NULL); /* purecov: inspected */
|
||||
die(__FILE__, __LINE__, "COM_CREATE_DB failed"); /* purecov: inspected */
|
||||
}
|
||||
rc= simple_command(mysql, COM_CREATE_DB, current_db,
|
||||
rc= simple_command(mysql, COM_CREATE_DB, (uchar*) current_db,
|
||||
(ulong)strlen(current_db), 0);
|
||||
myquery_r(rc);
|
||||
rc= mysql_select_db(mysql, current_db);
|
||||
@ -13540,7 +13537,8 @@ static void test_bug9478()
|
||||
/* Fill in the fethc packet */
|
||||
int4store(buff, stmt->stmt_id);
|
||||
buff[4]= 1; /* prefetch rows */
|
||||
rc= ((*mysql->methods->advanced_command)(mysql, COM_STMT_FETCH, buff,
|
||||
rc= ((*mysql->methods->advanced_command)(mysql, COM_STMT_FETCH,
|
||||
(uchar*) buff,
|
||||
sizeof(buff), 0,0,1,NULL) ||
|
||||
(*mysql->methods->read_query_result)(mysql));
|
||||
DIE_UNLESS(rc);
|
||||
@ -16106,7 +16104,7 @@ static void test_bug27876()
|
||||
int rc;
|
||||
MYSQL_RES *result;
|
||||
|
||||
char utf8_func[] =
|
||||
uchar utf8_func[] =
|
||||
{
|
||||
0xd1, 0x84, 0xd1, 0x83, 0xd0, 0xbd, 0xd0, 0xba,
|
||||
0xd1, 0x86, 0xd0, 0xb8, 0xd0, 0xb9, 0xd0, 0xba,
|
||||
@ -16114,7 +16112,7 @@ static void test_bug27876()
|
||||
0x00
|
||||
};
|
||||
|
||||
char utf8_param[] =
|
||||
uchar utf8_param[] =
|
||||
{
|
||||
0xd0, 0xbf, 0xd0, 0xb0, 0xd1, 0x80, 0xd0, 0xb0,
|
||||
0xd0, 0xbc, 0xd0, 0xb5, 0xd1, 0x82, 0xd1, 0x8a,
|
||||
@ -16136,23 +16134,23 @@ static void test_bug27876()
|
||||
result= mysql_store_result(mysql);
|
||||
mytest(result);
|
||||
|
||||
sprintf(query, "DROP FUNCTION IF EXISTS %s", utf8_func);
|
||||
sprintf(query, "DROP FUNCTION IF EXISTS %s", (char*) utf8_func);
|
||||
rc= mysql_query(mysql, query);
|
||||
myquery(rc);
|
||||
|
||||
sprintf(query,
|
||||
"CREATE FUNCTION %s( %s VARCHAR(25))"
|
||||
" RETURNS VARCHAR(25) DETERMINISTIC RETURN %s",
|
||||
utf8_func, utf8_param, utf8_param);
|
||||
(char*) utf8_func, (char*) utf8_param, (char*) utf8_param);
|
||||
rc= mysql_query(mysql, query);
|
||||
myquery(rc);
|
||||
sprintf(query, "SELECT %s(VERSION())", utf8_func);
|
||||
sprintf(query, "SELECT %s(VERSION())", (char*) utf8_func);
|
||||
rc= mysql_query(mysql, query);
|
||||
myquery(rc);
|
||||
result= mysql_store_result(mysql);
|
||||
mytest(result);
|
||||
|
||||
sprintf(query, "DROP FUNCTION %s", utf8_func);
|
||||
sprintf(query, "DROP FUNCTION %s", (char*) utf8_func);
|
||||
rc= mysql_query(mysql, query);
|
||||
myquery(rc);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user