Below is the list of changes that have just been committed into a local
5.1 repository of monty. When monty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-02-23 06:39:58+02:00, monty@stripped +49 -0
Fixed compiler warnings
Fixed compiler error on windows
BitKeeper/etc/ignore@stripped, 2007-02-23 06:39:24+02:00, monty@stripped +1 -0
added storage/ndb/src/ndbapi/ndberror_check
client/mysqltest.c@stripped, 2007-02-23 06:39:54+02:00, monty@stripped +3 -3
Fixed compiler warnings
cmd-line-utils/readline/xmalloc.c@stripped, 2007-02-23 06:39:54+02:00, monty@stripped +3 -4
Fixed compiler warnings
extra/charset2html.c@stripped, 2007-02-23 06:39:54+02:00, monty@stripped +2 -0
Fixed compiler warnings
extra/yassl/include/lock.hpp@stripped, 2007-02-23 06:39:54+02:00, monty@stripped +1 -1
Fix for windows64
extra/yassl/include/openssl/ssl.h@stripped, 2007-02-23 06:39:54+02:00, monty@stripped +1 -1
Fixed type in previous push
extra/yassl/include/socket_wrapper.hpp@stripped, 2007-02-23 06:39:54+02:00, monty@stripped +2 -2
Fix for windows64
extra/yassl/include/yassl.hpp@stripped, 2007-02-23 06:39:54+02:00, monty@stripped +1 -1
Fix for windows64
libmysqld/CMakeLists.txt@stripped, 2007-02-23 06:39:54+02:00, monty@stripped +1 -0
Added missing files
mysys/thr_alarm.c@stripped, 2007-02-23 06:39:55+02:00, monty@stripped +1 -1
Fixed compiler warning on windows
mysys/thr_lock.c@stripped, 2007-02-23 06:39:55+02:00, monty@stripped +2 -0
Fixed compiler warning
server-tools/instance-manager/instance.cc@stripped, 2007-02-23 06:39:55+02:00, monty@stripped +1 -1
Fixed compiler warning
sql/CMakeLists.txt@stripped, 2007-02-23 06:39:55+02:00, monty@stripped +1 -0
Added missing files
sql/item_func.cc@stripped, 2007-02-23 06:39:55+02:00, monty@stripped +1 -1
Fixed compiler warning
sql/item_strfunc.cc@stripped, 2007-02-23 06:39:55+02:00, monty@stripped +1 -1
Fixed compiler warning
sql/log.cc@stripped, 2007-02-23 06:39:55+02:00, monty@stripped +4 -4
Fixed compiler warning
sql/log_event.cc@stripped, 2007-02-23 06:39:55+02:00, monty@stripped +4 -4
Fixed compiler warning
sql/mysqld.cc@stripped, 2007-02-23 06:39:55+02:00, monty@stripped +1 -0
Fixed compiler warning
sql/set_var.cc@stripped, 2007-02-23 06:39:55+02:00, monty@stripped +3 -3
Fixed compiler warning
sql/set_var.h@stripped, 2007-02-23 06:39:55+02:00, monty@stripped +1 -1
Fixed compiler warning
sql/sql_class.cc@stripped, 2007-02-23 06:39:55+02:00, monty@stripped +1 -1
Fixed compiler warning
sql/sql_partition.cc@stripped, 2007-02-23 06:39:55+02:00, monty@stripped +1 -1
Fixed compiler warning
sql/sql_select.cc@stripped, 2007-02-23 06:39:55+02:00, monty@stripped +4 -2
Fixed compiler warning
sql/sql_table.cc@stripped, 2007-02-23 06:39:55+02:00, monty@stripped +1 -1
Fixed compiler warning
sql/tztime.cc@stripped, 2007-02-23 06:39:55+02:00, monty@stripped +2 -2
Fixed compiler warning
storage/archive/azio.c@stripped, 2007-02-23 06:39:55+02:00, monty@stripped +2 -2
Fixed compiler warning
storage/innobase/dict/dict0crea.c@stripped, 2007-02-23 06:39:55+02:00, monty@stripped +2 -2
Fixed compiler warnings detected on windows64
storage/innobase/dict/dict0dict.c@stripped, 2007-02-23 06:39:55+02:00, monty@stripped +5 -5
Fixed compiler warnings detected on windows64
storage/innobase/dict/dict0load.c@stripped, 2007-02-23 06:39:55+02:00, monty@stripped +3 -3
Fixed compiler warnings detected on windows64
storage/innobase/dict/dict0mem.c@stripped, 2007-02-23 06:39:55+02:00, monty@stripped +11 -11
Fixed compiler warnings detected on windows64
storage/innobase/eval/eval0proc.c@stripped, 2007-02-23 06:39:55+02:00, monty@stripped +1 -1
Fixed compiler warnings detected on windows64
storage/innobase/handler/ha_innodb.cc@stripped, 2007-02-23 06:39:56+02:00, monty@stripped +8 -7
Fixed compiler warnings detected on windows64
storage/innobase/mtr/mtr0log.c@stripped, 2007-02-23 06:39:56+02:00, monty@stripped +1 -1
Fixed compiler warnings detected on windows64
storage/innobase/rem/rem0cmp.c@stripped, 2007-02-23 06:39:56+02:00, monty@stripped +1 -1
Fixed compiler warnings detected on windows64
storage/innobase/row/row0mysql.c@stripped, 2007-02-23 06:39:56+02:00, monty@stripped +2 -2
Fixed compiler warnings detected on windows64
storage/innobase/row/row0sel.c@stripped, 2007-02-23 06:39:56+02:00, monty@stripped +1 -1
Fixed compiler warnings detected on windows64
storage/innobase/sync/sync0rw.c@stripped, 2007-02-23 06:39:56+02:00, monty@stripped +4 -4
Fixed compiler warnings detected on windows64
storage/innobase/trx/trx0trx.c@stripped, 2007-02-23 06:39:56+02:00, monty@stripped +1 -1
Fixed compiler warnings detected on windows64
storage/myisam/mi_packrec.c@stripped, 2007-02-23 06:39:56+02:00, monty@stripped +1 -1
Fixed compiler warnings detected on windows64
storage/ndb/src/kernel/blocks/backup/Backup.cpp@stripped, 2007-02-23 06:39:56+02:00, monty@stripped +0 -2
Fixed compiler warnings detected on windows64
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@stripped, 2007-02-23 06:39:56+02:00, monty@stripped +0 -1
Fixed compiler warnings detected on windows64
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-02-23 06:39:56+02:00, monty@stripped +0 -2
Fixed compiler warnings detected on windows64
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@stripped, 2007-02-23 06:39:56+02:00, monty@stripped +0 -1
Fixed compiler warnings detected on windows64
storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp@stripped, 2007-02-23 06:39:56+02:00, monty@stripped +0 -1
Fixed compiler warnings detected on windows64
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@stripped, 2007-02-23 06:39:56+02:00, monty@stripped +1 -1
Fixed compiler warnings detected on windows64
storage/ndb/tools/restore/consumer_restore.cpp@stripped, 2007-02-23 06:39:56+02:00, monty@stripped +5 -1
Fixed compiler warnings detected on windows64
strings/ctype-utf8.c@stripped, 2007-02-23 06:39:56+02:00, monty@stripped +1 -1
Fixed compiler warnings detected on windows64
strings/my_strchr.c@stripped, 2007-02-23 06:39:56+02:00, monty@stripped +1 -1
Fixed conflict between function and prototype
support-files/compiler_warnings.supp@stripped, 2007-02-23 06:39:56+02:00, monty@stripped +9 -2
More suppression
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: monty
# Host: narttu.mysql.fi
# Root: /home/my/mysql-5.1
--- 1.46/storage/myisam/mi_packrec.c 2007-02-22 17:48:13 +02:00
+++ 1.47/storage/myisam/mi_packrec.c 2007-02-23 06:39:56 +02:00
@@ -564,7 +564,7 @@
*/
value|= (max_bits - bits) << 8 | IS_CHAR;
- for (end= table + ((uint) 1 << bits); table < end; table++)
+ for (end= table + (uint) (((uint) 1 << bits)); table < end; table++)
{
*table= (uint16) value;
}
--- 1.57/mysys/thr_alarm.c 2007-02-22 22:13:22 +02:00
+++ 1.58/mysys/thr_alarm.c 2007-02-23 06:39:55 +02:00
@@ -568,7 +568,7 @@
#else /* __WIN__ */
-void thr_alarm_kill(pthread_t thread_id)
+void thr_alarm_kill(my_thread_id thread_id)
{
/* Can't do this yet */
}
--- 1.58/mysys/thr_lock.c 2007-02-22 10:50:29 +02:00
+++ 1.59/mysys/thr_lock.c 2007-02-23 06:39:55 +02:00
@@ -1140,7 +1140,9 @@
enum thr_lock_type new_lock_type)
{
THR_LOCK *lock=in_data->lock;
+#ifndef DBUG_OFF
enum thr_lock_type old_lock_type= in_data->type;
+#endif
#ifdef TO_BE_REMOVED
THR_LOCK_DATA *data, *next;
bool start_writers= FALSE;
--- 1.8/cmd-line-utils/readline/xmalloc.c 2007-02-22 16:59:54 +02:00
+++ 1.9/cmd-line-utils/readline/xmalloc.c 2007-02-23 06:39:54 +02:00
@@ -39,8 +39,7 @@
/* **************************************************************** */
static void
-memory_error_and_abort (fname)
- char *fname;
+memory_error_and_abort(const char *fname)
{
fprintf (stderr, "%s: out of virtual memory\n", fname);
exit (2);
@@ -57,7 +56,7 @@
temp = malloc (bytes);
if (temp == 0)
- memory_error_and_abort ((char*) "xmalloc");
+ memory_error_and_abort("xmalloc");
return (temp);
}
@@ -71,7 +70,7 @@
temp = pointer ? realloc (pointer, bytes) : malloc (bytes);
if (temp == 0)
- memory_error_and_abort ((char*) "xrealloc");
+ memory_error_and_abort("xrealloc");
return (temp);
}
--- 1.356/sql/item_func.cc 2007-02-22 11:42:34 +02:00
+++ 1.357/sql/item_func.cc 2007-02-23 06:39:55 +02:00
@@ -3450,7 +3450,7 @@
THD *thd=current_thd;
ulong loop_count;
- loop_count= args[0]->val_int();
+ loop_count= (ulong) args[0]->val_int();
if (args[0]->null_value)
{
--- 1.310/sql/item_strfunc.cc 2007-02-22 10:53:26 +02:00
+++ 1.311/sql/item_strfunc.cc 2007-02-23 06:39:55 +02:00
@@ -1926,7 +1926,7 @@
int diff;
DBUG_ASSERT(fixed == 1);
- dec= args[1]->val_int();
+ dec= (int) args[1]->val_int();
if (args[1]->null_value)
{
null_value=1;
--- 1.255/sql/log.cc 2007-01-29 01:47:30 +02:00
+++ 1.256/sql/log.cc 2007-02-23 06:39:55 +02:00
@@ -267,7 +267,7 @@
table->table_name_length= 8;
break;
default:
- DBUG_ASSERT(0);
+ assert(0); // Impossible
}
/*
@@ -1161,7 +1161,7 @@
log_thd= table_log_handler->general_log_thd;
break;
default:
- DBUG_ASSERT(0);
+ assert(0); // Impossible
}
if (!(*tmp_opt))
@@ -1310,7 +1310,7 @@
table= &slow_log;
break;
default:
- DBUG_ASSERT(0);
+ assert(0); // Impossible
}
/*
@@ -3887,7 +3887,7 @@
#ifdef HAVE_REPLICATION
if (expire_logs_days)
{
- long purge_time= time(0) - expire_logs_days*24*60*60;
+ long purge_time= (long) (time(0) - expire_logs_days*24*60*60);
if (purge_time >= 0)
purge_logs_before_date(purge_time);
}
--- 1.267/sql/log_event.cc 2007-02-20 18:15:45 +02:00
+++ 1.268/sql/log_event.cc 2007-02-23 06:39:55 +02:00
@@ -5472,7 +5472,7 @@
my_ptrdiff_t const new_alloc=
block_size * ((cur_size + length) / block_size + block_size - 1);
- byte* const new_buf= (byte*)my_realloc((gptr)m_rows_buf, new_alloc,
+ byte* const new_buf= (byte*)my_realloc((gptr)m_rows_buf, (uint) new_alloc,
MYF(MY_ALLOW_ZERO_PTR|MY_WME));
if (unlikely(!new_buf))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
@@ -6015,7 +6015,7 @@
sbuf_end - sbuf) ||
my_b_safe_write(file, reinterpret_cast<byte*>(m_cols.bitmap),
no_bytes_in_map(&m_cols)) ||
- my_b_safe_write(file, m_rows_buf, data_size));
+ my_b_safe_write(file, m_rows_buf, (uint) data_size));
}
#endif
@@ -6368,8 +6368,8 @@
DBUG_ASSERT(m_dblen < 128);
DBUG_ASSERT(m_tbllen < 128);
- byte const dbuf[]= { m_dblen };
- byte const tbuf[]= { m_tbllen };
+ byte const dbuf[]= { (byte) m_dblen };
+ byte const tbuf[]= { (byte) m_tbllen };
char cbuf[sizeof(m_colcnt)];
char *const cbuf_end= net_store_length((char*) cbuf, (uint) m_colcnt);
--- 1.622/sql/mysqld.cc 2007-02-22 22:18:10 +02:00
+++ 1.623/sql/mysqld.cc 2007-02-23 06:39:55 +02:00
@@ -1855,6 +1855,7 @@
my_thread_end();
pthread_exit(0);
+ DBUG_RETURN(0); // Impossible
}
--- 1.314/sql/sql_class.cc 2007-02-22 10:53:28 +02:00
+++ 1.315/sql/sql_class.cc 2007-02-23 06:39:55 +02:00
@@ -2512,7 +2512,7 @@
if (bitmap_is_set(cols,i))
{
my_ptrdiff_t const offset=
- field->is_null(rec_offset) ? def_offset : rec_offset;
+ field->is_null((uint) rec_offset) ? def_offset : rec_offset;
field->move_field_offset(offset);
ptr= (byte*)field->pack((char *) ptr, field->ptr);
field->move_field_offset(-offset);
--- 1.494/sql/sql_select.cc 2007-02-22 17:48:13 +02:00
+++ 1.495/sql/sql_select.cc 2007-02-23 06:39:55 +02:00
@@ -9166,7 +9166,8 @@
uint hidden_null_count, hidden_null_pack_length, hidden_field_count;
uint blob_count,group_null_items, string_count;
uint temp_pool_slot=MY_BIT_NONE;
- ulong reclength, string_total_length, fieldnr= 0;
+ uint fieldnr= 0;
+ ulong reclength, string_total_length;
bool using_unique_constraint= 0;
bool use_packed_rows= 0;
bool not_all_columns= !(select_options & TMP_TABLE_ALL_COLUMNS);
@@ -15195,7 +15196,8 @@
Item_float *filtered;
float f;
if (examined_rows)
- f= 100.0 * join->best_positions[i].records_read / examined_rows;
+ f= (float) (100.0 * join->best_positions[i].records_read /
+ examined_rows);
else
f= 0.0;
item_list.push_back((filtered= new Item_float(f)));
--- 1.390/sql/sql_table.cc 2007-02-22 10:53:29 +02:00
+++ 1.391/sql/sql_table.cc 2007-02-23 06:39:55 +02:00
@@ -460,7 +460,7 @@
global_ddl_log.num_entries);
const_var= FN_LEN;
int4store(&global_ddl_log.file_entry_buf[DDL_LOG_NAME_LEN_POS],
- const_var);
+ (ulong) const_var);
const_var= IO_SIZE;
int4store(&global_ddl_log.file_entry_buf[DDL_LOG_IO_SIZE_POS],
const_var);
--- 1.9/extra/charset2html.c 2006-12-23 21:04:04 +02:00
+++ 1.10/extra/charset2html.c 2007-02-23 06:39:54 +02:00
@@ -153,7 +153,9 @@
my_init();
if (argc > argcnt && argv[argcnt][0] == '-' && argv[argcnt][1] == '#')
+ {
DBUG_PUSH(argv[argcnt++]+2);
+ }
if (argc > argcnt)
the_set = argv[argcnt++];
--- 1.110/strings/ctype-utf8.c 2007-02-22 17:48:13 +02:00
+++ 1.111/strings/ctype-utf8.c 2007-02-23 06:39:56 +02:00
@@ -4103,7 +4103,7 @@
char hex[]= "0123456789abcdef";
if (wc < 128 && filename_safe_char[wc])
{
- *s= wc;
+ *s= (uchar) wc;
return 1;
}
--- 1.16/storage/archive/azio.c 2007-02-22 16:35:28 +02:00
+++ 1.17/storage/archive/azio.c 2007-02-23 06:39:55 +02:00
@@ -812,7 +812,7 @@
if (s->rows > 0)
return 1;
- s->frm_start_pos= s->start;
+ s->frm_start_pos= (uint) s->start;
s->frm_length= length;
s->start+= length;
@@ -843,7 +843,7 @@
if (s->rows > 0)
return 1;
- s->comment_start_pos= s->start;
+ s->comment_start_pos= (uint) s->start;
s->comment_length= length;
s->start+= length;
--- 1.47/sql/tztime.cc 2007-01-24 19:57:01 +02:00
+++ 1.48/sql/tztime.cc 2007-02-23 06:39:55 +02:00
@@ -546,8 +546,8 @@
int yleap;
const uint *ip;
- days= t / SECS_PER_DAY;
- rem= t % SECS_PER_DAY;
+ days= (long) (t / SECS_PER_DAY);
+ rem= (long) (t % SECS_PER_DAY);
/*
We do this as separate step after dividing t, because this
--- 1.9/support-files/compiler_warnings.supp 2007-02-22 22:19:25 +02:00
+++ 1.10/support-files/compiler_warnings.supp 2007-02-23 06:39:56 +02:00
@@ -1,8 +1,8 @@
integer.cpp: .*control reaches end of non-void function.*: 1288-1427
DictTabInfo.cpp : .*invalid access to non-static.*
DictTabInfo.cpp : .*macro was used incorrectly.*
-DbdihMain.cpp : .*unused variable.* : 6666-6705
-DbtupExecQuery.cpp : .*unused variable.* : 1448-1449
+DbdihMain.cpp : .*unused variable.* : 6666-7013
+DbtupExecQuery.cpp : .*unused variable.* : 1823
kernel_types.h : .*only defines private constructors and has no friends.* : 51
Dbtup.hpp: .*only defines private constructors and has no friends.*
diskpage.hpp: .*only defines private constructors and has no friends.*
@@ -13,6 +13,13 @@
lgman.hpp : .*'struct Lgman::Buffer_idx' only defines private constructors and has no friends.*
SchemaFile.hpp : .*'struct SchemaFile::TableEntry' only defines private constructors and has no friends.*
sql_yacc.cc : .*switch statement contains 'default' but no 'case' labels.*
+
+
+#
+# Not fatal errors in innobase
+#
+pars0grm.tab.c: .*'yyerrorlab' : unreferenced label.*
+_flex_tmp.c: .*not enough actual parameters for macro 'yywrap'.*
#
# bdb is not critical to keep up to date
--- 1.12/libmysqld/CMakeLists.txt 2007-01-12 13:24:31 +02:00
+++ 1.13/libmysqld/CMakeLists.txt 2007-02-23 06:39:54 +02:00
@@ -74,6 +74,7 @@
../sql/strfunc.cc ../sql/table.cc ../sql/thr_malloc.cc
../sql/time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc
../sql/partition_info.cc ../sql/sql_locale.cc
+ ../sql/sql_connect.cc ../sql/scheduler.cc
../vio/vio.c ../vio/viosocket.c ../vio/viossl.c
../vio/viosslfactories.c
${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
--- 1.63/storage/ndb/src/kernel/blocks/backup/Backup.cpp 2007-02-01 19:34:07 +02:00
+++ 1.64/storage/ndb/src/kernel/blocks/backup/Backup.cpp 2007-02-23 06:39:56 +02:00
@@ -1488,7 +1488,6 @@
const Uint32 ptrI = conf->getConnectionPtr();
const Uint32 tableId = conf->getTableId();
const TriggerEvent::Value type = conf->getTriggerEvent();
- const Uint32 triggerId = conf->getTriggerId();
BackupRecordPtr ptr LINT_SET_PTR;
c_backupPool.getPtr(ptr, ptrI);
@@ -4658,7 +4657,6 @@
}
ndbrequire(ok);
- Uint32 ref= ptr.p->masterRef;
ptr.p->masterRef = reference();
ptr.p->nodes.clear();
ptr.p->nodes.set(getOwnNodeId());
--- 1.83/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp 2007-02-22 16:35:28 +02:00
+++ 1.84/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp 2007-02-23 06:39:56 +02:00
@@ -2265,7 +2265,6 @@
Page8Ptr ulkPageidptr;
Uint32 tulkLocalPtr;
Uint32 tlocalkey1, tlocalkey2;
- Uint32 TlogStart;
jamEntry();
operationRecPtr.i = signal->theData[0];
--- 1.108/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp 2007-02-21 16:45:06 +02:00
+++ 1.109/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp 2007-02-23 06:39:56 +02:00
@@ -2965,7 +2965,6 @@
if (replicaPtr.p->lcpStatus[idx] == ZVALID)
{
ndbrequire(replicaPtr.p->lcpId[idx] > maxLcpId);
- Uint32 startGci = replicaPtr.p->maxGciCompleted[idx];
Uint32 stopGci = replicaPtr.p->maxGciStarted[idx];
for (;j < replicaPtr.p->noCrashedReplicas; j++)
{
@@ -10621,7 +10620,6 @@
Uint32 lcpNo = rep->lcpNo;
Uint32 lcpId = rep->lcpId;
Uint32 replicaLcpNo = replicaPtr.p->nextLcp;
- Uint32 prevReplicaLcpNo = prevLcpNo(replicaLcpNo);
warningEvent("Detected previous node failure of %d during lcp",
rep->nodeId);
--- 1.136/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp 2007-02-22 22:18:11 +02:00
+++ 1.137/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp 2007-02-23 06:39:56 +02:00
@@ -13302,7 +13302,6 @@
Uint32 dstRef = ord->dstRef;
Uint32 srcRef = ord->srcRef;
Uint32 gsn = ord->gsn;
- Uint32 cnt = ord->cnt;
if (likely(getNodeInfo(refToNode(dstRef)).m_connected))
{
--- 1.7/storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp 2006-12-23 21:20:17 +02:00
+++ 1.8/storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp 2007-02-23 06:39:56 +02:00
@@ -123,7 +123,6 @@
Uint32 mm)
{
Uint32 nextTuple = regTabPtr->m_offsets[mm].m_fix_header_size;
- Uint32 endOfList;
/*
ASSUMES AT LEAST ONE TUPLE HEADER FITS AND THEREFORE NO HANDLING
OF ZERO AS EXTREME CASE
--- 1.81/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp 2007-02-06 10:02:36 +02:00
+++ 1.82/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp 2007-02-23 06:39:56 +02:00
@@ -1586,7 +1586,7 @@
ndbout_c(" moved %ld rows -> %ld", (long) bucket->m_data.m_count,
(long) m_complete_data.m_data.m_count);
#else
- ndbout_c("");
+ ndbout_c(" ");
#endif
}
bzero(bucket, sizeof(Gci_container));
--- 1.42/storage/innobase/dict/dict0crea.c 2006-11-09 06:23:53 +02:00
+++ 1.43/storage/innobase/dict/dict0crea.c 2007-02-23 06:39:55 +02:00
@@ -255,7 +255,7 @@
error = fil_create_new_single_table_tablespace(
&space, path_or_name, is_path,
FIL_IBD_FILE_INITIAL_SIZE);
- table->space = space;
+ table->space = (unsigned int) space;
if (error != DB_SUCCESS) {
@@ -806,7 +806,7 @@
root_page_no = btr_create(type, space, index_id, comp, mtr);
if (index) {
- index->page = root_page_no;
+ index->page = (unsigned int) root_page_no;
} else {
ut_print_timestamp(stderr);
fprintf(stderr,
--- 1.100/storage/innobase/dict/dict0dict.c 2007-01-22 05:30:40 +02:00
+++ 1.101/storage/innobase/dict/dict0dict.c 2007-02-23 06:39:55 +02:00
@@ -1415,7 +1415,7 @@
dict_index_get_nth_field(new_index, i)->col->ord_part = 1;
}
- new_index->page = page_no;
+ new_index->page = (unsigned int) page_no;
rw_lock_create(&new_index->lock, SYNC_INDEX_TREE);
if (!UNIV_UNLIKELY(new_index->type & DICT_UNIVERSAL)) {
@@ -1531,10 +1531,10 @@
field = dict_index_get_nth_field(index, index->n_def - 1);
field->col = col;
- field->fixed_len = dict_col_get_fixed_size(col);
+ field->fixed_len = (unsigned int) dict_col_get_fixed_size(col);
if (prefix_len && field->fixed_len > prefix_len) {
- field->fixed_len = prefix_len;
+ field->fixed_len = (unsigned int) prefix_len;
}
/* Long fixed-length fields that need external storage are treated as
@@ -1736,7 +1736,7 @@
break;
}
- new_index->trx_id_offset += fixed_size;
+ new_index->trx_id_offset += (unsigned int) fixed_size;
}
}
@@ -3045,7 +3045,7 @@
foreign->foreign_table_name = mem_heap_strdup(foreign->heap,
table->name);
foreign->foreign_index = index;
- foreign->n_fields = i;
+ foreign->n_fields = (unsigned int) i;
foreign->foreign_col_names = mem_heap_alloc(foreign->heap,
i * sizeof(void*));
for (i = 0; i < foreign->n_fields; i++) {
--- 1.53/storage/innobase/dict/dict0load.c 2007-01-22 03:18:09 +02:00
+++ 1.54/storage/innobase/dict/dict0load.c 2007-02-23 06:39:55 +02:00
@@ -843,7 +843,7 @@
table = dict_mem_table_create(name, space, n_cols & ~0x80000000UL,
flags);
- table->ibd_file_missing = ibd_file_missing;
+ table->ibd_file_missing = (unsigned int) ibd_file_missing;
ut_a(name_of_col_is(sys_tables, sys_index, 3, "ID"));
@@ -1180,8 +1180,8 @@
/* We store the type in the bits 24..29 of n_fields_and_type. */
- foreign->type = n_fields_and_type >> 24;
- foreign->n_fields = n_fields_and_type & 0x3FFUL;
+ foreign->type = (unsigned int) (n_fields_and_type >> 24);
+ foreign->n_fields = (unsigned int) (n_fields_and_type & 0x3FFUL);
foreign->id = mem_heap_strdup(foreign->heap, id);
--- 1.24/storage/innobase/dict/dict0mem.c 2006-09-21 10:38:40 +03:00
+++ 1.25/storage/innobase/dict/dict0mem.c 2007-02-23 06:39:55 +02:00
@@ -50,14 +50,14 @@
table->heap = heap;
- table->flags = flags;
+ table->flags = (unsigned int) flags;
table->name = mem_heap_strdup(heap, name);
table->dir_path_of_temp_table = NULL;
- table->space = space;
+ table->space = (unsigned int) space;
table->ibd_file_missing = FALSE;
table->tablespace_discarded = FALSE;
table->n_def = 0;
- table->n_cols = n_cols + DATA_N_SYS_COLS;
+ table->n_cols = (unsigned int) (n_cols + DATA_N_SYS_COLS);
table->n_mysql_handles_opened = 0;
table->n_foreign_key_checks_running = 0;
@@ -208,14 +208,14 @@
col->ind = table->n_def - 1;
col->ord_part = 0;
- col->mtype = mtype;
- col->prtype = prtype;
- col->len = len;
+ col->mtype = (unsigned int) mtype;
+ col->prtype = (unsigned int) prtype;
+ col->len = (unsigned int) len;
dtype_get_mblen(mtype, prtype, &mbminlen, &mbmaxlen);
- col->mbminlen = mbminlen;
- col->mbmaxlen = mbmaxlen;
+ col->mbminlen = (unsigned int) mbminlen;
+ col->mbmaxlen = (unsigned int) mbmaxlen;
}
/**************************************************************************
@@ -245,13 +245,13 @@
index->heap = heap;
index->type = type;
- index->space = space;
+ index->space = (unsigned int) space;
index->page = 0;
index->name = mem_heap_strdup(heap, index_name);
index->table_name = table_name;
index->table = NULL;
index->n_def = index->n_nullable = 0;
- index->n_fields = n_fields;
+ index->n_fields = (unsigned int) n_fields;
index->fields = mem_heap_alloc(heap, 1 + n_fields
* sizeof(dict_field_t));
/* The '1 +' above prevents allocation
@@ -326,7 +326,7 @@
field = dict_index_get_nth_field(index, index->n_def - 1);
field->name = name;
- field->prefix_len = prefix_len;
+ field->prefix_len = (unsigned int) prefix_len;
}
/**************************************************************************
--- 1.7/storage/innobase/eval/eval0proc.c 2006-09-21 10:38:40 +03:00
+++ 1.8/storage/innobase/eval/eval0proc.c 2007-02-23 06:39:55 +02:00
@@ -194,7 +194,7 @@
loop_var_value = eval_node_get_int_val(node->loop_start_limit);
node->loop_end_value
- = eval_node_get_int_val(node->loop_end_limit);
+ = (int) eval_node_get_int_val(node->loop_end_limit);
}
/* Check if we should do another loop */
--- 1.15/storage/innobase/mtr/mtr0log.c 2006-09-21 10:38:50 +03:00
+++ 1.16/storage/innobase/mtr/mtr0log.c 2007-02-23 06:39:56 +02:00
@@ -529,7 +529,7 @@
ind = dict_mem_index_create("LOG_DUMMY", "LOG_DUMMY",
DICT_HDR_SPACE, 0, n);
ind->table = table;
- ind->n_uniq = n_uniq;
+ ind->n_uniq = (unsigned int) n_uniq;
if (n_uniq != n) {
ind->type = DICT_CLUSTERED;
}
--- 1.34/storage/innobase/rem/rem0cmp.c 2006-09-21 10:38:52 +03:00
+++ 1.35/storage/innobase/rem/rem0cmp.c 2007-02-23 06:39:56 +02:00
@@ -597,7 +597,7 @@
dtuple_byte = cmp_collate(dtuple_byte);
}
- ret = dtuple_byte - rec_byte;
+ ret = (int) (dtuple_byte - rec_byte);
if (UNIV_UNLIKELY(ret)) {
if (ret < 0) {
ret = -1;
--- 1.138/storage/innobase/row/row0mysql.c 2006-12-21 00:46:32 +02:00
+++ 1.139/storage/innobase/row/row0mysql.c 2007-02-23 06:39:56 +02:00
@@ -3423,7 +3423,7 @@
pars_info_add_str_literal(info, "id", id);
- return(que_eval_sql(info,
+ return((int) que_eval_sql(info,
"PROCEDURE DELETE_CONSTRAINT () IS\n"
"BEGIN\n"
"DELETE FROM SYS_FOREIGN_COLS WHERE ID = :id;\n"
@@ -3462,7 +3462,7 @@
err = row_delete_constraint_low(id, trx);
}
- return(err);
+ return((int) err);
}
/*************************************************************************
--- 1.115/storage/innobase/row/row0sel.c 2007-01-05 04:51:30 +02:00
+++ 1.116/storage/innobase/row/row0sel.c 2007-02-23 06:39:56 +02:00
@@ -2116,7 +2116,7 @@
ut_a(len == 4);
tmp = mach_read_from_4(dfield_get_data(dfield));
- *val = tmp;
+ *val = (ib_uint32_t) tmp;
return(NULL);
}
--- 1.30/storage/innobase/sync/sync0rw.c 2007-01-18 02:18:03 +02:00
+++ 1.31/storage/innobase/sync/sync0rw.c 2007-02-23 06:39:56 +02:00
@@ -127,7 +127,7 @@
lock->magic_n = RW_LOCK_MAGIC_N;
lock->cfile_name = cfile_name;
- lock->cline = cline;
+ lock->cline = (unsigned int) cline;
lock->last_s_file_name = "not yet reserved";
lock->last_x_file_name = "not yet reserved";
@@ -356,7 +356,7 @@
file_name, line);
#endif
lock->last_x_file_name = file_name;
- lock->last_x_line = line;
+ lock->last_x_line = (unsigned int) line;
/* Locking succeeded, we may return */
return(RW_LOCK_EX);
@@ -393,7 +393,7 @@
#endif
lock->last_x_file_name = file_name;
- lock->last_x_line = line;
+ lock->last_x_line = (unsigned int) line;
/* Locking succeeded, we may return */
return(RW_LOCK_EX);
@@ -415,7 +415,7 @@
#endif
lock->last_x_file_name = file_name;
- lock->last_x_line = line;
+ lock->last_x_line = (unsigned int) line;
/* Locking succeeded, we may return */
return(RW_LOCK_EX);
--- 1.70/storage/innobase/trx/trx0trx.c 2007-01-05 04:51:30 +02:00
+++ 1.71/storage/innobase/trx/trx0trx.c 2007-02-23 06:39:56 +02:00
@@ -2023,7 +2023,7 @@
(ulong) count);
}
- return (count);
+ return ((int) count);
}
/***********************************************************************
--- 1.321/storage/innobase/handler/ha_innodb.cc 2007-02-22 17:56:58 +02:00
+++ 1.322/storage/innobase/handler/ha_innodb.cc 2007-02-23 06:39:56 +02:00
@@ -695,7 +695,7 @@
uint errors;
strconvert(current_thd->charset(), from,
- &my_charset_filename, to, len, &errors);
+ &my_charset_filename, to, (uint) len, &errors);
}
/**********************************************************************
@@ -714,7 +714,7 @@
uint errors;
strconvert(current_thd->charset(), from,
- system_charset_info, to, len, &errors);
+ system_charset_info, to, (uint) len, &errors);
}
/**********************************************************************
@@ -839,8 +839,9 @@
CHARSET_INFO* from_cs,
uint* errors)
{
- return(copy_and_convert((char*)to, to_length, to_cs,
- (const char*)from, from_length, from_cs, errors));
+ return(copy_and_convert((char*)to, (uint32) to_length, to_cs,
+ (const char*)from, (uint32) from_length, from_cs,
+ errors));
}
/*************************************************************************
@@ -1203,9 +1204,9 @@
output strings buffers must not be shared. The function
only produces more output when the name contains other
characters than [0-9A-Z_a-z]. */
- char* temp_name = my_malloc(namelen + 1, MYF(MY_WME));
- uint qnamelen = namelen
- + (1 + sizeof srv_mysql50_table_name_prefix);
+ char* temp_name = my_malloc((uint) namelen + 1, MYF(MY_WME));
+ uint qnamelen = (uint) (namelen
+ + (1 + sizeof srv_mysql50_table_name_prefix));
if (temp_name) {
qname = my_malloc(qnamelen, MYF(MY_WME));
--- 1.217/sql/set_var.cc 2007-02-22 10:53:27 +02:00
+++ 1.218/sql/set_var.cc 2007-02-23 06:39:55 +02:00
@@ -2599,7 +2599,7 @@
file_log= logger.get_log_file_handler();
break;
default:
- DBUG_ASSERT(0);
+ assert(0); // Impossible
}
if (!old_value)
@@ -3638,7 +3638,7 @@
*/
byte *sys_var_thd_sql_mode::symbolic_mode_representation(THD *thd,
- ulong val,
+ ulonglong val,
ulong *len)
{
char buff[256];
@@ -4014,7 +4014,7 @@
res= Events::get_instance()->stop_execution_of_events();
else
{
- DBUG_ASSERT(0);
+ assert(0); // Impossible
}
if (res)
my_error(ER_EVENT_SET_VAR_ERROR, MYF(0));
--- 1.101/sql/set_var.h 2007-02-22 10:53:27 +02:00
+++ 1.102/sql/set_var.h 2007-02-23 06:39:55 +02:00
@@ -440,7 +440,7 @@
}
void set_default(THD *thd, enum_var_type type);
byte *value_ptr(THD *thd, enum_var_type type, LEX_STRING *base);
- static byte *symbolic_mode_representation(THD *thd, ulong sql_mode,
+ static byte *symbolic_mode_representation(THD *thd, ulonglong sql_mode,
ulong *length);
};
--- 1.3/strings/my_strchr.c 2006-12-23 21:33:31 +02:00
+++ 1.4/strings/my_strchr.c 2007-02-23 06:39:56 +02:00
@@ -26,7 +26,7 @@
#include "m_ctype.h"
-byte *my_strchr(CHARSET_INFO *cs, const char *str, const char *end,
+char *my_strchr(CHARSET_INFO *cs, const char *str, const char *end,
pchar c)
{
uint mbl;
--- 1.99/sql/sql_partition.cc 2007-01-29 01:47:31 +02:00
+++ 1.100/sql/sql_partition.cc 2007-02-23 06:39:55 +02:00
@@ -6731,7 +6731,7 @@
}
}
else
- DBUG_ASSERT(0);
+ assert(0);
/*
Find minimum: Do special handling if the interval has left bound in form
--- 1.2/extra/yassl/include/yassl.hpp 2006-03-29 02:56:41 +03:00
+++ 1.3/extra/yassl/include/yassl.hpp 2007-02-23 06:39:54 +02:00
@@ -28,7 +28,7 @@
namespace yaSSL {
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
typedef unsigned int SOCKET_T;
#else
typedef int SOCKET_T;
--- 1.270/client/mysqltest.c 2007-02-22 22:18:10 +02:00
+++ 1.271/client/mysqltest.c 2007-02-23 06:39:54 +02:00
@@ -6735,11 +6735,11 @@
if (back_ref_num >= 0 && back_ref_num <= (int)r.re_nsub)
{
- int start_off,end_off;
- if ((start_off=subs[back_ref_num].rm_so) > -1 &&
+ regoff_t start_off, end_off;
+ if ((start_off= subs[back_ref_num].rm_so) > -1 &&
(end_off=subs[back_ref_num].rm_eo) > -1)
{
- int block_len= end_off - start_off;
+ int block_len= (int) (end_off - start_off);
memcpy(res_p,str_p + start_off, block_len);
res_p += block_len;
}
--- 1.52/server-tools/instance-manager/instance.cc 2007-02-06 16:03:26 +02:00
+++ 1.53/server-tools/instance-manager/instance.cc 2007-02-23 06:39:55 +02:00
@@ -923,7 +923,7 @@
bool Instance::wait_for_stop()
{
- int start_time= time(NULL);
+ int start_time= (int) time(NULL);
int finish_time= start_time + options.get_shutdown_delay();
log_info("Instance '%s': waiting for mysqld to stop "
--- 1.34/sql/CMakeLists.txt 2007-01-17 20:32:06 +02:00
+++ 1.35/sql/CMakeLists.txt 2007-02-23 06:39:55 +02:00
@@ -69,6 +69,7 @@
sql_tablespace.cc events.cc ../sql-common/my_user.c
partition_info.cc rpl_utility.cc rpl_injector.cc sql_locale.cc
rpl_rli.cc rpl_mi.cc sql_servers.cc
+ sql_connect.cc scheduler.cc
${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
${PROJECT_SOURCE_DIR}/sql/sql_yacc.h
${PROJECT_SOURCE_DIR}/include/mysqld_error.h
--- 1.277/BitKeeper/etc/ignore 2007-02-22 10:52:40 +02:00
+++ 1.278/BitKeeper/etc/ignore 2007-02-23 06:39:24 +02:00
@@ -2951,3 +2951,4 @@
win/vs8cache.txt
zlib/*.ds?
zlib/*.vcproj
+storage/ndb/src/ndbapi/ndberror_check
--- 1.4/extra/yassl/include/lock.hpp 2006-07-12 22:15:02 +03:00
+++ 1.5/extra/yassl/include/lock.hpp 2007-02-23 06:39:54 +02:00
@@ -28,7 +28,7 @@
#ifdef MULTI_THREADED
- #ifdef _WIN32
+ #if defined(_WIN32) || defined(_WIN64)
#include <windows.h>
class Mutex {
--- 1.22/extra/yassl/include/openssl/ssl.h 2007-02-22 17:48:11 +02:00
+++ 1.23/extra/yassl/include/openssl/ssl.h 2007-02-23 06:39:54 +02:00
@@ -189,7 +189,7 @@
EVP_R_BAD_DECRYPT = 2
};
-#ifdef WIN
+#if defined(_WIN32) || defined(_WIN64)
typedef SOCKET socket_t;
#else
typedef int socket_t;
--- 1.11/extra/yassl/include/socket_wrapper.hpp 2007-02-22 16:59:54 +02:00
+++ 1.12/extra/yassl/include/socket_wrapper.hpp 2007-02-23 06:39:54 +02:00
@@ -28,7 +28,7 @@
#include <assert.h>
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
#include <winsock2.h>
#else
#include <sys/time.h>
@@ -45,7 +45,7 @@
typedef unsigned int uint;
-#ifndef _WIN32
+#if !defined( _WIN32) && !defined(_WIN64)
const socket_t INVALID_SOCKET = -1;
const int SD_RECEIVE = 0;
const int SD_SEND = 1;
--- 1.39/storage/ndb/tools/restore/consumer_restore.cpp 2006-12-23 21:20:32 +02:00
+++ 1.40/storage/ndb/tools/restore/consumer_restore.cpp 2007-02-23 06:39:56 +02:00
@@ -182,6 +182,7 @@
}
+#ifdef NOT_USED
static bool default_nodegroups(NdbDictionary::Table *table)
{
Uint16 *node_groups = (Uint16*)table->getFragmentData();
@@ -197,6 +198,7 @@
}
return true;
}
+#endif
static Uint32 get_no_fragments(Uint64 max_rows, Uint32 no_nodes)
@@ -424,7 +426,7 @@
{
const void *pack_data, *data, *new_pack_data;
char *new_data;
- uint data_len, pack_len, new_data_len, new_pack_len;
+ uint data_len, new_data_len, new_pack_len;
uint no_parts, extra_growth;
DBUG_ENTER("translate_frm");
@@ -1181,6 +1183,7 @@
tuple_free();
}
+#ifdef NOT_USED
static bool use_part_id(const NdbDictionary::Table *table)
{
if (table->getDefaultNoPartitionsFlag() &&
@@ -1189,6 +1192,7 @@
else
return true;
}
+#endif
static Uint32 get_part_id(const NdbDictionary::Table *table,
Uint32 hash_value)
| Thread |
|---|
| • bk commit into 5.1 tree (monty:1.2454) | monty | 23 Feb |
