Below is the list of changes that have just been committed into a local
5.0 repository of tomas. When tomas 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/in...urce-tree.html

ChangeSet
1.1759 05/02/16 12:43:08 tomas (AT) poseidon (DOT) ndb.mysql.com +5 -0
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278

sql/sql_parse.cc
1.409 05/02/16 12:43:05 tomas (AT) poseidon (DOT) ndb.mysql.com +0 -0
Auto merged

sql/item.cc
1.117 05/02/16 12:43:05 tomas (AT) poseidon (DOT) ndb.mysql.com +0 -0
Auto merged

ndb/test/run-test/Makefile.am
1.18 05/02/16 12:43:04 tomas (AT) poseidon (DOT) ndb.mysql.com +0 -0
Auto merged

BitKeeper/triggers/post-commit
1.32 05/02/16 12:43:04 tomas (AT) poseidon (DOT) ndb.mysql.com +0 -0
Auto merged

BitKeeper/etc/logging_ok
1.288 05/02/16 12:42:50 tomas (AT) poseidon (DOT) ndb.mysql.com +0 -0
auto-union

# 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: tomas
# Host: poseidon.ndb.mysql.com
# Root: /home/tomas/mysql-5.0-ndb-wl2278/RESYNC

--- 1.116/sql/item.cc 2005-02-12 14:57:37 +01:00
+++ 1.117/sql/item.cc 2005-02-16 12:43:05 +01:00
@@ -48,10 +48,10 @@
/*
TODO: make this functions class dependent
*/
+
bool Item::val_bool()
{
- switch(result_type())
- {
+ switch(result_type()) {
case INT_RESULT:
return val_int();
case DECIMAL_RESULT:
@@ -68,6 +68,7 @@
case ROW_RESULT:
default:
DBUG_ASSERT(0);
+ return 0; // Wrong (but safe)
}
}

@@ -991,8 +992,7 @@
{
if ((null_value= result_field->is_null()))
return FALSE;
- switch (result_field->result_type())
- {
+ switch (result_field->result_type()) {
case INT_RESULT:
return result_field->val_int();
case DECIMAL_RESULT:
@@ -1060,8 +1060,9 @@


/*
- Create an item from a string we KNOW points to a valid longlong/ulonglong
- end \0 terminated number string
+ Create an item from a string we KNOW points to a valid longlong
+ end \0 terminated number string.
+ This is always 'signed'. Unsigned values are created with Item_uint()
*/

Item_int::Item_int(const char *str_arg, uint length)
@@ -1071,7 +1072,6 @@
value= my_strtoll10(str_arg, &end_ptr, &error);
max_length= (uint) (end_ptr - str_arg);
name= (char*) str_arg;
- unsigned_flag= value > 0;
fixed= 1;
}

@@ -2436,8 +2436,8 @@
rf is Item_ref => never substitute other items (in this case)
during fix_fields() => we can use rf after fix_fields()
*/
- if (!rf->fixed &&
- rf->fix_fields(thd, tables, reference) || rf->check_cols(1))
+ DBUG_ASSERT(!rf->fixed); // Assured by Item_ref()
+ if (rf->fix_fields(thd, tables, reference) || rf->check_cols(1))
return TRUE;

mark_as_dependent(thd, last, current_sel, rf);
@@ -2458,8 +2458,8 @@
rf is Item_ref => never substitute other items (in this case)
during fix_fields() => we can use rf after fix_fields()
*/
- return (!rf->fixed &&
- rf->fix_fields(thd, tables, reference) || rf->check_cols(1));
+ DBUG_ASSERT(!rf->fixed); // Assured by Item_ref()
+ return (rf->fix_fields(thd, tables, reference) || rf->check_cols(1));
}
}
}
@@ -2706,8 +2706,7 @@

enum_field_types Item::field_type() const
{
- switch (result_type())
- {
+ switch (result_type()) {
case STRING_RESULT: return MYSQL_TYPE_VARCHAR;
case INT_RESULT: return FIELD_TYPE_LONGLONG;
case DECIMAL_RESULT: return FIELD_TYPE_NEWDECIMAL;
@@ -2715,8 +2714,8 @@
case ROW_RESULT:
default:
DBUG_ASSERT(0);
- return FIELD_TYPE_VAR_STRING;
- };
+ return MYSQL_TYPE_VARCHAR;
+ }
}


@@ -3662,18 +3661,17 @@
{
if ((null_value= result_field->is_null()))
return 0;
- switch (result_field->result_type())
- {
+ switch (result_field->result_type()) {
case INT_RESULT:
return result_field->val_int();
case DECIMAL_RESULT:
- {
- my_decimal decimal_value;
- my_decimal *val= result_field->val_decimal(&decimal_value);
- if (val)
- return !my_decimal_is_zero(val);
- return 0;
- }
+ {
+ my_decimal decimal_value;
+ my_decimal *val= result_field->val_decimal(&decimal_value);
+ if (val)
+ return !my_decimal_is_zero(val);
+ return 0;
+ }
case REAL_RESULT:
case STRING_RESULT:
return result_field->val_real() != 0.0;
@@ -4049,8 +4047,7 @@
item->result_type());
char *name=item->name; // Alloced by sql_alloc

- switch (res_type)
- {
+ switch (res_type) {
case STRING_RESULT:
{
char buff[MAX_FIELD_WIDTH];
@@ -4146,8 +4143,7 @@

Item_cache* Item_cache::get_cache(Item_result type)
{
- switch (type)
- {
+ switch (type) {
case INT_RESULT:
return new Item_cache_int();
case REAL_RESULT:
@@ -4617,8 +4613,7 @@
if (item->type() == Item::FIELD_ITEM)
return ((Item_field *)item)->max_disp_length();

- switch (item->result_type())
- {
+ switch (item->result_type()) {
case STRING_RESULT:
case DECIMAL_RESULT:
return item->max_length;

--- 1.408/sql/sql_parse.cc 2005-02-10 17:09:35 +01:00
+++ 1.409/sql/sql_parse.cc 2005-02-16 12:43:05 +01:00
@@ -708,12 +708,12 @@
{
uint connect_errors= 0;
NET *net= &thd->net;
+ ulong pkt_len= 0;
+ char *end;

DBUG_PRINT("info",
("New connection received on %s", vio_description(net->vio)));

- vio_in_addr(net->vio,&thd->remote.sin_addr);
-
if (!thd->host) // If TCP/IP connection
{
char ip[30];
@@ -723,6 +723,7 @@
if (!(thd->ip= my_strdup(ip,MYF(0))))
return (ER_OUT_OF_RESOURCES);
thd->host_or_ip= thd->ip;
+ vio_in_addr(net->vio,&thd->remote.sin_addr);
#if !defined(HAVE_SYS_UN_H) || defined(HAVE_mit_thread)
/* Fast local hostname resolve for Win32 */
if (!strcmp(thd->ip,"127.0.0.1"))
@@ -758,10 +759,10 @@
DBUG_PRINT("info",("Host: %s",thd->host));
thd->host_or_ip= thd->host;
thd->ip= 0;
+ /* Reset sin_addr */
+ bzero((char*) &thd->remote, sizeof(thd->remote));
}
vio_keepalive(net->vio, TRUE);
- ulong pkt_len= 0;
- char *end;
{
/* buff[] needs to big enough to hold the server_version variable */
char buff[SERVER_VERSION_LENGTH + SCRAMBLE_LENGTH + 64];

--- 1.287/BitKeeper/etc/logging_ok 2005-02-12 14:57:24 +01:00
+++ 1.288/BitKeeper/etc/logging_ok 2005-02-16 12:42:50 +01:00
@@ -222,6 +222,7 @@
sergefp (AT) mysql (DOT) com
sinisa (AT) rhols221 (DOT) adsl.netsonic.fi
stewart (AT) mysql (DOT) com
+svoj (AT) mysql (DOT) com
tfr (AT) beta (DOT) frontier86.ee
tfr (AT) indrek (DOT) tfr.cafe.ee
tfr (AT) sarvik (DOT) tfr.cafe.ee

--- 1.17/ndb/test/run-test/Makefile.am 2005-02-15 11:37:58 +01:00
+++ 1.18/ndb/test/run-test/Makefile.am 2005-02-16 12:43:04 +01:00
@@ -10,7 +10,7 @@
test_SCRIPTS=atrt-analyze-result.sh atrt-gather-result.sh atrt-setup.sh \
atrt-clear-result.sh make-config.sh make-index.sh make-html-reports.sh

-atrt_SOURCES = main.cpp
+atrt_SOURCES = main.cpp run-test.hpp
INCLUDES_LOC = -I$(top_srcdir)/ndb/test/include
LDADD_LOC = $(top_builddir)/ndb/test/src/libNDBT.a \
$(top_builddir)/ndb/src/libndbclient.la \
@@ -21,7 +21,7 @@
wrappersdir=$(prefix)/bin
wrappers_SCRIPTS=atrt-testBackup atrt-mysql-test-run

-noinst_HEADERS = run-test.hpp $(test_DATA) $(test_SCRIPTS) $(wrappers_SCRIPTS) README.ATRT
+EXTRA_DIST = $(test_DATA) $(test_SCRIPTS) $(wrappers_SCRIPTS) README.ATRT

# Don't update the files from bitkeeper
%::SCCS/s.%

--
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe: http://lists.mysql.com/internals?uns...ie.nctu.edu.tw