Below is the list of changes that have just been committed into a local
4.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.2355 05/07/28 21:25:05 monty@stripped +11 -0
Fixed compiler warnings
tests/mysql_client_test.c
1.155 05/07/28 21:24:03 monty@stripped +3 -2
Fixed compiler warning
sql/sql_base.cc
1.258 05/07/28 21:24:03 monty@stripped +1 -0
Fixed compiler warning
sql/ha_ndbcluster.cc
1.168 05/07/28 21:24:03 monty@stripped +1 -0
Fixed compiler warning
sql/field.cc
1.224 05/07/28 21:24:02 monty@stripped +1 -1
Fixed compiler warning
ndb/src/common/logger/LogHandler.cpp
1.10 05/07/28 21:24:02 monty@stripped +1 -1
Fixed compiler warning
mysql-test/t/rpl_drop_temp.test
1.3 05/07/28 21:24:02 monty@stripped +2 -0
Drop used database
mysql-test/r/rpl_drop_temp.result
1.2 05/07/28 21:24:02 monty@stripped +1 -0
Drop used database
myisammrg/myrg_static.c
1.8 05/07/28 21:24:02 monty@stripped +1 -1
Fixed compiler warning
myisam/ft_boolean_search.c
1.89 05/07/28 21:24:02 monty@stripped +1 -0
Fixed compiler warning
client/mysqltest.c
1.171 05/07/28 21:24:02 monty@stripped +1 -0
Fixed compiler warning
client/mysqldump.c
1.195 05/07/28 21:24:02 monty@stripped +1 -1
Fixed wrong argument to printf()
# 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.com
# Root: /home/my/mysql-4.1
--- 1.194/client/mysqldump.c 2005-07-20 13:27:52 +03:00
+++ 1.195/client/mysqldump.c 2005-07-28 21:24:02 +03:00
@@ -2370,7 +2370,7 @@
{
/* SHOW MASTER STATUS reports nothing and --force is not enabled */
my_printf_error(0, "Error: Binlogging on server not active",
- MYF(0), mysql_error(mysql_con));
+ MYF(0));
mysql_free_result(master);
return 1;
}
--- 1.7/myisammrg/myrg_static.c 2001-12-06 14:10:41 +02:00
+++ 1.8/myisammrg/myrg_static.c 2005-07-28 21:24:02 +03:00
@@ -27,4 +27,4 @@
static const char *merge_insert_methods[] =
{ "FIRST", "LAST", NullS };
TYPELIB merge_insert_method= { array_elements(merge_insert_methods)-1,"",
- merge_insert_methods};
+ merge_insert_methods, 0};
--- 1.223/sql/field.cc 2005-07-14 14:13:18 +03:00
+++ 1.224/sql/field.cc 2005-07-28 21:24:02 +03:00
@@ -5003,7 +5003,7 @@
double anr= fabs(nr);
int neg= (nr < 0.0) ? 1 : 0;
if (char_length > 4 && char_length < 32 &&
- (anr < 1.0 ? anr > 1/(log_10[max(0,char_length-neg-2)]) /* -2 for "0." */
+ (anr < 1.0 ? anr > 1/(log_10[max(0,(int) char_length-neg-2)]) /* -2 for "0." */
: anr < log_10[char_length-neg]-1))
use_scientific_notation= FALSE;
--- 1.257/sql/sql_base.cc 2005-07-27 13:24:56 +03:00
+++ 1.258/sql/sql_base.cc 2005-07-28 21:24:03 +03:00
@@ -2186,6 +2186,7 @@
bool found_unaliased_non_uniq= 0;
uint unaliased_counter;
+ LINT_INIT(unaliased_counter);
*unaliased= FALSE;
if (find->type() == Item::FIELD_ITEM || find->type() == Item::REF_ITEM)
--- 1.1/mysql-test/r/rpl_drop_temp.result 2005-02-15 00:46:45 +02:00
+++ 1.2/mysql-test/r/rpl_drop_temp.result 2005-07-28 21:24:02 +03:00
@@ -10,3 +10,4 @@
show status like 'Slave_open_temp_tables';
Variable_name Value
Slave_open_temp_tables 0
+drop database mysqltest;
--- 1.2/mysql-test/t/rpl_drop_temp.test 2005-07-28 03:21:47 +03:00
+++ 1.3/mysql-test/t/rpl_drop_temp.test 2005-07-28 21:24:02 +03:00
@@ -11,5 +11,7 @@
connection slave;
--real_sleep 3; # time for DROP to be written
show status like 'Slave_open_temp_tables';
+connection default;
+drop database mysqltest;
# End of 4.1 tests
--- 1.9/ndb/src/common/logger/LogHandler.cpp 2005-07-14 19:07:55 +03:00
+++ 1.10/ndb/src/common/logger/LogHandler.cpp 2005-07-28 21:24:02 +03:00
@@ -58,7 +58,7 @@
}
else // repeated message
{
- if (now < m_last_log_time+m_max_repeat_frequency)
+ if (now < (time_t) (m_last_log_time+m_max_repeat_frequency))
{
m_count_repeated_messages++;
m_now= now;
--- 1.167/sql/ha_ndbcluster.cc 2005-07-06 12:23:25 +03:00
+++ 1.168/sql/ha_ndbcluster.cc 2005-07-28 21:24:03 +03:00
@@ -2413,6 +2413,7 @@
break;
}
case NdbDictionary::Column::Undefined:
+ default:
fprintf(DBUG_FILE, "Unknown type: %d", col->getType());
break;
}
--- 1.88/myisam/ft_boolean_search.c 2005-06-17 21:55:26 +03:00
+++ 1.89/myisam/ft_boolean_search.c 2005-07-28 21:24:02 +03:00
@@ -210,6 +210,7 @@
MI_INFO *info=ftb->info;
uint off, extra=HA_FT_WLEN+info->s->base.rec_reflength;
byte *lastkey_buf=ftbw->word+ftbw->off;
+ LINT_INIT(off);
if (ftbw->flags & FTB_FLAG_TRUNC)
lastkey_buf+=ftbw->len;
--- 1.170/client/mysqltest.c 2005-07-15 22:31:53 +03:00
+++ 1.171/client/mysqltest.c 2005-07-28 21:24:02 +03:00
@@ -2654,6 +2654,7 @@
if (!disable_result_log)
{
ulong affected_rows; /* Ok to be undef if 'disable_info' is set */
+ LINT_INIT(affected_rows);
if (res)
{
--- 1.154/tests/mysql_client_test.c 2005-07-20 14:32:41 +03:00
+++ 1.155/tests/mysql_client_test.c 2005-07-28 21:24:03 +03:00
@@ -6805,6 +6805,7 @@
bug #89 (reported by mark@stripped)
*/
+#ifndef EMBEDDED_LIBRARY
static void test_prepare_grant()
{
int rc;
@@ -6896,7 +6897,7 @@
}
}
-
+#endif /* EMBEDDED_LIBRARY */
/*
Test a crash when invalid/corrupted .frm is used in the
@@ -11566,7 +11567,7 @@
const char *stmt_text;
MYSQL_STMT *stmt[2];
int i, rc;
- char *query= "select a,b from t1 where a=?";
+ const char *query= "select a,b from t1 where a=?";
MYSQL_BIND bind[2];
long lval[2];
| Thread |
|---|
| • bk commit into 4.1 tree (monty:1.2355) | monty | 28 Jul |
