mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes.
client/mysqlbinlog.cc: Portability fix configure.in: Added use of ASFLAGS (For Solaris with Forte 5.0) include/my_global.h: Portability fix include/myisam.h: Portability fix include/queues.h: Portability fix innobase/include/ut0ut.h: Portability fix innobase/log/log0log.c: Portability fix innobase/rem/rem0cmp.c: Portability fix innobase/trx/trx0sys.c: Portability fix isam/pack_isam.c: Portability fix myisam/ft_boolean_search.c: Portability fix myisam/mi_dynrec.c: Code change to go around bug in Forte 5.0 myisam/sort.c: Portability fix mysys/my_aes.c: Portability fix scripts/Makefile.am: Support for ASFLAGS scripts/mysqlbug.sh: Support for ASFLAGS sql/field.cc: Portability fix sql/filesort.cc: Portability fix sql/gen_lex_hash.cc: Portability fix sql/ha_innodb.cc: Portability fix Changed SHOW INNODB STATUS to return error instead of writing message to log file. sql/ha_isammrg.cc: Portability fix sql/ha_myisam.cc: Portability fix sql/ha_myisammrg.cc: Portability fix sql/hash_filo.h: Portability fix sql/hostname.cc: Portability fix sql/item_cmpfunc.h: Indentation change sql/item_func.cc: Portability fix sql/item_func.h: Portability fix sql/log.cc: Portability fix sql/log_event.cc: Portability fix sql/mysql_priv.h: Portability fix sql/mysqld.cc: Portability fix Fixed bug with rpl_recovery_rank command line option on 64 bit systems sql/opt_range.cc: Portability fix sql/repl_failsafe.cc: Portability fix sql/slave.cc: Portability fix sql/slave.h: Portability fix sql/sql_acl.cc: Portability fix sql/sql_base.cc: Portability fix sql/sql_cache.cc: Portability fix sql/sql_cache.h: Portability fix sql/sql_class.cc: Portability fix sql/sql_delete.cc: Portability fix sql/sql_insert.cc: Portability fix sql/sql_manager.cc: Portability fix sql/sql_parse.cc: Portability fix BUILD/compile-solaris-sparc-forte: C sql/sql_udf.cc: Portability fix sql/sql_update.cc: Portability fix strings/Makefile.am: Portability fix strings/bmove_upp-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/str_test.c: Cleanup strings/strappend-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strend-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strmake-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strmov-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strnmov-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strstr-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strxmov-sparc.s: Fixes to make this more portable, but it's still not usable on 64 bit systems :( BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
This commit is contained in:
@@ -59,14 +59,14 @@ template class List_iterator<Alter_column>;
|
||||
** User variables
|
||||
****************************************************************************/
|
||||
|
||||
static byte* get_var_key(user_var_entry *entry, uint *length,
|
||||
my_bool not_used __attribute__((unused)))
|
||||
extern "C" static byte *get_var_key(user_var_entry *entry, uint *length,
|
||||
my_bool not_used __attribute__((unused)))
|
||||
{
|
||||
*length=(uint) entry->name.length;
|
||||
return (byte*) entry->name.str;
|
||||
}
|
||||
|
||||
static void free_var(user_var_entry *entry)
|
||||
extern "C" static void free_var(user_var_entry *entry)
|
||||
{
|
||||
char *pos= (char*) entry+ALIGN_SIZE(sizeof(*entry));
|
||||
if (entry->value && entry->value != pos)
|
||||
@@ -148,7 +148,7 @@ THD::THD():user_time(0),fatal_error(0),last_insert_id_used(0),
|
||||
user_connect=(USER_CONN *)0;
|
||||
hash_init(&user_vars, USER_VARS_HASH_SIZE, 0, 0,
|
||||
(hash_get_key) get_var_key,
|
||||
(void (*)(void*)) free_var,0);
|
||||
(hash_free_key) free_var,0);
|
||||
#ifdef USING_TRANSACTIONS
|
||||
bzero((char*) &transaction,sizeof(transaction));
|
||||
if (opt_using_transactions)
|
||||
@@ -320,20 +320,21 @@ void THD::add_changed_table(TABLE *table)
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
|
||||
void THD::add_changed_table(const char *key, long key_length)
|
||||
{
|
||||
DBUG_ENTER("THD::add_changed_table(key)");
|
||||
CHANGED_TABLE_LIST** prev = &transaction.changed_tables;
|
||||
CHANGED_TABLE_LIST* curr = transaction.changed_tables;
|
||||
CHANGED_TABLE_LIST **prev_changed = &transaction.changed_tables;
|
||||
CHANGED_TABLE_LIST *curr = transaction.changed_tables;
|
||||
|
||||
for (; curr; prev = &(curr->next), curr = curr->next)
|
||||
for (; curr; prev_changed = &(curr->next), curr = curr->next)
|
||||
{
|
||||
int cmp = (long)curr->key_length - (long)key_length;
|
||||
if (cmp < 0)
|
||||
{
|
||||
list_include(prev, curr, changed_table_dup(key, key_length));
|
||||
list_include(prev_changed, curr, changed_table_dup(key, key_length));
|
||||
DBUG_PRINT("info",
|
||||
("key_length %u %u", key_length, (*prev)->key_length));
|
||||
("key_length %u %u", key_length, (*prev_changed)->key_length));
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
else if (cmp == 0)
|
||||
@@ -341,10 +342,10 @@ void THD::add_changed_table(const char *key, long key_length)
|
||||
cmp = memcmp(curr->key, key, curr->key_length);
|
||||
if (cmp < 0)
|
||||
{
|
||||
list_include(prev, curr, changed_table_dup(key, key_length));
|
||||
list_include(prev_changed, curr, changed_table_dup(key, key_length));
|
||||
DBUG_PRINT("info",
|
||||
("key_length %u %u", key_length,
|
||||
(*prev)->key_length));
|
||||
(*prev_changed)->key_length));
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
else if (cmp == 0)
|
||||
@@ -354,9 +355,9 @@ void THD::add_changed_table(const char *key, long key_length)
|
||||
}
|
||||
}
|
||||
}
|
||||
*prev = changed_table_dup(key, key_length);
|
||||
*prev_changed = changed_table_dup(key, key_length);
|
||||
DBUG_PRINT("info", ("key_length %u %u", key_length,
|
||||
(*prev)->key_length));
|
||||
(*prev_changed)->key_length));
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user