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
1.2206 06/06/23 02:49:19 monty@stripped +13 -0
Remove compiler warnings
Fixed wrong table flags type in ndbcluster that caused previous commit to fail
storage/archive/archive_test.c
1.4 06/06/23 02:49:15 monty@stripped +1 -1
Remove compiler warning
sql/set_var.h
1.89 06/06/23 02:49:15 monty@stripped +2 -2
sys_var_log_output now takes a pointer to ulong
sql/set_var.cc
1.178 06/06/23 02:49:15 monty@stripped +2 -1
Fixed indentation
sql/mysqld.cc
1.563 06/06/23 02:49:15 monty@stripped +4 -3
Changed log_output_options to ulong to remove compiler warning (and wrong test on 64 bit machines)
Split initialization of variables of different types to remove compiler warning
sql/mysql_priv.h
1.414 06/06/23 02:49:15 monty@stripped +1 -1
Changed log_output_options to ulong to remove compiler warning (and wrong test on 64 bit machines)
sql/handler.cc
1.244 06/06/23 02:49:15 monty@stripped +5 -3
Indentation cleanups
sql/ha_ndbcluster_binlog.cc
1.69 06/06/23 02:49:15 monty@stripped +11 -10
Remove compiler warning
sql/ha_ndbcluster.h
1.143 06/06/23 02:49:15 monty@stripped +1 -1
Fixed wrong of handler flags (caused previous commit to fail)
plugin/fulltext/plugin_example.c
1.11 06/06/23 02:49:15 monty@stripped +4 -2
Remove compiler warning
mysys/thr_lock.c
1.52 06/06/23 02:49:15 monty@stripped +5 -2
Remove compiler warning
mysys/my_handler.c
1.25 06/06/23 02:49:15 monty@stripped +6 -0
Remove compiler warning
mysys/my_bitmap.c
1.41 06/06/23 02:49:15 monty@stripped +1 -1
Remove compiler warning
client/mysqltest.c
1.213 06/06/23 02:49:14 monty@stripped +2 -2
Portability fix
# 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.51/mysys/thr_lock.c 2006-06-04 18:52:07 +03:00
+++ 1.52/mysys/thr_lock.c 2006-06-23 02:49:15 +03:00
@@ -1123,10 +1123,12 @@
enum thr_lock_type new_lock_type)
{
THR_LOCK *lock=in_data->lock;
- THR_LOCK_DATA *data, *next;
enum thr_lock_type old_lock_type= in_data->type;
+#ifdef TO_BE_REMOVED
+ THR_LOCK_DATA *data, *next;
bool start_writers= FALSE;
bool start_readers= FALSE;
+#endif
DBUG_ENTER("thr_downgrade_write_only_lock");
pthread_mutex_lock(&lock->mutex);
@@ -1134,7 +1136,8 @@
DBUG_ASSERT(old_lock_type > new_lock_type);
in_data->type= new_lock_type;
check_locks(lock,"after downgrading lock",0);
-#if 0
+
+#if TO_BE_REMOVED
switch (old_lock_type)
{
case TL_WRITE_ONLY:
--- 1.243/sql/handler.cc 2006-06-22 22:44:17 +03:00
+++ 1.244/sql/handler.cc 2006-06-23 02:49:15 +03:00
@@ -3326,16 +3326,18 @@
if (likely(!(error= bitmap_init(&cols,
use_bitbuf ? bitbuf : NULL,
(n_fields + 7) & ~7UL,
- false))))
+ FALSE))))
{
bitmap_set_all(&cols);
if (likely(!(error= write_locked_table_maps(thd))))
{
error=
RowsEventT::binlog_row_logging_function(thd, table,
- table->file->has_transactions(),
+ table->file->
+ has_transactions(),
&cols, table->s->fields,
- before_record, after_record);
+ before_record,
+ after_record);
}
if (!use_bitbuf)
bitmap_free(&cols);
--- 1.413/sql/mysql_priv.h 2006-06-22 12:21:38 +03:00
+++ 1.414/sql/mysql_priv.h 2006-06-23 02:49:15 +03:00
@@ -1518,7 +1518,7 @@
extern bool using_update_log, opt_large_files, server_id_supplied;
extern bool opt_update_log, opt_bin_log, opt_error_log;
extern my_bool opt_log, opt_slow_log;
-extern uint log_output_options;
+extern ulong log_output_options;
extern my_bool opt_log_queries_not_using_indexes;
extern bool opt_disable_networking, opt_skip_show_db;
extern my_bool opt_character_set_client_handshake;
--- 1.562/sql/mysqld.cc 2006-06-20 19:06:11 +03:00
+++ 1.563/sql/mysqld.cc 2006-06-23 02:49:15 +03:00
@@ -343,7 +343,7 @@
bool opt_update_log, opt_bin_log;
my_bool opt_log, opt_slow_log;
-uint log_output_options;
+ulong log_output_options;
my_bool opt_log_queries_not_using_indexes= 0;
bool opt_error_log= IF_WIN(1,0);
bool opt_disable_networking=0, opt_skip_show_db=0;
@@ -3225,7 +3225,7 @@
{
sql_print_error("CSV engine is not present, falling back to the "
"log files");
- log_output_options= log_output_options & ~LOG_TABLE | LOG_FILE;
+ log_output_options= (log_output_options & ~LOG_TABLE) | LOG_FILE;
}
logger.set_handlers(LOG_FILE, opt_slow_log ? log_output_options:LOG_NONE,
@@ -6953,7 +6953,8 @@
/* Things reset to zero */
opt_skip_slave_start= opt_reckless_slave = 0;
mysql_home[0]= pidfile_name[0]= log_error_file[0]= 0;
- opt_log= opt_update_log= opt_slow_log= 0;
+ opt_log= opt_slow_log= 0;
+ opt_update_log= 0;
log_output_options= find_bit_type(log_output_str, &log_output_typelib);
opt_bin_log= 0;
opt_disable_networking= opt_skip_show_db=0;
--- 1.24/mysys/my_handler.c 2005-10-28 02:35:58 +03:00
+++ 1.25/mysys/my_handler.c 2006-06-23 02:49:15 +03:00
@@ -504,6 +504,7 @@
switch ((enum ha_base_keytype) keyseg->type) {
case HA_KEYTYPE_TEXT:
case HA_KEYTYPE_BINARY:
+ case HA_KEYTYPE_BIT:
if (keyseg->flag & HA_SPACE_PACK)
{
int a_length;
@@ -515,7 +516,9 @@
a= end;
break;
case HA_KEYTYPE_VARTEXT1:
+ case HA_KEYTYPE_VARTEXT2:
case HA_KEYTYPE_VARBINARY1:
+ case HA_KEYTYPE_VARBINARY2:
{
int a_length;
get_key_length(a_length, a);
@@ -544,6 +547,9 @@
case HA_KEYTYPE_FLOAT:
case HA_KEYTYPE_DOUBLE:
a= end;
+ break;
+ case HA_KEYTYPE_END:
+ DBUG_ASSERT(0);
break;
}
}
--- 1.3/storage/archive/archive_test.c 2006-03-26 14:56:40 +03:00
+++ 1.4/storage/archive/archive_test.c 2006-06-23 02:49:15 +03:00
@@ -4,7 +4,7 @@
#define TEST_STRING "This is a test"
#define BUFFER_LEN 1024
-int main(int argc, char *argv[])
+int main(int argc __attribute__((unused)), char *argv[])
{
int ret;
azio_stream foo, foo1;
--- 1.40/mysys/my_bitmap.c 2006-06-04 18:52:07 +03:00
+++ 1.41/mysys/my_bitmap.c 2006-06-23 02:49:15 +03:00
@@ -101,7 +101,7 @@
my_bool bitmap_init(MY_BITMAP *map, my_bitmap_map *buf, uint n_bits,
- my_bool thread_safe)
+ my_bool thread_safe __attribute__((unused)))
{
DBUG_ENTER("bitmap_init");
if (!buf)
--- 1.142/sql/ha_ndbcluster.h 2006-06-22 22:44:17 +03:00
+++ 1.143/sql/ha_ndbcluster.h 2006-06-23 02:49:15 +03:00
@@ -851,7 +851,7 @@
char m_dbname[FN_HEADLEN];
//char m_schemaname[FN_HEADLEN];
char m_tabname[FN_HEADLEN];
- ulong m_table_flags;
+ ulonglong m_table_flags;
THR_LOCK_DATA m_lock;
bool m_lock_tuple;
NDB_SHARE *m_share;
--- 1.177/sql/set_var.cc 2006-06-21 18:50:27 +03:00
+++ 1.178/sql/set_var.cc 2006-06-23 02:49:15 +03:00
@@ -2724,7 +2724,8 @@
}
-byte *sys_var_log_output::value_ptr(THD *thd, enum_var_type type, LEX_STRING *base)
+byte *sys_var_log_output::value_ptr(THD *thd, enum_var_type type,
+ LEX_STRING *base)
{
char buff[256];
String tmp(buff, sizeof(buff), &my_charset_latin1);
--- 1.88/sql/set_var.h 2006-06-21 18:50:27 +03:00
+++ 1.89/sql/set_var.h 2006-06-23 02:49:15 +03:00
@@ -785,10 +785,10 @@
class sys_var_log_output :public sys_var
{
- uint *value;
+ ulong *value;
TYPELIB *enum_names;
public:
- sys_var_log_output(const char *name_arg, uint *value_arg,
+ sys_var_log_output(const char *name_arg, ulong *value_arg,
TYPELIB *typelib, sys_after_update_func func)
:sys_var(name_arg,func), value(value_arg), enum_names(typelib)
{}
--- 1.212/client/mysqltest.c 2006-06-09 10:07:25 +03:00
+++ 1.213/client/mysqltest.c 2006-06-23 02:49:14 +03:00
@@ -4095,8 +4095,8 @@
static void append_info(DYNAMIC_STRING *ds, ulonglong affected_rows,
const char *info)
{
- char buf[40];
- sprintf(buf,"affected rows: %llu\n", affected_rows);
+ char buf[40], buff2[21];
+ sprintf(buf,"affected rows: %s\n", llstr(affected_rows, buff2));
dynstr_append(ds, buf);
if (info)
{
--- 1.10/plugin/fulltext/plugin_example.c 2006-05-28 18:02:35 +03:00
+++ 1.11/plugin/fulltext/plugin_example.c 2006-06-23 02:49:15 +03:00
@@ -97,7 +97,8 @@
1 failure (cannot happen)
*/
-static int simple_parser_init(MYSQL_FTPARSER_PARAM *param)
+static int simple_parser_init(MYSQL_FTPARSER_PARAM *param
+ __attribute__((unused)))
{
return(0);
}
@@ -117,7 +118,8 @@
1 failure (cannot happen)
*/
-static int simple_parser_deinit(MYSQL_FTPARSER_PARAM *param)
+static int simple_parser_deinit(MYSQL_FTPARSER_PARAM *param
+ __attribute__((unused)))
{
return(0);
}
--- 1.68/sql/ha_ndbcluster_binlog.cc 2006-06-22 22:44:17 +03:00
+++ 1.69/sql/ha_ndbcluster_binlog.cc 2006-06-23 02:49:15 +03:00
@@ -3882,21 +3882,22 @@
pthread_mutex_lock(&injector_mutex);
if (injector_ndb)
{
+ char buff1[22],buff2[22],buff3[22],buff4[22],buff5[22];
ndb_latest_epoch= injector_ndb->getLatestGCI();
pthread_mutex_unlock(&injector_mutex);
buflen=
snprintf(buf, sizeof(buf),
- "latest_epoch=%llu, "
- "latest_trans_epoch=%llu, "
- "latest_received_binlog_epoch=%llu, "
- "latest_handled_binlog_epoch=%llu, "
- "latest_applied_binlog_epoch=%llu",
- ndb_latest_epoch,
- g_latest_trans_gci,
- ndb_latest_received_binlog_epoch,
- ndb_latest_handled_binlog_epoch,
- ndb_latest_applied_binlog_epoch);
+ "latest_epoch=%s, "
+ "latest_trans_epoch=%s, "
+ "latest_received_binlog_epoch=%s, "
+ "latest_handled_binlog_epoch=%s, "
+ "latest_applied_binlog_epoch=%s",
+ llstr(ndb_latest_epoch, buff1),
+ llstr(g_latest_trans_gci, buff2),
+ llstr(ndb_latest_received_binlog_epoch, buff3),
+ llstr(ndb_latest_handled_binlog_epoch, buff4),
+ llstr(ndb_latest_applied_binlog_epoch, buff5));
if (stat_print(thd, ndbcluster_hton_name, ndbcluster_hton_name_length,
"binlog", strlen("binlog"),
buf, buflen))
| Thread |
|---|
| • bk commit into 5.1 tree (monty:1.2206) | monty | 23 Jun |
