Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2009-12-09 22:24:27 -0100
committerJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2009-12-09 22:24:27 -0100
commitbc95c933f1f08cdcbec5af37f65e804c358b1d45 (patch)
tree102b988f922685da150eb2c136507bacdcd066b2
parentAdded a few more missing includes for my_global.h in the files with MYSQL_{MI... (diff)
downloadmysql-extras-bc95c933f1f08cdcbec5af37f65e804c358b1d45.tar.gz
mysql-extras-bc95c933f1f08cdcbec5af37f65e804c358b1d45.tar.bz2
mysql-extras-bc95c933f1f08cdcbec5af37f65e804c358b1d45.zip
Added a few more strayed min/MYSQL_MIN max/MYSQL_MAX replacements.
Diffstat
-rw-r--r--07110_all_mysql_gcc-4.2_5.1.39.patch601
1 files changed, 326 insertions, 275 deletions
diff --git a/07110_all_mysql_gcc-4.2_5.1.39.patch b/07110_all_mysql_gcc-4.2_5.1.39.patch
index 29c3483..75e6ab1 100644
--- a/07110_all_mysql_gcc-4.2_5.1.39.patch
+++ b/07110_all_mysql_gcc-4.2_5.1.39.patch
@@ -1,6 +1,6 @@
diff -urN mysql-old/client/mysqlbinlog.cc mysql/client/mysqlbinlog.cc
---- mysql-old/client/mysqlbinlog.cc 2009-12-09 18:51:34.207801141 -0100
-+++ mysql/client/mysqlbinlog.cc 2009-12-09 18:51:44.645800538 -0100
+--- mysql-old/client/mysqlbinlog.cc 2009-12-09 22:18:31.994776418 -0100
++++ mysql/client/mysqlbinlog.cc 2009-12-09 22:22:17.748549711 -0100
@@ -1924,7 +1924,7 @@
my_off_t length,tmp;
for (length= start_position_mot ; length > 0 ; length-=tmp)
@@ -11,8 +11,8 @@ diff -urN mysql-old/client/mysqlbinlog.cc mysql/client/mysqlbinlog.cc
{
error("Failed reading from file.");
diff -urN mysql-old/client/mysql.cc mysql/client/mysql.cc
---- mysql-old/client/mysql.cc 2009-12-09 18:51:34.207801141 -0100
-+++ mysql/client/mysql.cc 2009-12-09 18:51:44.647800101 -0100
+--- mysql-old/client/mysql.cc 2009-12-09 22:18:31.994776418 -0100
++++ mysql/client/mysql.cc 2009-12-09 22:22:17.755549628 -0100
@@ -3281,9 +3281,9 @@
{
uint length= column_names ? field->name_length : 0;
@@ -35,8 +35,8 @@ diff -urN mysql-old/client/mysql.cc mysql/client/mysql.cc
field->name);
num_flag[off]= IS_NUM(field->type);
diff -urN mysql-old/client/mysqldump.c mysql/client/mysqldump.c
---- mysql-old/client/mysqldump.c 2009-12-09 18:51:34.207801141 -0100
-+++ mysql/client/mysqldump.c 2009-12-09 18:51:44.650800257 -0100
+--- mysql-old/client/mysqldump.c 2009-12-09 22:18:31.994776418 -0100
++++ mysql/client/mysqldump.c 2009-12-09 22:22:12.989674661 -0100
@@ -808,7 +808,7 @@
&err_ptr, &err_len);
if (err_len)
@@ -56,8 +56,8 @@ diff -urN mysql-old/client/mysqldump.c mysql/client/mysqldump.c
if (!find)
{
diff -urN mysql-old/client/mysqltest.cc mysql/client/mysqltest.cc
---- mysql-old/client/mysqltest.cc 2009-12-09 18:51:34.207801141 -0100
-+++ mysql/client/mysqltest.cc 2009-12-09 18:51:44.654800178 -0100
+--- mysql-old/client/mysqltest.cc 2009-12-09 22:18:31.993800403 -0100
++++ mysql/client/mysqltest.cc 2009-12-09 22:22:17.768549647 -0100
@@ -5302,9 +5302,9 @@
}
else if ((c == '{' &&
@@ -71,8 +71,8 @@ diff -urN mysql-old/client/mysqltest.cc mysql/client/mysqltest.cc
/* Only if and while commands can be terminated by { */
*p++= c;
diff -urN mysql-old/client/mysql_upgrade.c mysql/client/mysql_upgrade.c
---- mysql-old/client/mysql_upgrade.c 2009-12-09 18:51:34.207801141 -0100
-+++ mysql/client/mysql_upgrade.c 2009-12-09 18:51:44.657799875 -0100
+--- mysql-old/client/mysql_upgrade.c 2009-12-09 22:18:31.994776418 -0100
++++ mysql/client/mysql_upgrade.c 2009-12-09 22:22:12.990674834 -0100
@@ -502,7 +502,7 @@
if ((value_end= strchr(value_start, '\n')) == NULL)
return 1; /* Unexpected result */
@@ -83,8 +83,8 @@ diff -urN mysql-old/client/mysql_upgrade.c mysql/client/mysql_upgrade.c
}
diff -urN mysql-old/client/sql_string.cc mysql/client/sql_string.cc
---- mysql-old/client/sql_string.cc 2009-12-09 18:51:34.207801141 -0100
-+++ mysql/client/sql_string.cc 2009-12-09 18:51:44.658800801 -0100
+--- mysql-old/client/sql_string.cc 2009-12-09 22:18:31.994776418 -0100
++++ mysql/client/sql_string.cc 2009-12-09 22:22:17.769549826 -0100
@@ -659,7 +659,7 @@
{
if (Alloced_length < str_length + space_needed)
@@ -113,8 +113,8 @@ diff -urN mysql-old/client/sql_string.cc mysql/client/sql_string.cc
to->str_charset=from->str_charset;
return to;
diff -urN mysql-old/dbug/dbug.c mysql/dbug/dbug.c
---- mysql-old/dbug/dbug.c 2009-12-09 18:51:34.216800671 -0100
-+++ mysql/dbug/dbug.c 2009-12-09 18:51:44.659800425 -0100
+--- mysql-old/dbug/dbug.c 2009-12-09 22:18:32.000800402 -0100
++++ mysql/dbug/dbug.c 2009-12-09 22:22:13.018674654 -0100
@@ -1202,7 +1202,7 @@
if (TRACING)
{
@@ -134,8 +134,8 @@ diff -urN mysql-old/dbug/dbug.c mysql/dbug/dbug.c
{
if ((count % INDENT) == 0)
diff -urN mysql-old/extra/yassl/src/handshake.cpp mysql/extra/yassl/src/handshake.cpp
---- mysql-old/extra/yassl/src/handshake.cpp 2009-12-09 18:51:34.211799854 -0100
-+++ mysql/extra/yassl/src/handshake.cpp 2009-12-09 18:51:44.660800521 -0100
+--- mysql-old/extra/yassl/src/handshake.cpp 2009-12-09 22:18:31.997800162 -0100
++++ mysql/extra/yassl/src/handshake.cpp 2009-12-09 22:22:23.149549744 -0100
@@ -26,6 +26,7 @@
#include "runtime.hpp"
#include "handshake.hpp"
@@ -154,8 +154,8 @@ diff -urN mysql-old/extra/yassl/src/handshake.cpp mysql/extra/yassl/src/handshak
input_buffer tmp;
diff -urN mysql-old/extra/yassl/src/ssl.cpp mysql/extra/yassl/src/ssl.cpp
---- mysql-old/extra/yassl/src/ssl.cpp 2009-12-09 18:51:34.211799854 -0100
-+++ mysql/extra/yassl/src/ssl.cpp 2009-12-09 18:51:44.661800913 -0100
+--- mysql-old/extra/yassl/src/ssl.cpp 2009-12-09 22:18:31.997800162 -0100
++++ mysql/extra/yassl/src/ssl.cpp 2009-12-09 22:22:23.151549702 -0100
@@ -38,6 +38,7 @@
#include "file.hpp" // for TaoCrypt Source
#include "coding.hpp" // HexDecoder
@@ -201,8 +201,8 @@ diff -urN mysql-old/extra/yassl/src/ssl.cpp mysql/extra/yassl/src/ssl.cpp
keyOutput += store;
diff -urN mysql-old/extra/yassl/src/yassl_imp.cpp mysql/extra/yassl/src/yassl_imp.cpp
---- mysql-old/extra/yassl/src/yassl_imp.cpp 2009-12-09 18:51:34.211799854 -0100
-+++ mysql/extra/yassl/src/yassl_imp.cpp 2009-12-09 18:51:44.662800108 -0100
+--- mysql-old/extra/yassl/src/yassl_imp.cpp 2009-12-09 22:18:31.997800162 -0100
++++ mysql/extra/yassl/src/yassl_imp.cpp 2009-12-09 22:22:23.154549805 -0100
@@ -22,6 +22,7 @@
#include "runtime.hpp"
#include "yassl_int.hpp"
@@ -221,8 +221,8 @@ diff -urN mysql-old/extra/yassl/src/yassl_imp.cpp mysql/extra/yassl/src/yassl_im
if (len > hello.suite_len_) // ignore extra suites
input.set_current(input.get_current() + len - hello.suite_len_);
diff -urN mysql-old/extra/yassl/src/yassl_int.cpp mysql/extra/yassl/src/yassl_int.cpp
---- mysql-old/extra/yassl/src/yassl_int.cpp 2009-12-09 18:51:34.210800197 -0100
-+++ mysql/extra/yassl/src/yassl_int.cpp 2009-12-09 18:51:44.664800418 -0100
+--- mysql-old/extra/yassl/src/yassl_int.cpp 2009-12-09 22:18:31.997800162 -0100
++++ mysql/extra/yassl/src/yassl_int.cpp 2009-12-09 22:22:23.158549679 -0100
@@ -25,6 +25,7 @@
#include "yassl_int.hpp"
#include "handshake.hpp"
@@ -275,8 +275,8 @@ diff -urN mysql-old/extra/yassl/src/yassl_int.cpp mysql/extra/yassl/src/yassl_in
strncpy(name, prev, len);
name[(len == sizeof(name)) ? len - 1 : len] = 0;
diff -urN mysql-old/extra/yassl/taocrypt/src/algebra.cpp mysql/extra/yassl/taocrypt/src/algebra.cpp
---- mysql-old/extra/yassl/taocrypt/src/algebra.cpp 2009-12-09 18:51:34.213801027 -0100
-+++ mysql/extra/yassl/taocrypt/src/algebra.cpp 2009-12-09 18:51:44.665618117 -0100
+--- mysql-old/extra/yassl/taocrypt/src/algebra.cpp 2009-12-09 22:18:31.999800275 -0100
++++ mysql/extra/yassl/taocrypt/src/algebra.cpp 2009-12-09 22:22:23.172549877 -0100
@@ -22,6 +22,7 @@
#include "runtime.hpp"
@@ -295,8 +295,8 @@ diff -urN mysql-old/extra/yassl/taocrypt/src/algebra.cpp mysql/extra/yassl/taocr
return Identity();
diff -urN mysql-old/extra/yassl/taocrypt/src/dh.cpp mysql/extra/yassl/taocrypt/src/dh.cpp
---- mysql-old/extra/yassl/taocrypt/src/dh.cpp 2009-12-09 18:51:34.213801027 -0100
-+++ mysql/extra/yassl/taocrypt/src/dh.cpp 2009-12-09 18:51:44.665618117 -0100
+--- mysql-old/extra/yassl/taocrypt/src/dh.cpp 2009-12-09 22:18:31.999800275 -0100
++++ mysql/extra/yassl/taocrypt/src/dh.cpp 2009-12-09 22:22:23.172549877 -0100
@@ -23,6 +23,7 @@
#include "runtime.hpp"
#include "dh.hpp"
@@ -315,8 +315,8 @@ diff -urN mysql-old/extra/yassl/taocrypt/src/dh.cpp mysql/extra/yassl/taocrypt/s
x.Encode(priv, p_.ByteCount());
}
diff -urN mysql-old/extra/yassl/taocrypt/src/hash.cpp mysql/extra/yassl/taocrypt/src/hash.cpp
---- mysql-old/extra/yassl/taocrypt/src/hash.cpp 2009-12-09 18:51:34.213801027 -0100
-+++ mysql/extra/yassl/taocrypt/src/hash.cpp 2009-12-09 18:51:44.665618117 -0100
+--- mysql-old/extra/yassl/taocrypt/src/hash.cpp 2009-12-09 22:18:31.998801063 -0100
++++ mysql/extra/yassl/taocrypt/src/hash.cpp 2009-12-09 22:22:23.172549877 -0100
@@ -22,6 +22,7 @@
#include "runtime.hpp"
#include <string.h>
@@ -344,8 +344,8 @@ diff -urN mysql-old/extra/yassl/taocrypt/src/hash.cpp mysql/extra/yassl/taocrypt
buffLen_ += add;
diff -urN mysql-old/extra/yassl/taocrypt/src/integer.cpp mysql/extra/yassl/taocrypt/src/integer.cpp
---- mysql-old/extra/yassl/taocrypt/src/integer.cpp 2009-12-09 18:51:34.213801027 -0100
-+++ mysql/extra/yassl/taocrypt/src/integer.cpp 2009-12-09 18:51:44.667800554 -0100
+--- mysql-old/extra/yassl/taocrypt/src/integer.cpp 2009-12-09 22:18:31.998801063 -0100
++++ mysql/extra/yassl/taocrypt/src/integer.cpp 2009-12-09 22:22:23.178549649 -0100
@@ -24,7 +24,7 @@
#include "integer.hpp"
#include "modarith.hpp"
@@ -383,8 +383,8 @@ diff -urN mysql-old/extra/yassl/taocrypt/src/integer.cpp mysql/extra/yassl/taocr
{
if (b.NotNegative())
diff -urN mysql-old/extra/yassl/taocrypt/src/md5.cpp mysql/extra/yassl/taocrypt/src/md5.cpp
---- mysql-old/extra/yassl/taocrypt/src/md5.cpp 2009-12-09 18:51:34.213801027 -0100
-+++ mysql/extra/yassl/taocrypt/src/md5.cpp 2009-12-09 18:51:44.668800400 -0100
+--- mysql-old/extra/yassl/taocrypt/src/md5.cpp 2009-12-09 22:18:31.998801063 -0100
++++ mysql/extra/yassl/taocrypt/src/md5.cpp 2009-12-09 22:22:23.178549649 -0100
@@ -92,7 +92,7 @@
// remove buffered data if possible
@@ -395,8 +395,8 @@ diff -urN mysql-old/extra/yassl/taocrypt/src/md5.cpp mysql/extra/yassl/taocrypt/
buffLen_ += add;
diff -urN mysql-old/extra/yassl/taocrypt/src/ripemd.cpp mysql/extra/yassl/taocrypt/src/ripemd.cpp
---- mysql-old/extra/yassl/taocrypt/src/ripemd.cpp 2009-12-09 18:51:34.213801027 -0100
-+++ mysql/extra/yassl/taocrypt/src/ripemd.cpp 2009-12-09 18:51:44.669800176 -0100
+--- mysql-old/extra/yassl/taocrypt/src/ripemd.cpp 2009-12-09 22:18:31.998801063 -0100
++++ mysql/extra/yassl/taocrypt/src/ripemd.cpp 2009-12-09 22:22:23.180549832 -0100
@@ -94,7 +94,7 @@
// remove buffered data if possible
@@ -407,8 +407,8 @@ diff -urN mysql-old/extra/yassl/taocrypt/src/ripemd.cpp mysql/extra/yassl/taocry
buffLen_ += add;
diff -urN mysql-old/extra/yassl/taocrypt/src/sha.cpp mysql/extra/yassl/taocrypt/src/sha.cpp
---- mysql-old/extra/yassl/taocrypt/src/sha.cpp 2009-12-09 18:51:34.213801027 -0100
-+++ mysql/extra/yassl/taocrypt/src/sha.cpp 2009-12-09 18:51:44.670800358 -0100
+--- mysql-old/extra/yassl/taocrypt/src/sha.cpp 2009-12-09 22:18:31.998801063 -0100
++++ mysql/extra/yassl/taocrypt/src/sha.cpp 2009-12-09 22:22:23.181549900 -0100
@@ -327,7 +327,7 @@
// remove buffered data if possible
@@ -419,8 +419,8 @@ diff -urN mysql-old/extra/yassl/taocrypt/src/sha.cpp mysql/extra/yassl/taocrypt/
buffLen_ += add;
diff -urN mysql-old/include/my_global.h mysql/include/my_global.h
---- mysql-old/include/my_global.h 2009-12-09 18:51:34.245801408 -0100
-+++ mysql/include/my_global.h 2009-12-09 18:51:44.671800047 -0100
+--- mysql-old/include/my_global.h 2009-12-09 22:18:32.029802357 -0100
++++ mysql/include/my_global.h 2009-12-09 22:22:32.714674951 -0100
@@ -578,10 +578,8 @@
#endif
@@ -446,8 +446,8 @@ diff -urN mysql-old/include/my_global.h mysql/include/my_global.h
/*
Only Linux is known to need an explicit sync of the directory to make sure a
diff -urN mysql-old/libmysql/libmysql.c mysql/libmysql/libmysql.c
---- mysql-old/libmysql/libmysql.c 2009-12-09 18:51:34.208802160 -0100
-+++ mysql/libmysql/libmysql.c 2009-12-09 18:51:44.673800065 -0100
+--- mysql-old/libmysql/libmysql.c 2009-12-09 22:18:31.995800929 -0100
++++ mysql/libmysql/libmysql.c 2009-12-09 22:22:13.000674623 -0100
@@ -1570,7 +1570,7 @@
my_net_set_read_timeout(net, CLIENT_NET_READ_TIMEOUT);
my_net_set_write_timeout(net, CLIENT_NET_WRITE_TIMEOUT);
@@ -497,8 +497,8 @@ diff -urN mysql-old/libmysql/libmysql.c mysql/libmysql/libmysql.c
/* Add an end null if there is room in the buffer */
if (copy_length != param->buffer_length)
diff -urN mysql-old/libmysqld/lib_sql.cc mysql/libmysqld/lib_sql.cc
---- mysql-old/libmysqld/lib_sql.cc 2009-12-09 18:51:34.120800985 -0100
-+++ mysql/libmysqld/lib_sql.cc 2009-12-09 18:51:44.675634726 -0100
+--- mysql-old/libmysqld/lib_sql.cc 2009-12-09 22:18:31.911800622 -0100
++++ mysql/libmysqld/lib_sql.cc 2009-12-09 22:22:17.218674639 -0100
@@ -821,7 +821,7 @@
is cleared between substatements, and mysqltest gets confused
*/
@@ -509,8 +509,8 @@ diff -urN mysql-old/libmysqld/lib_sql.cc mysql/libmysqld/lib_sql.cc
}
diff -urN mysql-old/mysys/array.c mysql/mysys/array.c
---- mysql-old/mysys/array.c 2009-12-09 18:51:34.217801231 -0100
-+++ mysql/mysys/array.c 2009-12-09 18:51:44.676800895 -0100
+--- mysql-old/mysys/array.c 2009-12-09 22:18:32.001800466 -0100
++++ mysql/mysys/array.c 2009-12-09 22:22:13.062674812 -0100
@@ -47,7 +47,7 @@
DBUG_ENTER("init_dynamic_array");
if (!alloc_increment)
@@ -530,8 +530,8 @@ diff -urN mysql-old/mysys/array.c mysql/mysys/array.c
/*
Do nothing if we are using a static buffer
diff -urN mysql-old/mysys/default.c mysql/mysys/default.c
---- mysql-old/mysys/default.c 2009-12-09 18:51:34.217801231 -0100
-+++ mysql/mysys/default.c 2009-12-09 18:51:44.677800527 -0100
+--- mysql-old/mysys/default.c 2009-12-09 22:18:32.001800466 -0100
++++ mysql/mysys/default.c 2009-12-09 22:22:13.063674799 -0100
@@ -793,7 +793,7 @@
for ( ; my_isspace(&my_charset_latin1,end[-1]) ; end--) ;
end[0]=0;
@@ -542,8 +542,8 @@ diff -urN mysql-old/mysys/default.c mysql/mysys/default.c
/* signal that a new group is found */
opt_handler(handler_ctx, curr_gr, NULL);
diff -urN mysql-old/mysys/mf_dirname.c mysql/mysys/mf_dirname.c
---- mysql-old/mysys/mf_dirname.c 2009-12-09 18:51:34.217801231 -0100
-+++ mysql/mysys/mf_dirname.c 2009-12-09 18:51:44.677800527 -0100
+--- mysql-old/mysys/mf_dirname.c 2009-12-09 22:18:32.002800260 -0100
++++ mysql/mysys/mf_dirname.c 2009-12-09 22:22:13.063674799 -0100
@@ -82,7 +82,7 @@
SYNPOSIS
convert_dirname()
@@ -554,8 +554,8 @@ diff -urN mysql-old/mysys/mf_dirname.c mysql/mysys/mf_dirname.c
from Original filename. May be == to
from_end Pointer at end of filename (normally end \0)
diff -urN mysql-old/mysys/mf_format.c mysql/mysys/mf_format.c
---- mysql-old/mysys/mf_format.c 2009-12-09 18:51:34.218800359 -0100
-+++ mysql/mysys/mf_format.c 2009-12-09 18:51:44.678800319 -0100
+--- mysql-old/mysys/mf_format.c 2009-12-09 22:18:32.002800260 -0100
++++ mysql/mysys/mf_format.c 2009-12-09 22:22:13.064674776 -0100
@@ -83,7 +83,7 @@
tmp_length= strlength(startpos);
DBUG_PRINT("error",("dev: '%s' ext: '%s' length: %u",dev,ext,
@@ -566,8 +566,8 @@ diff -urN mysql-old/mysys/mf_format.c mysql/mysys/mf_format.c
else
{
diff -urN mysql-old/mysys/mf_iocache.c mysql/mysys/mf_iocache.c
---- mysql-old/mysys/mf_iocache.c 2009-12-09 18:51:34.218800359 -0100
-+++ mysql/mysys/mf_iocache.c 2009-12-09 18:51:44.679800164 -0100
+--- mysql-old/mysys/mf_iocache.c 2009-12-09 22:18:32.002800260 -0100
++++ mysql/mysys/mf_iocache.c 2009-12-09 22:22:13.066674596 -0100
@@ -1097,7 +1097,7 @@
*/
while (write_length)
@@ -605,8 +605,8 @@ diff -urN mysql-old/mysys/mf_iocache.c mysql/mysys/mf_iocache.c
info->read_pos=info->request_pos+Count;
info->read_end=info->request_pos+read_length;
diff -urN mysql-old/mysys/my_alloc.c mysql/mysys/my_alloc.c
---- mysql-old/mysys/my_alloc.c 2009-12-09 18:51:34.218800359 -0100
-+++ mysql/mysys/my_alloc.c 2009-12-09 18:51:44.680800244 -0100
+--- mysql-old/mysys/my_alloc.c 2009-12-09 22:18:32.002800260 -0100
++++ mysql/mysys/my_alloc.c 2009-12-09 22:22:13.067674775 -0100
@@ -196,7 +196,7 @@
{ /* Time to alloc new block */
block_size= mem_root->block_size * (mem_root->block_num >> 2);
@@ -616,9 +616,21 @@ diff -urN mysql-old/mysys/my_alloc.c mysql/mysys/my_alloc.c
if (!(next = (USED_MEM*) my_malloc(get_size,MYF(MY_WME))))
{
+diff -urN mysql-old/mysys/my_bitmap.c mysql/mysys/my_bitmap.c
+--- mysql-old/mysys/my_bitmap.c 2009-12-09 22:18:32.001800466 -0100
++++ mysql/mysys/my_bitmap.c 2009-12-09 22:22:13.048674785 -0100
+@@ -365,7 +365,7 @@
+
+ DBUG_ASSERT(map->bitmap && map2->bitmap);
+
+- end= to+min(len,len2);
++ end= to+MYSQL_MIN(len,len2);
+ *map2->last_word_ptr&= ~map2->last_word_mask; /*Clear last bits in map2*/
+ while (to < end)
+ *to++ &= *from++;
diff -urN mysql-old/mysys/my_conio.c mysql/mysys/my_conio.c
---- mysql-old/mysys/my_conio.c 2009-12-09 18:51:34.216800671 -0100
-+++ mysql/mysys/my_conio.c 2009-12-09 18:51:44.680800244 -0100
+--- mysql-old/mysys/my_conio.c 2009-12-09 22:18:32.000800402 -0100
++++ mysql/mysys/my_conio.c 2009-12-09 22:22:13.067674775 -0100
@@ -165,13 +165,13 @@
though it is known it should not be more than 64K
so we cut 64K and try first size of screen buffer
@@ -637,8 +649,8 @@ diff -urN mysql-old/mysys/my_conio.c mysql/mysys/my_conio.c
NULL))
{
diff -urN mysql-old/mysys/my_file.c mysql/mysys/my_file.c
---- mysql-old/mysys/my_file.c 2009-12-09 18:51:34.218800359 -0100
-+++ mysql/mysys/my_file.c 2009-12-09 18:51:44.681800848 -0100
+--- mysql-old/mysys/my_file.c 2009-12-09 22:18:32.003800338 -0100
++++ mysql/mysys/my_file.c 2009-12-09 22:22:13.068674746 -0100
@@ -75,7 +75,7 @@
static int set_max_open_files(uint max_file_limit)
{
@@ -661,8 +673,8 @@ diff -urN mysql-old/mysys/my_file.c mysql/mysys/my_file.c
my_file_info= tmp;
my_file_limit= files;
diff -urN mysql-old/mysys/my_getopt.c mysql/mysys/my_getopt.c
---- mysql-old/mysys/my_getopt.c 2009-12-09 18:51:34.217801231 -0100
-+++ mysql/mysys/my_getopt.c 2009-12-09 18:51:44.681800848 -0100
+--- mysql-old/mysys/my_getopt.c 2009-12-09 22:18:32.001800466 -0100
++++ mysql/mysys/my_getopt.c 2009-12-09 22:22:13.069674823 -0100
@@ -973,7 +973,7 @@
}
if (optp->max_value && num > (double) optp->max_value)
@@ -673,8 +685,8 @@ diff -urN mysql-old/mysys/my_getopt.c mysql/mysys/my_getopt.c
/*
diff -urN mysql-old/mysys/my_handler.c mysql/mysys/my_handler.c
---- mysql-old/mysys/my_handler.c 2009-12-09 18:51:34.216800671 -0100
-+++ mysql/mysys/my_handler.c 2009-12-09 18:51:44.682800034 -0100
+--- mysql-old/mysys/my_handler.c 2009-12-09 22:18:32.001800466 -0100
++++ mysql/mysys/my_handler.c 2009-12-09 22:22:13.070674728 -0100
@@ -38,7 +38,7 @@
static int compare_bin(uchar *a, uint a_length, uchar *b, uint b_length,
my_bool part_key, my_bool skip_end_space)
@@ -694,8 +706,8 @@ diff -urN mysql-old/mysys/my_handler.c mysql/mysys/my_handler.c
switch ((enum ha_base_keytype) keyseg->type) {
diff -urN mysql-old/mysys/safemalloc.c mysql/mysys/safemalloc.c
---- mysql-old/mysys/safemalloc.c 2009-12-09 18:51:34.218800359 -0100
-+++ mysql/mysys/safemalloc.c 2009-12-09 18:51:44.683768014 -0100
+--- mysql-old/mysys/safemalloc.c 2009-12-09 22:18:32.002800260 -0100
++++ mysql/mysys/safemalloc.c 2009-12-09 22:22:13.071674808 -0100
@@ -238,7 +238,7 @@
if ((data= _mymalloc(size,filename,lineno,MyFlags))) /* Allocate new area */
@@ -706,8 +718,8 @@ diff -urN mysql-old/mysys/safemalloc.c mysql/mysys/safemalloc.c
_myfree(ptr, filename, lineno, 0); /* Free not needed area */
}
diff -urN mysql-old/mysys/stacktrace.c mysql/mysys/stacktrace.c
---- mysql-old/mysys/stacktrace.c 2009-12-09 18:51:34.216800671 -0100
-+++ mysql/mysys/stacktrace.c 2009-12-09 18:51:44.684552384 -0100
+--- mysql-old/mysys/stacktrace.c 2009-12-09 22:18:32.001800466 -0100
++++ mysql/mysys/stacktrace.c 2009-12-09 22:22:13.072674725 -0100
@@ -210,7 +210,7 @@
if (!stack_bottom || (uchar*) stack_bottom > (uchar*) &fp)
@@ -718,8 +730,8 @@ diff -urN mysql-old/mysys/stacktrace.c mysql/mysys/stacktrace.c
stack_bottom= (uchar*) (((ulong) &fp + tmp) &
~(ulong) 0xFFFF);
diff -urN mysql-old/server-tools/instance-manager/buffer.cc mysql/server-tools/instance-manager/buffer.cc
---- mysql-old/server-tools/instance-manager/buffer.cc 2009-12-09 18:51:33.977800917 -0100
-+++ mysql/server-tools/instance-manager/buffer.cc 2009-12-09 18:51:44.684552384 -0100
+--- mysql-old/server-tools/instance-manager/buffer.cc 2009-12-09 22:18:31.779800907 -0100
++++ mysql/server-tools/instance-manager/buffer.cc 2009-12-09 22:22:17.213674676 -0100
@@ -83,8 +83,8 @@
if (position + len_arg >= buffer_size)
{
@@ -732,8 +744,8 @@ diff -urN mysql-old/server-tools/instance-manager/buffer.cc mysql/server-tools/i
if (!(buffer))
goto err;
diff -urN mysql-old/server-tools/instance-manager/listener.cc mysql/server-tools/instance-manager/listener.cc
---- mysql-old/server-tools/instance-manager/listener.cc 2009-12-09 18:51:33.977800917 -0100
-+++ mysql/server-tools/instance-manager/listener.cc 2009-12-09 18:51:44.684552384 -0100
+--- mysql-old/server-tools/instance-manager/listener.cc 2009-12-09 22:18:31.780800882 -0100
++++ mysql/server-tools/instance-manager/listener.cc 2009-12-09 22:22:17.214674651 -0100
@@ -103,7 +103,7 @@
/* II. Listen sockets and spawn childs */
@@ -744,8 +756,8 @@ diff -urN mysql-old/server-tools/instance-manager/listener.cc mysql/server-tools
timeval tv;
diff -urN mysql-old/sql/field.cc mysql/sql/field.cc
---- mysql-old/sql/field.cc 2009-12-09 18:51:34.137802930 -0100
-+++ mysql/sql/field.cc 2009-12-09 18:51:44.687799885 -0100
+--- mysql-old/sql/field.cc 2009-12-09 22:18:31.927801480 -0100
++++ mysql/sql/field.cc 2009-12-09 22:22:17.371549666 -0100
@@ -54,7 +54,7 @@
#define LONGLONG_TO_STRING_CONVERSION_BUFFER_SIZE 128
#define DECIMAL_TO_STRING_CONVERSION_BUFFER_SIZE 128
@@ -946,8 +958,8 @@ diff -urN mysql-old/sql/field.cc mysql/sql/field.cc
flags|= ZEROFILL_FLAG | UNSIGNED_FLAG;
/*
diff -urN mysql-old/sql/filesort.cc mysql/sql/filesort.cc
---- mysql-old/sql/filesort.cc 2009-12-09 18:51:34.131802684 -0100
-+++ mysql/sql/filesort.cc 2009-12-09 18:51:44.691924809 -0100
+--- mysql-old/sql/filesort.cc 2009-12-09 22:18:31.922801485 -0100
++++ mysql/sql/filesort.cc 2009-12-09 22:22:17.374549695 -0100
@@ -191,7 +191,7 @@
#ifdef CAN_TRUST_RANGE
if (select && select->quick && select->quick->records > 0L)
@@ -991,8 +1003,8 @@ diff -urN mysql-old/sql/filesort.cc mysql/sql/filesort.cc
err:
delete_queue(&queue);
diff -urN mysql-old/sql/ha_ndbcluster.cc mysql/sql/ha_ndbcluster.cc
---- mysql-old/sql/ha_ndbcluster.cc 2009-12-09 18:51:34.139802270 -0100
-+++ mysql/sql/ha_ndbcluster.cc 2009-12-09 18:51:44.695550130 -0100
+--- mysql-old/sql/ha_ndbcluster.cc 2009-12-09 22:18:31.929802514 -0100
++++ mysql/sql/ha_ndbcluster.cc 2009-12-09 22:22:17.389549663 -0100
@@ -800,7 +800,7 @@
DBUG_PRINT("value", ("set blob ptr: 0x%lx len: %u",
@@ -1003,8 +1015,8 @@ diff -urN mysql-old/sql/ha_ndbcluster.cc mysql/sql/ha_ndbcluster.cc
if (set_blob_value)
*set_blob_value= TRUE;
diff -urN mysql-old/sql/handler.h mysql/sql/handler.h
---- mysql-old/sql/handler.h 2009-12-09 18:51:34.143801205 -0100
-+++ mysql/sql/handler.h 2009-12-09 18:51:44.699550111 -0100
+--- mysql-old/sql/handler.h 2009-12-09 22:18:31.932801290 -0100
++++ mysql/sql/handler.h 2009-12-09 22:22:32.544674801 -0100
@@ -1590,15 +1590,15 @@
{ return (HA_ERR_WRONG_COMMAND); }
@@ -1027,8 +1039,8 @@ diff -urN mysql-old/sql/handler.h mysql/sql/handler.h
virtual uint max_supported_record_length() const { return HA_MAX_REC_LENGTH; }
virtual uint max_supported_keys() const { return 0; }
diff -urN mysql-old/sql/item.cc mysql/sql/item.cc
---- mysql-old/sql/item.cc 2009-12-09 18:51:34.138801911 -0100
-+++ mysql/sql/item.cc 2009-12-09 18:51:44.702799965 -0100
+--- mysql-old/sql/item.cc 2009-12-09 22:18:31.928801907 -0100
++++ mysql/sql/item.cc 2009-12-09 22:22:17.399549651 -0100
@@ -74,7 +74,7 @@
Hybrid_type_traits_decimal::fix_length_and_dec(Item *item, Item *arg) const
{
@@ -1047,6 +1059,15 @@ diff -urN mysql-old/sql/item.cc mysql/sql/item.cc
}
+@@ -5356,7 +5356,7 @@
+ // following assert is redundant, because fixed=1 assigned in constructor
+ DBUG_ASSERT(fixed == 1);
+ char *end=(char*) str_value.ptr()+str_value.length(),
+- *ptr=end-min(str_value.length(),sizeof(longlong));
++ *ptr=end-MYSQL_MIN(str_value.length(),sizeof(longlong));
+
+ ulonglong value=0;
+ for (; ptr != end ; ptr++)
@@ -5411,7 +5411,7 @@
void Item_hex_string::print(String *str, enum_query_type query_type)
{
@@ -1103,8 +1124,8 @@ diff -urN mysql-old/sql/item.cc mysql/sql/item.cc
maybe_null|= item->maybe_null;
get_full_info(item);
diff -urN mysql-old/sql/item_cmpfunc.cc mysql/sql/item_cmpfunc.cc
---- mysql-old/sql/item_cmpfunc.cc 2009-12-09 18:51:34.138801911 -0100
-+++ mysql/sql/item_cmpfunc.cc 2009-12-09 18:51:44.705799810 -0100
+--- mysql-old/sql/item_cmpfunc.cc 2009-12-09 22:18:31.928801907 -0100
++++ mysql/sql/item_cmpfunc.cc 2009-12-09 22:22:17.407549657 -0100
@@ -1119,7 +1119,7 @@
owner->null_value= 0;
uint res1_length= res1->length();
@@ -1233,8 +1254,8 @@ diff -urN mysql-old/sql/item_cmpfunc.cc mysql/sql/item_cmpfunc.cc
}
j+= shift;
diff -urN mysql-old/sql/item_func.cc mysql/sql/item_func.cc
---- mysql-old/sql/item_func.cc 2009-12-09 18:51:34.138801911 -0100
-+++ mysql/sql/item_func.cc 2009-12-09 18:51:44.709800164 -0100
+--- mysql-old/sql/item_func.cc 2009-12-09 22:18:31.928801907 -0100
++++ mysql/sql/item_func.cc 2009-12-09 22:22:17.415549807 -0100
@@ -541,7 +541,7 @@
set_if_bigger(max_int_part, args[i]->decimal_int_part());
set_if_smaller(unsigned_flag, args[i]->unsigned_flag);
@@ -1369,8 +1390,8 @@ diff -urN mysql-old/sql/item_func.cc mysql/sql/item_func.cc
initialized=1;
if (error)
diff -urN mysql-old/sql/item_func.h mysql/sql/item_func.h
---- mysql-old/sql/item_func.h 2009-12-09 18:51:34.143801205 -0100
-+++ mysql/sql/item_func.h 2009-12-09 18:51:44.711799852 -0100
+--- mysql-old/sql/item_func.h 2009-12-09 22:18:31.933800385 -0100
++++ mysql/sql/item_func.h 2009-12-09 22:22:32.546674664 -0100
@@ -363,7 +363,7 @@
const char *func_name() const { return "cast_as_unsigned"; }
void fix_length_and_dec()
@@ -1381,8 +1402,8 @@ diff -urN mysql-old/sql/item_func.h mysql/sql/item_func.h
}
longlong val_int();
diff -urN mysql-old/sql/item_strfunc.cc mysql/sql/item_strfunc.cc
---- mysql-old/sql/item_strfunc.cc 2009-12-09 18:51:34.137802930 -0100
-+++ mysql/sql/item_strfunc.cc 2009-12-09 18:51:44.713800161 -0100
+--- mysql-old/sql/item_strfunc.cc 2009-12-09 22:18:31.927801480 -0100
++++ mysql/sql/item_strfunc.cc 2009-12-09 22:22:17.421549663 -0100
@@ -384,7 +384,7 @@
}
else
@@ -1443,8 +1464,8 @@ diff -urN mysql-old/sql/item_strfunc.cc mysql/sql/item_strfunc.cc
nanoseq-= delta;
}
diff -urN mysql-old/sql/item_sum.cc mysql/sql/item_sum.cc
---- mysql-old/sql/item_sum.cc 2009-12-09 18:51:34.138801911 -0100
-+++ mysql/sql/item_sum.cc 2009-12-09 18:51:44.715800185 -0100
+--- mysql-old/sql/item_sum.cc 2009-12-09 22:18:31.928801907 -0100
++++ mysql/sql/item_sum.cc 2009-12-09 22:22:17.426549660 -0100
@@ -1169,7 +1169,7 @@
AVG() will divide val by count. We need to reserve digits
after decimal point as the result can be fractional.
@@ -1500,8 +1521,8 @@ diff -urN mysql-old/sql/item_sum.cc mysql/sql/item_sum.cc
tree_key_length,
group_concat_key_cmp_with_order , 0, NULL, (void*) this);
diff -urN mysql-old/sql/item_timefunc.cc mysql/sql/item_timefunc.cc
---- mysql-old/sql/item_timefunc.cc 2009-12-09 18:51:34.137802930 -0100
-+++ mysql/sql/item_timefunc.cc 2009-12-09 18:51:44.717552301 -0100
+--- mysql-old/sql/item_timefunc.cc 2009-12-09 22:18:31.927801480 -0100
++++ mysql/sql/item_timefunc.cc 2009-12-09 22:22:17.431549689 -0100
@@ -313,14 +313,14 @@
switch (*++ptr) {
/* Year */
@@ -1619,8 +1640,8 @@ diff -urN mysql-old/sql/item_timefunc.cc mysql/sql/item_timefunc.cc
set_if_smaller(max_length,MAX_BLOB_WIDTH);
}
diff -urN mysql-old/sql/key.cc mysql/sql/key.cc
---- mysql-old/sql/key.cc 2009-12-09 18:51:34.137802930 -0100
-+++ mysql/sql/key.cc 2009-12-09 18:51:44.719594508 -0100
+--- mysql-old/sql/key.cc 2009-12-09 22:18:31.927801480 -0100
++++ mysql/sql/key.cc 2009-12-09 22:22:17.431549689 -0100
@@ -125,13 +125,13 @@
key_part->key_part_flag & HA_VAR_LENGTH_PART)
{
@@ -1665,8 +1686,8 @@ diff -urN mysql-old/sql/key.cc mysql/sql/key.cc
FIELDFLAG_PACK)))
{
diff -urN mysql-old/sql/log.cc mysql/sql/log.cc
---- mysql-old/sql/log.cc 2009-12-09 18:51:34.132802539 -0100
-+++ mysql/sql/log.cc 2009-12-09 18:51:44.851550006 -0100
+--- mysql-old/sql/log.cc 2009-12-09 22:18:31.923802508 -0100
++++ mysql/sql/log.cc 2009-12-09 22:22:17.440549697 -0100
@@ -594,11 +594,11 @@
t.neg= 0;
@@ -1690,9 +1711,18 @@ diff -urN mysql-old/sql/log.cc mysql/sql/log.cc
return (const char*)buff;
}
return log_name;
+@@ -4859,7 +4859,7 @@
+ DBUG_ENTER("print_buffer_to_nt_eventlog");
+
+ /* Add ending CR/LF's to string, overwrite last chars if necessary */
+- strmov(buffptr+min(length, buffLen-5), "\r\n\r\n");
++ strmov(buffptr+MYSQL_MIN(length, buffLen-5), "\r\n\r\n");
+
+ setup_windows_event_source();
+ if ((event= RegisterEventSource(NULL,"MySQL")))
diff -urN mysql-old/sql/log_event.cc mysql/sql/log_event.cc
---- mysql-old/sql/log_event.cc 2009-12-09 18:51:34.132802539 -0100
-+++ mysql/sql/log_event.cc 2009-12-09 18:51:44.856550067 -0100
+--- mysql-old/sql/log_event.cc 2009-12-09 22:18:31.923802508 -0100
++++ mysql/sql/log_event.cc 2009-12-09 22:22:17.453549790 -0100
@@ -1070,7 +1070,7 @@
of 13 bytes, whereas LOG_EVENT_MINIMAL_HEADER_LEN is 19 bytes (it's
"minimal" over the set {MySQL >=4.0}).
@@ -1721,8 +1751,8 @@ diff -urN mysql-old/sql/log_event.cc mysql/sql/log_event.cc
DBUG_ASSERT(m_rows_buf <= m_rows_cur);
diff -urN mysql-old/sql/log_event_old.cc mysql/sql/log_event_old.cc
---- mysql-old/sql/log_event_old.cc 2009-12-09 18:51:34.131802684 -0100
-+++ mysql/sql/log_event_old.cc 2009-12-09 18:51:44.860677548 -0100
+--- mysql-old/sql/log_event_old.cc 2009-12-09 22:18:31.922801485 -0100
++++ mysql/sql/log_event_old.cc 2009-12-09 22:22:17.457549698 -0100
@@ -1405,7 +1405,7 @@
trigger false warnings.
*/
@@ -1733,8 +1763,8 @@ diff -urN mysql-old/sql/log_event_old.cc mysql/sql/log_event_old.cc
DBUG_ASSERT(m_rows_buf <= m_rows_cur);
diff -urN mysql-old/sql/mysqld.cc mysql/sql/mysqld.cc
---- mysql-old/sql/mysqld.cc 2009-12-09 18:51:34.136801605 -0100
-+++ mysql/sql/mysqld.cc 2009-12-09 18:51:44.863549955 -0100
+--- mysql-old/sql/mysqld.cc 2009-12-09 22:18:31.926802004 -0100
++++ mysql/sql/mysqld.cc 2009-12-09 22:22:17.470549699 -0100
@@ -3298,7 +3298,7 @@
can't get max_connections*5 but still got no less than was
requested (value of wanted_files).
@@ -1764,8 +1794,8 @@ diff -urN mysql-old/sql/mysqld.cc mysql/sql/mysqld.cc
table_cache_size);
DBUG_PRINT("warning",
diff -urN mysql-old/sql/net_serv.cc mysql/sql/net_serv.cc
---- mysql-old/sql/net_serv.cc 2009-12-09 18:51:34.136801605 -0100
-+++ mysql/sql/net_serv.cc 2009-12-09 18:51:44.867674675 -0100
+--- mysql-old/sql/net_serv.cc 2009-12-09 22:18:31.926802004 -0100
++++ mysql/sql/net_serv.cc 2009-12-09 22:22:17.472549736 -0100
@@ -756,7 +756,7 @@
{
while (remain > 0)
@@ -1785,8 +1815,8 @@ diff -urN mysql-old/sql/net_serv.cc mysql/sql/net_serv.cc
if (helping >= net->max_packet)
{
diff -urN mysql-old/sql/opt_range.cc mysql/sql/opt_range.cc
---- mysql-old/sql/opt_range.cc 2009-12-09 18:51:34.131802684 -0100
-+++ mysql/sql/opt_range.cc 2009-12-09 18:51:44.871675308 -0100
+--- mysql-old/sql/opt_range.cc 2009-12-09 22:18:31.922801485 -0100
++++ mysql/sql/opt_range.cc 2009-12-09 22:22:17.488549740 -0100
@@ -2352,7 +2352,7 @@
group_trp= get_best_group_min_max(&param, tree);
if (group_trp)
@@ -1904,8 +1934,8 @@ diff -urN mysql-old/sql/opt_range.cc mysql/sql/opt_range.cc
else
io_cost= (keys_per_group > keys_per_block) ?
diff -urN mysql-old/sql/protocol.cc mysql/sql/protocol.cc
---- mysql-old/sql/protocol.cc 2009-12-09 18:51:34.136801605 -0100
-+++ mysql/sql/protocol.cc 2009-12-09 18:51:44.875674861 -0100
+--- mysql-old/sql/protocol.cc 2009-12-09 22:18:31.926802004 -0100
++++ mysql/sql/protocol.cc 2009-12-09 22:22:17.490549716 -0100
@@ -167,7 +167,7 @@
pos+=2;
@@ -1925,8 +1955,8 @@ diff -urN mysql-old/sql/protocol.cc mysql/sql/protocol.cc
int2store(buff+1, tmp);
/*
diff -urN mysql-old/sql/rpl_record.cc mysql/sql/rpl_record.cc
---- mysql-old/sql/rpl_record.cc 2009-12-09 18:51:34.131802684 -0100
-+++ mysql/sql/rpl_record.cc 2009-12-09 18:51:44.876675051 -0100
+--- mysql-old/sql/rpl_record.cc 2009-12-09 22:18:31.922801485 -0100
++++ mysql/sql/rpl_record.cc 2009-12-09 22:22:17.491549977 -0100
@@ -255,7 +255,7 @@
/*
throw away master's extra fields
@@ -1937,8 +1967,8 @@ diff -urN mysql-old/sql/rpl_record.cc mysql/sql/rpl_record.cc
{
if (bitmap_is_set(cols, i))
diff -urN mysql-old/sql/rpl_rli.cc mysql/sql/rpl_rli.cc
---- mysql-old/sql/rpl_rli.cc 2009-12-09 18:51:34.129801778 -0100
-+++ mysql/sql/rpl_rli.cc 2009-12-09 18:51:44.877674831 -0100
+--- mysql-old/sql/rpl_rli.cc 2009-12-09 22:18:31.920801072 -0100
++++ mysql/sql/rpl_rli.cc 2009-12-09 22:22:17.493549784 -0100
@@ -662,7 +662,7 @@
ulong log_name_extension;
char log_name_tmp[FN_REFLEN]; //make a char[] from String
@@ -1958,8 +1988,8 @@ diff -urN mysql-old/sql/rpl_rli.cc mysql/sql/rpl_rli.cc
log_name_extension= strtoul(++p, &p_end, 10);
/*
diff -urN mysql-old/sql/rpl_utility.cc mysql/sql/rpl_utility.cc
---- mysql-old/sql/rpl_utility.cc 2009-12-09 18:51:34.129801778 -0100
-+++ mysql/sql/rpl_utility.cc 2009-12-09 18:51:44.878755720 -0100
+--- mysql-old/sql/rpl_utility.cc 2009-12-09 22:18:31.920801072 -0100
++++ mysql/sql/rpl_utility.cc 2009-12-09 22:22:17.493549784 -0100
@@ -180,7 +180,7 @@
/*
We only check the initial columns for the tables.
@@ -1970,8 +2000,8 @@ diff -urN mysql-old/sql/rpl_utility.cc mysql/sql/rpl_utility.cc
Relay_log_info const *rli= const_cast<Relay_log_info*>(rli_arg);
diff -urN mysql-old/sql/rpl_utility.h mysql/sql/rpl_utility.h
---- mysql-old/sql/rpl_utility.h 2009-12-09 18:51:34.142802193 -0100
-+++ mysql/sql/rpl_utility.h 2009-12-09 18:51:44.878755720 -0100
+--- mysql-old/sql/rpl_utility.h 2009-12-09 22:18:31.932801290 -0100
++++ mysql/sql/rpl_utility.h 2009-12-09 22:22:32.547674903 -0100
@@ -299,7 +299,7 @@
do { \
char buf[256]; \
@@ -1982,8 +2012,8 @@ diff -urN mysql-old/sql/rpl_utility.h mysql/sql/rpl_utility.h
buf[i] = '\0'; \
DBUG_PRINT((N), ((FRM), buf)); \
diff -urN mysql-old/sql/set_var.cc mysql/sql/set_var.cc
---- mysql-old/sql/set_var.cc 2009-12-09 18:51:34.136801605 -0100
-+++ mysql/sql/set_var.cc 2009-12-09 18:51:44.880800246 -0100
+--- mysql-old/sql/set_var.cc 2009-12-09 22:18:31.925801640 -0100
++++ mysql/sql/set_var.cc 2009-12-09 22:22:17.499549669 -0100
@@ -1850,7 +1850,7 @@
&not_used));
if (error_len)
@@ -2003,8 +2033,8 @@ diff -urN mysql-old/sql/set_var.cc mysql/sql/set_var.cc
}
return FALSE;
diff -urN mysql-old/sql/slave.cc mysql/sql/slave.cc
---- mysql-old/sql/slave.cc 2009-12-09 18:51:34.129801778 -0100
-+++ mysql/sql/slave.cc 2009-12-09 18:51:44.882553379 -0100
+--- mysql-old/sql/slave.cc 2009-12-09 22:18:31.920801072 -0100
++++ mysql/sql/slave.cc 2009-12-09 22:22:17.506549806 -0100
@@ -1703,13 +1703,13 @@
slave is 2. At SHOW SLAVE STATUS time, assume that the difference
between timestamp of slave and rli->last_master_timestamp is 0
@@ -2040,8 +2070,8 @@ diff -urN mysql-old/sql/slave.cc mysql/sql/slave.cc
DBUG_RETURN(cur_log);
}
diff -urN mysql-old/sql/spatial.h mysql/sql/spatial.h
---- mysql-old/sql/spatial.h 2009-12-09 18:51:34.141801445 -0100
-+++ mysql/sql/spatial.h 2009-12-09 18:51:44.884799894 -0100
+--- mysql-old/sql/spatial.h 2009-12-09 22:18:31.931801220 -0100
++++ mysql/sql/spatial.h 2009-12-09 22:22:32.548674830 -0100
@@ -180,8 +180,8 @@
if (d != mbr->dimension() || d <= 0 || contains(mbr) || within(mbr))
return 0;
@@ -2054,8 +2084,8 @@ diff -urN mysql-old/sql/spatial.h mysql/sql/spatial.h
return (d == intersection.dimension());
}
diff -urN mysql-old/sql/sp_head.cc mysql/sql/sp_head.cc
---- mysql-old/sql/sp_head.cc 2009-12-09 18:51:34.128801191 -0100
-+++ mysql/sql/sp_head.cc 2009-12-09 18:51:44.886800239 -0100
+--- mysql-old/sql/sp_head.cc 2009-12-09 22:18:31.919801113 -0100
++++ mysql/sql/sp_head.cc 2009-12-09 22:22:17.511549739 -0100
@@ -2414,7 +2414,7 @@
Item_empty_string *stmt_fld=
@@ -2075,8 +2105,8 @@ diff -urN mysql-old/sql/sp_head.cc mysql/sql/sp_head.cc
Protocol::SEND_EOF))
DBUG_RETURN(1);
diff -urN mysql-old/sql/sql_acl.cc mysql/sql/sql_acl.cc
---- mysql-old/sql/sql_acl.cc 2009-12-09 18:51:34.132802539 -0100
-+++ mysql/sql/sql_acl.cc 2009-12-09 18:51:44.889799926 -0100
+--- mysql-old/sql/sql_acl.cc 2009-12-09 22:18:31.923802508 -0100
++++ mysql/sql/sql_acl.cc 2009-12-09 22:22:17.521549733 -0100
@@ -818,7 +818,7 @@
chars= 128; // Marker that chars existed
}
@@ -2087,18 +2117,19 @@ diff -urN mysql-old/sql/sql_acl.cc mysql/sql/sql_acl.cc
va_end(args);
return sort;
diff -urN mysql-old/sql/sql_analyse.cc mysql/sql/sql_analyse.cc
---- mysql-old/sql/sql_analyse.cc 2009-12-09 18:51:34.129801778 -0100
-+++ mysql/sql/sql_analyse.cc 2009-12-09 18:51:44.892551900 -0100
-@@ -280,7 +280,7 @@
+--- mysql-old/sql/sql_analyse.cc 2009-12-09 22:18:31.920801072 -0100
++++ mysql/sql/sql_analyse.cc 2009-12-09 22:22:17.523549682 -0100
+@@ -280,16 +280,16 @@
{
if (((longlong) info->ullval) < 0)
return 0; // Impossible to store as a negative number
- ev_info->llval = -(longlong) max((ulonglong) -ev_info->llval,
+ ev_info->llval = -(longlong) MYSQL_MAX((ulonglong) -ev_info->llval,
info->ullval);
- ev_info->min_dval = (double) -max(-ev_info->min_dval, info->dval);
+- ev_info->min_dval = (double) -max(-ev_info->min_dval, info->dval);
++ ev_info->min_dval = (double) -MYSQL_MAX(-ev_info->min_dval, info->dval);
}
-@@ -288,8 +288,8 @@
+ else // ulonglong is as big as bigint in MySQL
{
if ((check_ulonglong(num, info->integers) == DECIMAL_NUM))
return 0;
@@ -2137,8 +2168,8 @@ diff -urN mysql-old/sql/sql_analyse.cc mysql/sql/sql_analyse.cc
for (uint i = 0; i < array_elements(func_items); i++)
field_list.push_back(func_items[i]);
diff -urN mysql-old/sql/sql_cache.cc mysql/sql/sql_cache.cc
---- mysql-old/sql/sql_cache.cc 2009-12-09 18:51:34.129801778 -0100
-+++ mysql/sql/sql_cache.cc 2009-12-09 18:51:44.893800070 -0100
+--- mysql-old/sql/sql_cache.cc 2009-12-09 22:18:31.920801072 -0100
++++ mysql/sql/sql_cache.cc 2009-12-09 22:22:17.529549619 -0100
@@ -981,7 +981,7 @@
}
last_result_block= header->result()->prev;
@@ -2196,8 +2227,8 @@ diff -urN mysql-old/sql/sql_cache.cc mysql/sql/sql_cache.cc
DBUG_PRINT("qcache", ("Query cache hase only %lu memory and limit %lu",
query_cache_size, query_cache_limit));
diff -urN mysql-old/sql/sql_class.cc mysql/sql/sql_class.cc
---- mysql-old/sql/sql_class.cc 2009-12-09 18:51:34.137802930 -0100
-+++ mysql/sql/sql_class.cc 2009-12-09 18:51:44.896549989 -0100
+--- mysql-old/sql/sql_class.cc 2009-12-09 22:18:31.926802004 -0100
++++ mysql/sql/sql_class.cc 2009-12-09 22:22:17.535549718 -0100
@@ -380,7 +380,7 @@
if (max_query_len < 1)
len= thd->query_length;
@@ -2226,8 +2257,8 @@ diff -urN mysql-old/sql/sql_class.cc mysql/sql/sql_class.cc
used_length=res->length();
if ((result_type == STRING_RESULT || is_unsafe_field_sep) &&
diff -urN mysql-old/sql/sql_client.cc mysql/sql/sql_client.cc
---- mysql-old/sql/sql_client.cc 2009-12-09 18:51:34.129801778 -0100
-+++ mysql/sql/sql_client.cc 2009-12-09 18:51:44.898674934 -0100
+--- mysql-old/sql/sql_client.cc 2009-12-09 22:18:31.920801072 -0100
++++ mysql/sql/sql_client.cc 2009-12-09 22:22:17.535549718 -0100
@@ -34,7 +34,7 @@
(uint)global_system_variables.net_write_timeout);
@@ -2238,8 +2269,8 @@ diff -urN mysql-old/sql/sql_client.cc mysql/sql/sql_client.cc
#endif
}
diff -urN mysql-old/sql/sql_load.cc mysql/sql/sql_load.cc
---- mysql-old/sql/sql_load.cc 2009-12-09 18:51:34.130801665 -0100
-+++ mysql/sql/sql_load.cc 2009-12-09 18:51:44.898674934 -0100
+--- mysql-old/sql/sql_load.cc 2009-12-09 22:18:31.921800863 -0100
++++ mysql/sql/sql_load.cc 2009-12-09 22:22:17.537549700 -0100
@@ -977,7 +977,7 @@
@@ -2250,8 +2281,8 @@ diff -urN mysql-old/sql/sql_load.cc mysql/sql/sql_load.cc
stack=stack_pos=(int*) sql_alloc(sizeof(int)*length);
diff -urN mysql-old/sql/sql_parse.cc mysql/sql/sql_parse.cc
---- mysql-old/sql/sql_parse.cc 2009-12-09 18:51:34.136801605 -0100
-+++ mysql/sql/sql_parse.cc 2009-12-09 18:51:44.900800047 -0100
+--- mysql-old/sql/sql_parse.cc 2009-12-09 22:18:31.926802004 -0100
++++ mysql/sql/sql_parse.cc 2009-12-09 22:22:17.548549755 -0100
@@ -5563,7 +5563,7 @@
return 1;
}
@@ -2271,8 +2302,8 @@ diff -urN mysql-old/sql/sql_parse.cc mysql/sql/sql_parse.cc
return 1;
}
diff -urN mysql-old/sql/sql_partition.cc mysql/sql/sql_partition.cc
---- mysql-old/sql/sql_partition.cc 2009-12-09 18:51:34.138801911 -0100
-+++ mysql/sql/sql_partition.cc 2009-12-09 18:51:44.905674881 -0100
+--- mysql-old/sql/sql_partition.cc 2009-12-09 22:18:31.928801907 -0100
++++ mysql/sql/sql_partition.cc 2009-12-09 22:22:17.559549693 -0100
@@ -4516,7 +4516,7 @@
*/
start_part= 0;
@@ -2283,8 +2314,8 @@ diff -urN mysql-old/sql/sql_partition.cc mysql/sql/sql_partition.cc
else if (new_total_partitions <= upper_2n)
{
diff -urN mysql-old/sql/sql_plugin.cc mysql/sql/sql_plugin.cc
---- mysql-old/sql/sql_plugin.cc 2009-12-09 18:51:34.128801191 -0100
-+++ mysql/sql/sql_plugin.cc 2009-12-09 18:51:44.909800121 -0100
+--- mysql-old/sql/sql_plugin.cc 2009-12-09 22:18:31.919801113 -0100
++++ mysql/sql/sql_plugin.cc 2009-12-09 22:22:17.563549747 -0100
@@ -486,7 +486,7 @@
for (i=0;
(old=(struct st_mysql_plugin *)(ptr+i*sizeof_st_plugin))->info;
@@ -2304,8 +2335,8 @@ diff -urN mysql-old/sql/sql_plugin.cc mysql/sql/sql_plugin.cc
goto err;
}
diff -urN mysql-old/sql/sql_prepare.cc mysql/sql/sql_prepare.cc
---- mysql-old/sql/sql_prepare.cc 2009-12-09 18:51:34.133801658 -0100
-+++ mysql/sql/sql_prepare.cc 2009-12-09 18:51:44.911552156 -0100
+--- mysql-old/sql/sql_prepare.cc 2009-12-09 22:18:31.924801498 -0100
++++ mysql/sql/sql_prepare.cc 2009-12-09 22:22:17.569549846 -0100
@@ -249,7 +249,7 @@
int2store(buff+5, columns);
int2store(buff+7, stmt->param_count);
@@ -2316,8 +2347,8 @@ diff -urN mysql-old/sql/sql_prepare.cc mysql/sql/sql_prepare.cc
/*
diff -urN mysql-old/sql/sql_profile.cc mysql/sql/sql_profile.cc
---- mysql-old/sql/sql_profile.cc 2009-12-09 18:51:34.133801658 -0100
-+++ mysql/sql/sql_profile.cc 2009-12-09 18:51:44.913677326 -0100
+--- mysql-old/sql/sql_profile.cc 2009-12-09 22:18:31.924801498 -0100
++++ mysql/sql/sql_profile.cc 2009-12-09 22:22:17.570549827 -0100
@@ -252,7 +252,7 @@
uint query_length_arg)
{
@@ -2328,8 +2359,8 @@ diff -urN mysql-old/sql/sql_profile.cc mysql/sql/sql_profile.cc
DBUG_ASSERT(query_source == NULL); /* we don't leak memory */
if (query_source_arg != NULL)
diff -urN mysql-old/sql/sql_repl.cc mysql/sql/sql_repl.cc
---- mysql-old/sql/sql_repl.cc 2009-12-09 18:51:34.129801778 -0100
-+++ mysql/sql/sql_repl.cc 2009-12-09 18:51:44.913677326 -0100
+--- mysql-old/sql/sql_repl.cc 2009-12-09 22:18:31.920801072 -0100
++++ mysql/sql/sql_repl.cc 2009-12-09 22:22:17.572549758 -0100
@@ -1256,12 +1256,12 @@
{
/*
@@ -2383,8 +2414,8 @@ diff -urN mysql-old/sql/sql_repl.cc mysql/sql/sql_repl.cc
mysql_bin_log.write(&b);
lf_info->wrote_create_file= 1;
diff -urN mysql-old/sql/sql_select.cc mysql/sql/sql_select.cc
---- mysql-old/sql/sql_select.cc 2009-12-09 18:51:34.133801658 -0100
-+++ mysql/sql/sql_select.cc 2009-12-09 18:51:44.919800766 -0100
+--- mysql-old/sql/sql_select.cc 2009-12-09 22:18:31.924801498 -0100
++++ mysql/sql/sql_select.cc 2009-12-09 22:22:17.597549819 -0100
@@ -881,7 +881,7 @@
}
#endif
@@ -2485,8 +2516,8 @@ diff -urN mysql-old/sql/sql_select.cc mysql/sql/sql_select.cc
DBUG_RETURN(1); /* Don't use cache */ /* purecov: inspected */
cache->end=cache->buff+size;
diff -urN mysql-old/sql/sql_show.cc mysql/sql/sql_show.cc
---- mysql-old/sql/sql_show.cc 2009-12-09 18:51:34.130801665 -0100
-+++ mysql/sql/sql_show.cc 2009-12-09 18:51:45.067800476 -0100
+--- mysql-old/sql/sql_show.cc 2009-12-09 22:18:31.921800863 -0100
++++ mysql/sql/sql_show.cc 2009-12-09 22:22:17.607549684 -0100
@@ -640,7 +640,7 @@
{
field_list.push_back(new Item_empty_string("View",NAME_CHAR_LEN));
@@ -2542,8 +2573,8 @@ diff -urN mysql-old/sql/sql_show.cc mysql/sql/sql_show.cc
stmt_fld->maybe_null= TRUE;
diff -urN mysql-old/sql/sql_string.cc mysql/sql/sql_string.cc
---- mysql-old/sql/sql_string.cc 2009-12-09 18:51:34.136801605 -0100
-+++ mysql/sql/sql_string.cc 2009-12-09 18:51:45.070799904 -0100
+--- mysql-old/sql/sql_string.cc 2009-12-09 22:18:31.926802004 -0100
++++ mysql/sql/sql_string.cc 2009-12-09 22:22:17.609549708 -0100
@@ -661,7 +661,7 @@
{
if (Alloced_length < str_length + space_needed)
@@ -2590,8 +2621,8 @@ diff -urN mysql-old/sql/sql_string.cc mysql/sql/sql_string.cc
if (!f || t == t_end)
diff -urN mysql-old/sql/sql_table.cc mysql/sql/sql_table.cc
---- mysql-old/sql/sql_table.cc 2009-12-09 18:51:34.130801665 -0100
-+++ mysql/sql/sql_table.cc 2009-12-09 18:51:45.073799879 -0100
+--- mysql-old/sql/sql_table.cc 2009-12-09 22:18:31.921800863 -0100
++++ mysql/sql/sql_table.cc 2009-12-09 22:22:17.620549655 -0100
@@ -3213,7 +3213,7 @@
if ((length=column->length) > max_key_length ||
length > file->max_key_part_length())
@@ -2602,8 +2633,8 @@ diff -urN mysql-old/sql/sql_table.cc mysql/sql/sql_table.cc
{
/* not a critical problem */
diff -urN mysql-old/sql/sql_yacc.cc mysql/sql/sql_yacc.cc
---- mysql-old/sql/sql_yacc.cc 2009-12-09 18:51:34.141801445 -0100
-+++ mysql/sql/sql_yacc.cc 2009-12-09 18:51:45.086675877 -0100
+--- mysql-old/sql/sql_yacc.cc 2009-12-09 22:18:31.931801220 -0100
++++ mysql/sql/sql_yacc.cc 2009-12-09 22:22:17.671549812 -0100
@@ -16004,7 +16004,7 @@
from 0" (4 in fact), unspecified means "don't change the position
(keep the preceding value)").
@@ -2623,8 +2654,8 @@ diff -urN mysql-old/sql/sql_yacc.cc mysql/sql/sql_yacc.cc
break;
diff -urN mysql-old/sql/thr_malloc.cc mysql/sql/thr_malloc.cc
---- mysql-old/sql/thr_malloc.cc 2009-12-09 18:51:34.137802930 -0100
-+++ mysql/sql/thr_malloc.cc 2009-12-09 18:51:45.102587816 -0100
+--- mysql-old/sql/thr_malloc.cc 2009-12-09 22:18:31.927801480 -0100
++++ mysql/sql/thr_malloc.cc 2009-12-09 22:22:17.672549916 -0100
@@ -126,7 +126,7 @@
if ((from_cs == &my_charset_bin) || (to_cs == &my_charset_bin))
{
@@ -2635,8 +2666,8 @@ diff -urN mysql-old/sql/thr_malloc.cc mysql/sql/thr_malloc.cc
}
else
diff -urN mysql-old/sql/tztime.cc mysql/sql/tztime.cc
---- mysql-old/sql/tztime.cc 2009-12-09 18:51:34.139802270 -0100
-+++ mysql/sql/tztime.cc 2009-12-09 18:51:45.102587816 -0100
+--- mysql-old/sql/tztime.cc 2009-12-09 22:18:31.929802514 -0100
++++ mysql/sql/tztime.cc 2009-12-09 22:22:17.676549964 -0100
@@ -167,7 +167,7 @@
uchar buf[sizeof(struct tzhead) + sizeof(my_time_t) * TZ_MAX_TIMES +
TZ_MAX_TIMES + sizeof(TRAN_TYPE_INFO) * TZ_MAX_TYPES +
@@ -2656,8 +2687,8 @@ diff -urN mysql-old/sql/tztime.cc mysql/sql/tztime.cc
(next_leap_idx < sp->leapcnt) ?
sp->lsis[next_leap_idx].ls_trans - 1: MY_TIME_T_MAX);
diff -urN mysql-old/sql/unireg.cc mysql/sql/unireg.cc
---- mysql-old/sql/unireg.cc 2009-12-09 18:51:34.132802539 -0100
-+++ mysql/sql/unireg.cc 2009-12-09 18:51:45.117040164 -0100
+--- mysql-old/sql/unireg.cc 2009-12-09 22:18:31.923802508 -0100
++++ mysql/sql/unireg.cc 2009-12-09 22:22:17.677549845 -0100
@@ -490,7 +490,7 @@
}
cfield->row=(uint8) row;
@@ -2677,8 +2708,8 @@ diff -urN mysql-old/sql/unireg.cc mysql/sql/unireg.cc
n_length+int_length+com_length > 65535L || int_count > 255)
{
diff -urN mysql-old/sql-common/client.c mysql/sql-common/client.c
---- mysql-old/sql-common/client.c 2009-12-09 18:51:34.227800895 -0100
-+++ mysql/sql-common/client.c 2009-12-09 18:51:45.118675046 -0100
+--- mysql-old/sql-common/client.c 2009-12-09 22:18:32.012802332 -0100
++++ mysql/sql-common/client.c 2009-12-09 22:22:13.244674567 -0100
@@ -728,7 +728,7 @@
}
@@ -2698,8 +2729,8 @@ diff -urN mysql-old/sql-common/client.c mysql/sql-common/client.c
(my_inet_ntoa(sock_addr.sin_addr, ipaddr), ipaddr)));
status= my_connect(sock, (struct sockaddr *) &sock_addr,
diff -urN mysql-old/sql-common/my_time.c mysql/sql-common/my_time.c
---- mysql-old/sql-common/my_time.c 2009-12-09 18:51:34.227800895 -0100
-+++ mysql/sql-common/my_time.c 2009-12-09 18:51:45.119674816 -0100
+--- mysql-old/sql-common/my_time.c 2009-12-09 22:18:32.012802332 -0100
++++ mysql/sql-common/my_time.c 2009-12-09 22:22:13.246674639 -0100
@@ -250,7 +250,7 @@
2003-03-03 20:00:20 AM
20:00:20.000000 AM 03-03-2000
@@ -2710,8 +2741,8 @@ diff -urN mysql-old/sql-common/my_time.c mysql/sql-common/my_time.c
allow_space= ((1 << i) | (1 << format_position[6]));
allow_space&= (1 | 2 | 4 | 8);
diff -urN mysql-old/storage/csv/ha_tina.cc mysql/storage/csv/ha_tina.cc
---- mysql-old/storage/csv/ha_tina.cc 2009-12-09 18:51:34.205800211 -0100
-+++ mysql/storage/csv/ha_tina.cc 2009-12-09 18:51:45.121553384 -0100
+--- mysql-old/storage/csv/ha_tina.cc 2009-12-09 22:18:31.992800427 -0100
++++ mysql/storage/csv/ha_tina.cc 2009-12-09 22:22:17.739549826 -0100
@@ -1185,7 +1185,7 @@
if (closest_hole == chain_ptr) /* no more chains */
*end_pos= file_buff->end();
@@ -2731,8 +2762,8 @@ diff -urN mysql-old/storage/csv/ha_tina.cc mysql/storage/csv/ha_tina.cc
(my_write(repair_file, (uchar*)file_buff->ptr(),
(size_t) (write_end - write_begin), MYF_RW)))
diff -urN mysql-old/storage/example/ha_example.h mysql/storage/example/ha_example.h
---- mysql-old/storage/example/ha_example.h 2009-12-09 18:51:34.205800211 -0100
-+++ mysql/storage/example/ha_example.h 2009-12-09 18:51:45.121553384 -0100
+--- mysql-old/storage/example/ha_example.h 2009-12-09 22:18:31.991800899 -0100
++++ mysql/storage/example/ha_example.h 2009-12-09 22:22:32.667674971 -0100
@@ -110,14 +110,14 @@
max_supported_key_parts(), uint max_supported_key_length()
to make sure that the storage engine can handle the data it is about to
@@ -2769,8 +2800,8 @@ diff -urN mysql-old/storage/example/ha_example.h mysql/storage/example/ha_exampl
@details
There is no need to implement ..._key_... methods if your engine doesn't
diff -urN mysql-old/storage/federated/ha_federated.cc mysql/storage/federated/ha_federated.cc
---- mysql-old/storage/federated/ha_federated.cc 2009-12-09 18:51:34.205800211 -0100
-+++ mysql/storage/federated/ha_federated.cc 2009-12-09 18:51:45.123674987 -0100
+--- mysql-old/storage/federated/ha_federated.cc 2009-12-09 22:18:31.991800899 -0100
++++ mysql/storage/federated/ha_federated.cc 2009-12-09 22:22:17.736549891 -0100
@@ -546,7 +546,7 @@
size_t buf_len;
DBUG_ENTER("ha_federated parse_url_error");
@@ -2790,8 +2821,8 @@ diff -urN mysql-old/storage/federated/ha_federated.cc mysql/storage/federated/ha
DBUG_DUMP("key, start of loop", ptr, length);
diff -urN mysql-old/storage/heap/hp_create.c mysql/storage/heap/hp_create.c
---- mysql-old/storage/heap/hp_create.c 2009-12-09 18:51:34.204801497 -0100
-+++ mysql/storage/heap/hp_create.c 2009-12-09 18:51:45.124674788 -0100
+--- mysql-old/storage/heap/hp_create.c 2009-12-09 22:18:31.991800899 -0100
++++ mysql/storage/heap/hp_create.c 2009-12-09 22:22:12.969674813 -0100
@@ -229,7 +229,7 @@
{
uint i,recbuffer,records_in_block;
@@ -2802,8 +2833,8 @@ diff -urN mysql-old/storage/heap/hp_create.c mysql/storage/heap/hp_create.c
max_records= 1000; /* As good as quess as anything */
recbuffer= (uint) (reclength + sizeof(uchar**) - 1) & ~(sizeof(uchar**) - 1);
diff -urN mysql-old/storage/ibmdb2i/db2i_blobCollection.cc mysql/storage/ibmdb2i/db2i_blobCollection.cc
---- mysql-old/storage/ibmdb2i/db2i_blobCollection.cc 2009-12-09 18:51:34.203802212 -0100
-+++ mysql/storage/ibmdb2i/db2i_blobCollection.cc 2009-12-09 18:51:45.125674801 -0100
+--- mysql-old/storage/ibmdb2i/db2i_blobCollection.cc 2009-12-09 22:18:31.990801070 -0100
++++ mysql/storage/ibmdb2i/db2i_blobCollection.cc 2009-12-09 22:22:17.720549744 -0100
@@ -61,9 +61,9 @@
uint curMaxSize = table->getBlobFieldActualSize(fieldIndex);
@@ -2817,8 +2848,8 @@ diff -urN mysql-old/storage/ibmdb2i/db2i_blobCollection.cc mysql/storage/ibmdb2i
}
diff -urN mysql-old/storage/ibmdb2i/db2i_conversion.cc mysql/storage/ibmdb2i/db2i_conversion.cc
---- mysql-old/storage/ibmdb2i/db2i_conversion.cc 2009-12-09 18:51:34.203802212 -0100
-+++ mysql/storage/ibmdb2i/db2i_conversion.cc 2009-12-09 18:51:45.125674801 -0100
+--- mysql-old/storage/ibmdb2i/db2i_conversion.cc 2009-12-09 22:18:31.990801070 -0100
++++ mysql/storage/ibmdb2i/db2i_conversion.cc 2009-12-09 22:22:17.722549729 -0100
@@ -528,13 +528,13 @@
{
if (field->type() == MYSQL_TYPE_STRING)
@@ -2977,8 +3008,8 @@ diff -urN mysql-old/storage/ibmdb2i/db2i_conversion.cc mysql/storage/ibmdb2i/db2
char temp[80];
diff -urN mysql-old/storage/ibmdb2i/db2i_file.cc mysql/storage/ibmdb2i/db2i_file.cc
---- mysql-old/storage/ibmdb2i/db2i_file.cc 2009-12-09 18:51:34.203802212 -0100
-+++ mysql/storage/ibmdb2i/db2i_file.cc 2009-12-09 18:51:45.126675226 -0100
+--- mysql-old/storage/ibmdb2i/db2i_file.cc 2009-12-09 22:18:31.990801070 -0100
++++ mysql/storage/ibmdb2i/db2i_file.cc 2009-12-09 22:22:17.723549844 -0100
@@ -335,14 +335,14 @@
{
strncpy(out, in, outlen);
@@ -3026,8 +3057,8 @@ diff -urN mysql-old/storage/ibmdb2i/db2i_file.cc mysql/storage/ibmdb2i/db2i_file
char finalName[MAX_DB2_FILENAME_LENGTH+1];
convertMySQLNameToDB2Name(generatedName, finalName, sizeof(finalName), true, (format==ASCII_SQL));
diff -urN mysql-old/storage/ibmdb2i/db2i_ileBridge.cc mysql/storage/ibmdb2i/db2i_ileBridge.cc
---- mysql-old/storage/ibmdb2i/db2i_ileBridge.cc 2009-12-09 18:51:34.203802212 -0100
-+++ mysql/storage/ibmdb2i/db2i_ileBridge.cc 2009-12-09 18:51:45.127674990 -0100
+--- mysql-old/storage/ibmdb2i/db2i_ileBridge.cc 2009-12-09 22:18:31.990801070 -0100
++++ mysql/storage/ibmdb2i/db2i_ileBridge.cc 2009-12-09 22:22:17.725549745 -0100
@@ -594,7 +594,7 @@
{
Qmy_MSPO0100_output* output = (Qmy_MSPO0100_output*)parmBlock->outParms;
@@ -3038,8 +3069,8 @@ diff -urN mysql-old/storage/ibmdb2i/db2i_ileBridge.cc mysql/storage/ibmdb2i/db2i
diff -urN mysql-old/storage/ibmdb2i/db2i_safeString.h mysql/storage/ibmdb2i/db2i_safeString.h
---- mysql-old/storage/ibmdb2i/db2i_safeString.h 2009-12-09 18:51:34.203802212 -0100
-+++ mysql/storage/ibmdb2i/db2i_safeString.h 2009-12-09 18:51:45.128674782 -0100
+--- mysql-old/storage/ibmdb2i/db2i_safeString.h 2009-12-09 22:18:31.990801070 -0100
++++ mysql/storage/ibmdb2i/db2i_safeString.h 2009-12-09 22:22:32.665674860 -0100
@@ -79,7 +79,7 @@
SafeString& strncat(const char* str, size_t len)
@@ -3050,8 +3081,8 @@ diff -urN mysql-old/storage/ibmdb2i/db2i_safeString.h mysql/storage/ibmdb2i/db2i
curPos += amountToCopy;
buf[curPos] = 0;
diff -urN mysql-old/storage/ibmdb2i/ha_ibmdb2i.cc mysql/storage/ibmdb2i/ha_ibmdb2i.cc
---- mysql-old/storage/ibmdb2i/ha_ibmdb2i.cc 2009-12-09 18:51:34.203802212 -0100
-+++ mysql/storage/ibmdb2i/ha_ibmdb2i.cc 2009-12-09 18:51:45.129800142 -0100
+--- mysql-old/storage/ibmdb2i/ha_ibmdb2i.cc 2009-12-09 22:18:31.990801070 -0100
++++ mysql/storage/ibmdb2i/ha_ibmdb2i.cc 2009-12-09 22:22:17.730549696 -0100
@@ -2644,9 +2644,9 @@
rowsToRead = 1;
}
@@ -3105,7 +3136,7 @@ diff -urN mysql-old/storage/ibmdb2i/ha_ibmdb2i.cc mysql/storage/ibmdb2i/ha_ibmdb
}
diff -urN mysql-old/storage/ibmdb2i/ha_ibmdb2i.cc.orig mysql/storage/ibmdb2i/ha_ibmdb2i.cc.orig
--- mysql-old/storage/ibmdb2i/ha_ibmdb2i.cc.orig 1969-12-31 23:00:00.000000000 -0100
-+++ mysql/storage/ibmdb2i/ha_ibmdb2i.cc.orig 2009-12-09 18:51:45.133550165 -0100
++++ mysql/storage/ibmdb2i/ha_ibmdb2i.cc.orig 2009-12-09 22:18:51.239549668 -0100
@@ -0,0 +1,3359 @@
+/*
+Licensed Materials - Property of IBM
@@ -6468,7 +6499,7 @@ diff -urN mysql-old/storage/ibmdb2i/ha_ibmdb2i.cc.orig mysql/storage/ibmdb2i/ha_
+mysql_declare_plugin_end;
diff -urN mysql-old/storage/ibmdb2i/ha_ibmdb2i.cc.rej mysql/storage/ibmdb2i/ha_ibmdb2i.cc.rej
--- mysql-old/storage/ibmdb2i/ha_ibmdb2i.cc.rej 1969-12-31 23:00:00.000000000 -0100
-+++ mysql/storage/ibmdb2i/ha_ibmdb2i.cc.rej 2009-12-09 18:51:45.134800354 -0100
++++ mysql/storage/ibmdb2i/ha_ibmdb2i.cc.rej 2009-12-09 22:18:51.241550247 -0100
@@ -0,0 +1,21 @@
+***************
+*** 2644,2652 ****
@@ -6492,8 +6523,8 @@ diff -urN mysql-old/storage/ibmdb2i/ha_ibmdb2i.cc.rej mysql/storage/ibmdb2i/ha_i
+ activeReadBuf = &multiRowReadBuf;
+
diff -urN mysql-old/storage/ibmdb2i/ha_ibmdb2i.h mysql/storage/ibmdb2i/ha_ibmdb2i.h
---- mysql-old/storage/ibmdb2i/ha_ibmdb2i.h 2009-12-09 18:51:34.204801497 -0100
-+++ mysql/storage/ibmdb2i/ha_ibmdb2i.h 2009-12-09 18:51:45.135800178 -0100
+--- mysql-old/storage/ibmdb2i/ha_ibmdb2i.h 2009-12-09 22:18:31.990801070 -0100
++++ mysql/storage/ibmdb2i/ha_ibmdb2i.h 2009-12-09 22:22:32.666674922 -0100
@@ -502,7 +502,7 @@
ha_rows getIndexReadEstimate(uint index)
{
@@ -6504,8 +6535,8 @@ diff -urN mysql-old/storage/ibmdb2i/ha_ibmdb2i.h mysql/storage/ibmdb2i/ha_ibmdb2
return 10000; // Assume index scan if no estimate exists.
}
diff -urN mysql-old/storage/innobase/include/ut0byte.h mysql/storage/innobase/include/ut0byte.h
---- mysql-old/storage/innobase/include/ut0byte.h 2009-12-09 18:51:34.197801735 -0100
-+++ mysql/storage/innobase/include/ut0byte.h 2009-12-09 18:51:45.136729424 -0100
+--- mysql-old/storage/innobase/include/ut0byte.h 2009-12-09 22:18:31.984800729 -0100
++++ mysql/storage/innobase/include/ut0byte.h 2009-12-09 22:22:32.656675141 -0100
@@ -87,7 +87,7 @@
dulint
ut_dulint_get_max(
@@ -6525,8 +6556,8 @@ diff -urN mysql-old/storage/innobase/include/ut0byte.h mysql/storage/innobase/in
dulint b); /* in: dulint */
/***********************************************************
diff -urN mysql-old/storage/innodb_plugin/dict/dict0dict.c mysql/storage/innodb_plugin/dict/dict0dict.c
---- mysql-old/storage/innodb_plugin/dict/dict0dict.c 2009-12-09 18:51:34.191801933 -0100
-+++ mysql/storage/innodb_plugin/dict/dict0dict.c 2009-12-09 18:51:45.137800628 -0100
+--- mysql-old/storage/innodb_plugin/dict/dict0dict.c 2009-12-09 22:18:31.979801059 -0100
++++ mysql/storage/innodb_plugin/dict/dict0dict.c 2009-12-09 22:22:12.776674695 -0100
@@ -4699,7 +4699,7 @@
/**********************************************************************//**
@@ -6546,8 +6577,8 @@ diff -urN mysql-old/storage/innodb_plugin/dict/dict0dict.c mysql/storage/innodb_
min_index = NULL;
index = dict_table_get_first_index(table);
diff -urN mysql-old/storage/innodb_plugin/include/dict0dict.h mysql/storage/innodb_plugin/include/dict0dict.h
---- mysql-old/storage/innodb_plugin/include/dict0dict.h 2009-12-09 18:51:34.189800730 -0100
-+++ mysql/storage/innodb_plugin/include/dict0dict.h 2009-12-09 18:51:45.139799812 -0100
+--- mysql-old/storage/innodb_plugin/include/dict0dict.h 2009-12-09 22:18:31.977802378 -0100
++++ mysql/storage/innodb_plugin/include/dict0dict.h 2009-12-09 22:22:32.613674954 -0100
@@ -1090,7 +1090,7 @@
const char* name); /*!< in: name of the index to find */
/**********************************************************************//**
@@ -6558,8 +6589,8 @@ diff -urN mysql-old/storage/innodb_plugin/include/dict0dict.h mysql/storage/inno
UNIV_INTERN
dict_index_t*
diff -urN mysql-old/storage/innodb_plugin/include/ut0byte.h mysql/storage/innodb_plugin/include/ut0byte.h
---- mysql-old/storage/innodb_plugin/include/ut0byte.h 2009-12-09 18:51:34.185801261 -0100
-+++ mysql/storage/innodb_plugin/include/ut0byte.h 2009-12-09 18:51:45.140800282 -0100
+--- mysql-old/storage/innodb_plugin/include/ut0byte.h 2009-12-09 22:18:31.973801284 -0100
++++ mysql/storage/innodb_plugin/include/ut0byte.h 2009-12-09 22:22:32.614674842 -0100
@@ -99,7 +99,7 @@
dulint b); /*!< in: dulint */
/*******************************************************//**
@@ -6579,8 +6610,8 @@ diff -urN mysql-old/storage/innodb_plugin/include/ut0byte.h mysql/storage/innodb
dulint
ut_dulint_get_min(
diff -urN mysql-old/storage/myisam/ft_boolean_search.c mysql/storage/myisam/ft_boolean_search.c
---- mysql-old/storage/myisam/ft_boolean_search.c 2009-12-09 18:51:34.179800781 -0100
-+++ mysql/storage/myisam/ft_boolean_search.c 2009-12-09 18:51:45.141800598 -0100
+--- mysql-old/storage/myisam/ft_boolean_search.c 2009-12-09 22:18:31.967800412 -0100
++++ mysql/storage/myisam/ft_boolean_search.c 2009-12-09 22:22:12.596674805 -0100
@@ -46,9 +46,9 @@
three subexpressions (including the top-level one),
every one has its own max_docid, updated by its plus word.
@@ -6594,8 +6625,8 @@ diff -urN mysql-old/storage/myisam/ft_boolean_search.c mysql/storage/myisam/ft_b
#define FT_CORE
diff -urN mysql-old/storage/myisam/ha_myisam.cc mysql/storage/myisam/ha_myisam.cc
---- mysql-old/storage/myisam/ha_myisam.cc 2009-12-09 18:51:34.179800781 -0100
-+++ mysql/storage/myisam/ha_myisam.cc 2009-12-09 18:51:45.142800081 -0100
+--- mysql-old/storage/myisam/ha_myisam.cc 2009-12-09 22:18:31.966800259 -0100
++++ mysql/storage/myisam/ha_myisam.cc 2009-12-09 22:22:17.683549761 -0100
@@ -1519,7 +1519,7 @@
{
DBUG_ENTER("ha_myisam::start_bulk_insert");
@@ -6606,8 +6637,8 @@ diff -urN mysql-old/storage/myisam/ha_myisam.cc mysql/storage/myisam/ha_myisam.c
DBUG_PRINT("info",("start_bulk_insert: rows %lu size %lu",
(ulong) rows, size));
diff -urN mysql-old/storage/myisam/mi_cache.c mysql/storage/myisam/mi_cache.c
---- mysql-old/storage/myisam/mi_cache.c 2009-12-09 18:51:34.180800720 -0100
-+++ mysql/storage/myisam/mi_cache.c 2009-12-09 18:51:45.143799950 -0100
+--- mysql-old/storage/myisam/mi_cache.c 2009-12-09 22:18:31.968800266 -0100
++++ mysql/storage/myisam/mi_cache.c 2009-12-09 22:22:12.596674805 -0100
@@ -61,7 +61,7 @@
(my_off_t) (info->read_end - info->request_pos))
{
@@ -6618,8 +6649,8 @@ diff -urN mysql-old/storage/myisam/mi_cache.c mysql/storage/myisam/mi_cache.c
if (!(length-=in_buff_length))
DBUG_RETURN(0);
diff -urN mysql-old/storage/myisam/mi_check.c mysql/storage/myisam/mi_check.c
---- mysql-old/storage/myisam/mi_check.c 2009-12-09 18:51:34.179800781 -0100
-+++ mysql/storage/myisam/mi_check.c 2009-12-09 18:51:45.144800000 -0100
+--- mysql-old/storage/myisam/mi_check.c 2009-12-09 22:18:31.967800412 -0100
++++ mysql/storage/myisam/mi_check.c 2009-12-09 22:22:12.602674625 -0100
@@ -2165,7 +2165,7 @@
ulong buff_length;
DBUG_ENTER("filecopy");
@@ -6666,8 +6697,8 @@ diff -urN mysql-old/storage/myisam/mi_check.c mysql/storage/myisam/mi_check.c
create_info.old_options=(share.options |
(unpack ? HA_OPTION_TEMP_COMPRESS_RECORD : 0));
diff -urN mysql-old/storage/myisam/mi_create.c mysql/storage/myisam/mi_create.c
---- mysql-old/storage/myisam/mi_create.c 2009-12-09 18:51:34.179800781 -0100
-+++ mysql/storage/myisam/mi_create.c 2009-12-09 18:51:45.230555923 -0100
+--- mysql-old/storage/myisam/mi_create.c 2009-12-09 22:18:31.967800412 -0100
++++ mysql/storage/myisam/mi_create.c 2009-12-09 22:22:12.604674703 -0100
@@ -439,8 +439,8 @@
block_length= (keydef->block_length ?
my_round_up_to_next_power(keydef->block_length) :
@@ -6689,8 +6720,8 @@ diff -urN mysql-old/storage/myisam/mi_create.c mysql/storage/myisam/mi_create.c
if (! (flags & HA_DONT_TOUCH_DATA))
share.state.create_time= (long) time((time_t*) 0);
diff -urN mysql-old/storage/myisam/mi_dynrec.c mysql/storage/myisam/mi_dynrec.c
---- mysql-old/storage/myisam/mi_dynrec.c 2009-12-09 18:51:34.180800720 -0100
-+++ mysql/storage/myisam/mi_dynrec.c 2009-12-09 18:51:45.231612607 -0100
+--- mysql-old/storage/myisam/mi_dynrec.c 2009-12-09 22:18:31.967800412 -0100
++++ mysql/storage/myisam/mi_dynrec.c 2009-12-09 22:22:12.607674711 -0100
@@ -850,7 +850,7 @@
uint tmp=MY_ALIGN(reclength - length + 3 +
test(reclength >= 65520L),MI_DYN_ALIGN_SIZE);
@@ -6701,8 +6732,8 @@ diff -urN mysql-old/storage/myisam/mi_dynrec.c mysql/storage/myisam/mi_dynrec.c
if (block_info.filepos + block_info.block_len ==
info->state->data_file_length &&
diff -urN mysql-old/storage/myisam/mi_extra.c mysql/storage/myisam/mi_extra.c
---- mysql-old/storage/myisam/mi_extra.c 2009-12-09 18:51:34.180800720 -0100
-+++ mysql/storage/myisam/mi_extra.c 2009-12-09 18:51:45.232675033 -0100
+--- mysql-old/storage/myisam/mi_extra.c 2009-12-09 22:18:31.968800266 -0100
++++ mysql/storage/myisam/mi_extra.c 2009-12-09 22:22:12.607674711 -0100
@@ -99,7 +99,7 @@
cache_size= (extra_arg ? *(ulong*) extra_arg :
my_default_record_cache_size);
@@ -6713,8 +6744,8 @@ diff -urN mysql-old/storage/myisam/mi_extra.c mysql/storage/myisam/mi_extra.c
READ_CACHE,0L,(pbool) (info->lock_type != F_UNLCK),
MYF(share->write_flag & MY_WAIT_IF_FULL))))
diff -urN mysql-old/storage/myisam/mi_open.c mysql/storage/myisam/mi_open.c
---- mysql-old/storage/myisam/mi_open.c 2009-12-09 18:51:34.180800720 -0100
-+++ mysql/storage/myisam/mi_open.c 2009-12-09 18:51:45.233583628 -0100
+--- mysql-old/storage/myisam/mi_open.c 2009-12-09 22:18:31.968800266 -0100
++++ mysql/storage/myisam/mi_open.c 2009-12-09 22:22:12.609674696 -0100
@@ -328,7 +328,7 @@
strmov(share->index_file_name, index_name);
strmov(share->data_file_name, data_name);
@@ -6747,8 +6778,8 @@ diff -urN mysql-old/storage/myisam/mi_open.c mysql/storage/myisam/mi_open.c
if (newptr && length == old_length)
return newptr;
diff -urN mysql-old/storage/myisam/mi_packrec.c mysql/storage/myisam/mi_packrec.c
---- mysql-old/storage/myisam/mi_packrec.c 2009-12-09 18:51:34.180800720 -0100
-+++ mysql/storage/myisam/mi_packrec.c 2009-12-09 18:51:45.234552302 -0100
+--- mysql-old/storage/myisam/mi_packrec.c 2009-12-09 22:18:31.967800412 -0100
++++ mysql/storage/myisam/mi_packrec.c 2009-12-09 22:22:12.612674631 -0100
@@ -684,7 +684,7 @@
return OFFSET_TABLE_SIZE;
}
@@ -6768,8 +6799,8 @@ diff -urN mysql-old/storage/myisam/mi_packrec.c mysql/storage/myisam/mi_packrec.
}
return 0;
diff -urN mysql-old/storage/myisam/mi_test1.c mysql/storage/myisam/mi_test1.c
---- mysql-old/storage/myisam/mi_test1.c 2009-12-09 18:51:34.179800781 -0100
-+++ mysql/storage/myisam/mi_test1.c 2009-12-09 18:51:45.235674810 -0100
+--- mysql-old/storage/myisam/mi_test1.c 2009-12-09 22:18:31.966800259 -0100
++++ mysql/storage/myisam/mi_test1.c 2009-12-09 22:22:12.613674813 -0100
@@ -435,7 +435,7 @@
uint tmp;
uchar *ptr;;
@@ -6780,8 +6811,8 @@ diff -urN mysql-old/storage/myisam/mi_test1.c mysql/storage/myisam/mi_test1.c
int4store(pos,tmp);
ptr=blob_record;
diff -urN mysql-old/storage/myisam/mi_test2.c mysql/storage/myisam/mi_test2.c
---- mysql-old/storage/myisam/mi_test2.c 2009-12-09 18:51:34.179800781 -0100
-+++ mysql/storage/myisam/mi_test2.c 2009-12-09 18:51:45.236675258 -0100
+--- mysql-old/storage/myisam/mi_test2.c 2009-12-09 22:18:31.966800259 -0100
++++ mysql/storage/myisam/mi_test2.c 2009-12-09 22:22:12.614674784 -0100
@@ -601,7 +601,7 @@
goto err;
@@ -6792,8 +6823,8 @@ diff -urN mysql-old/storage/myisam/mi_test2.c mysql/storage/myisam/mi_test2.c
if (mi_rsame(file,read_record2,(int) i)) goto err;
if (bcmp(read_record,read_record2,reclength) != 0)
diff -urN mysql-old/storage/myisam/myisampack.c mysql/storage/myisam/myisampack.c
---- mysql-old/storage/myisam/myisampack.c 2009-12-09 18:51:34.178800297 -0100
-+++ mysql/storage/myisam/myisampack.c 2009-12-09 18:51:45.237675083 -0100
+--- mysql-old/storage/myisam/myisampack.c 2009-12-09 22:18:31.966800259 -0100
++++ mysql/storage/myisam/myisampack.c 2009-12-09 22:22:12.619674699 -0100
@@ -3001,7 +3001,7 @@
if (mrg->src_file_has_indexes_disabled)
{
@@ -6804,8 +6835,8 @@ diff -urN mysql-old/storage/myisam/myisampack.c mysql/storage/myisam/myisampack.
state.dellink= HA_OFFSET_ERROR;
state.version=(ulong) time((time_t*) 0);
diff -urN mysql-old/storage/myisam/rt_mbr.c mysql/storage/myisam/rt_mbr.c
---- mysql-old/storage/myisam/rt_mbr.c 2009-12-09 18:51:34.179800781 -0100
-+++ mysql/storage/myisam/rt_mbr.c 2009-12-09 18:51:45.239675062 -0100
+--- mysql-old/storage/myisam/rt_mbr.c 2009-12-09 22:18:31.966800259 -0100
++++ mysql/storage/myisam/rt_mbr.c 2009-12-09 22:22:12.620674778 -0100
@@ -325,8 +325,8 @@
bmin = korr_func(b); \
amax = korr_func(a+len); \
@@ -6851,8 +6882,8 @@ diff -urN mysql-old/storage/myisam/rt_mbr.c mysql/storage/myisam/rt_mbr.c
return 0; \
res *= amax - amin; \
diff -urN mysql-old/storage/myisam/sort.c mysql/storage/myisam/sort.c
---- mysql-old/storage/myisam/sort.c 2009-12-09 18:51:34.179800781 -0100
-+++ mysql/storage/myisam/sort.c 2009-12-09 18:51:45.240628450 -0100
+--- mysql-old/storage/myisam/sort.c 2009-12-09 22:18:31.967800412 -0100
++++ mysql/storage/myisam/sort.c 2009-12-09 22:22:12.621674801 -0100
@@ -131,7 +131,7 @@
sort_keys= (uchar **) NULL; error= 1;
maxbuffer=1;
@@ -6890,8 +6921,8 @@ diff -urN mysql-old/storage/myisam/sort.c mysql/storage/myisam/sort.c
buffp = buffpek->base;
diff -urN mysql-old/storage/myisammrg/ha_myisammrg.cc mysql/storage/myisammrg/ha_myisammrg.cc
---- mysql-old/storage/myisammrg/ha_myisammrg.cc 2009-12-09 18:51:34.178800297 -0100
-+++ mysql/storage/myisammrg/ha_myisammrg.cc 2009-12-09 18:51:45.241675110 -0100
+--- mysql-old/storage/myisammrg/ha_myisammrg.cc 2009-12-09 22:18:31.965800435 -0100
++++ mysql/storage/myisammrg/ha_myisammrg.cc 2009-12-09 22:22:17.679549860 -0100
@@ -930,7 +930,7 @@
memcpy((char*) table->key_info[0].rec_per_key,
(char*) mrg_info.rec_per_key,
@@ -6902,8 +6933,8 @@ diff -urN mysql-old/storage/myisammrg/ha_myisammrg.cc mysql/storage/myisammrg/ha
}
if (flag & HA_STATUS_ERRKEY)
diff -urN mysql-old/storage/ndb/src/common/portlib/NdbTCP.cpp mysql/storage/ndb/src/common/portlib/NdbTCP.cpp
---- mysql-old/storage/ndb/src/common/portlib/NdbTCP.cpp 2009-12-09 18:51:34.176800531 -0100
-+++ mysql/storage/ndb/src/common/portlib/NdbTCP.cpp 2009-12-09 18:51:45.241675110 -0100
+--- mysql-old/storage/ndb/src/common/portlib/NdbTCP.cpp 2009-12-09 22:18:31.964800570 -0100
++++ mysql/storage/ndb/src/common/portlib/NdbTCP.cpp 2009-12-09 22:22:23.137549900 -0100
@@ -30,7 +30,7 @@
&tmp_errno);
if (hp)
@@ -6914,8 +6945,8 @@ diff -urN mysql-old/storage/ndb/src/common/portlib/NdbTCP.cpp mysql/storage/ndb/
return 0; //DBUG_RETURN(0);
}
diff -urN mysql-old/storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp mysql/storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp
---- mysql-old/storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp 2009-12-09 18:51:34.163802003 -0100
-+++ mysql/storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp 2009-12-09 18:51:45.242675585 -0100
+--- mysql-old/storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp 2009-12-09 22:18:31.952800915 -0100
++++ mysql/storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp 2009-12-09 22:22:22.936550043 -0100
@@ -54,7 +54,7 @@
ndbrequire(ah(entryData).getAttributeId() == descAttr.m_primaryAttrId);
// sizes
@@ -6935,8 +6966,8 @@ diff -urN mysql-old/storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp mysql/stora
// compare
NdbSqlUtil::Cmp* const cmp = c_sqlCmp[index];
diff -urN mysql-old/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp mysql/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp
---- mysql-old/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp 2009-12-09 18:51:34.163802003 -0100
-+++ mysql/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp 2009-12-09 18:51:45.242675585 -0100
+--- mysql-old/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp 2009-12-09 22:18:31.952800915 -0100
++++ mysql/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp 2009-12-09 22:22:22.937549846 -0100
@@ -212,7 +212,7 @@
}
}
@@ -6947,8 +6978,8 @@ diff -urN mysql-old/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp mysql/sto
for (unsigned i = 0; i <= 1; i++) {
if (node.getLink(i) == NullTupLoc)
diff -urN mysql-old/storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp mysql/storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp
---- mysql-old/storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp 2009-12-09 18:51:34.164801452 -0100
-+++ mysql/storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp 2009-12-09 18:51:45.243674876 -0100
+--- mysql-old/storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp 2009-12-09 22:18:31.952800915 -0100
++++ mysql/storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp 2009-12-09 22:22:22.938549877 -0100
@@ -260,7 +260,7 @@
selectNode(leafNode, leafLoc);
if (semiNode.getOccup() < tree.m_minOccup) {
@@ -6968,8 +6999,8 @@ diff -urN mysql-old/storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp mysql/stor
}
}
diff -urN mysql-old/storage/ndb/test/ndbapi/test_event_merge.cpp mysql/storage/ndb/test/ndbapi/test_event_merge.cpp
---- mysql-old/storage/ndb/test/ndbapi/test_event_merge.cpp 2009-12-09 18:51:34.151801154 -0100
-+++ mysql/storage/ndb/test/ndbapi/test_event_merge.cpp 2009-12-09 18:51:45.244675354 -0100
+--- mysql-old/storage/ndb/test/ndbapi/test_event_merge.cpp 2009-12-09 22:18:31.941800371 -0100
++++ mysql/storage/ndb/test/ndbapi/test_event_merge.cpp 2009-12-09 22:22:22.772549668 -0100
@@ -23,8 +23,8 @@
// version >= 5.1 required
@@ -6982,8 +7013,8 @@ diff -urN mysql-old/storage/ndb/test/ndbapi/test_event_merge.cpp mysql/storage/n
/*
diff -urN mysql-old/storage/ndb/test/ndbapi/testIndexStat.cpp mysql/storage/ndb/test/ndbapi/testIndexStat.cpp
---- mysql-old/storage/ndb/test/ndbapi/testIndexStat.cpp 2009-12-09 18:51:34.153801283 -0100
-+++ mysql/storage/ndb/test/ndbapi/testIndexStat.cpp 2009-12-09 18:51:45.245674834 -0100
+--- mysql-old/storage/ndb/test/ndbapi/testIndexStat.cpp 2009-12-09 22:18:31.943801573 -0100
++++ mysql/storage/ndb/test/ndbapi/testIndexStat.cpp 2009-12-09 22:22:22.774549701 -0100
@@ -32,8 +32,8 @@
#undef min
@@ -7023,8 +7054,8 @@ diff -urN mysql-old/storage/ndb/test/ndbapi/testIndexStat.cpp mysql/storage/ndb/
int curr = -1;
for (i = 0; i < (int)g_sortcount; i++) {
diff -urN mysql-old/storage/ndb/test/src/getarg.c mysql/storage/ndb/test/src/getarg.c
---- mysql-old/storage/ndb/test/src/getarg.c 2009-12-09 18:51:34.157800599 -0100
-+++ mysql/storage/ndb/test/src/getarg.c 2009-12-09 18:51:45.246674823 -0100
+--- mysql-old/storage/ndb/test/src/getarg.c 2009-12-09 22:18:31.945800726 -0100
++++ mysql/storage/ndb/test/src/getarg.c 2009-12-09 22:22:12.560674914 -0100
@@ -66,7 +66,7 @@
#define ISFLAG(X) ((X).type == arg_flag || (X).type == arg_negative_flag)
@@ -7044,8 +7075,8 @@ diff -urN mysql-old/storage/ndb/test/src/getarg.c mysql/storage/ndb/test/src/get
if (extra_string) {
col = check_column(stderr, col, strlen(extra_string) + 1, columns);
diff -urN mysql-old/strings/ctype-big5.c mysql/strings/ctype-big5.c
---- mysql-old/strings/ctype-big5.c 2009-12-09 18:51:34.224802453 -0100
-+++ mysql/strings/ctype-big5.c 2009-12-09 18:51:45.248800098 -0100
+--- mysql-old/strings/ctype-big5.c 2009-12-09 22:18:32.008802770 -0100
++++ mysql/strings/ctype-big5.c 2009-12-09 22:22:13.163674570 -0100
@@ -253,7 +253,7 @@
const uchar *b, size_t b_length,
my_bool b_is_prefix)
@@ -7065,8 +7096,8 @@ diff -urN mysql-old/strings/ctype-big5.c mysql/strings/ctype-big5.c
#ifndef VARCHAR_WITH_DIFF_ENDSPACE_ARE_DIFFERENT_FOR_UNIQUE
diff -urN mysql-old/strings/ctype-bin.c mysql/strings/ctype-bin.c
---- mysql-old/strings/ctype-bin.c 2009-12-09 18:51:34.220801130 -0100
-+++ mysql/strings/ctype-bin.c 2009-12-09 18:51:45.252924786 -0100
+--- mysql-old/strings/ctype-bin.c 2009-12-09 22:18:32.004800665 -0100
++++ mysql/strings/ctype-bin.c 2009-12-09 22:22:13.164674757 -0100
@@ -80,7 +80,7 @@
const uchar *t, size_t tlen,
my_bool t_is_prefix)
@@ -7113,8 +7144,8 @@ diff -urN mysql-old/strings/ctype-bin.c mysql/strings/ctype-bin.c
bfill(dest + srclen, dstlen - srclen, ' ');
return dstlen;
diff -urN mysql-old/strings/ctype-gbk.c mysql/strings/ctype-gbk.c
---- mysql-old/strings/ctype-gbk.c 2009-12-09 18:51:34.222802576 -0100
-+++ mysql/strings/ctype-gbk.c 2009-12-09 18:51:45.257799845 -0100
+--- mysql-old/strings/ctype-gbk.c 2009-12-09 22:18:32.006801869 -0100
++++ mysql/strings/ctype-gbk.c 2009-12-09 22:22:13.178674544 -0100
@@ -2616,7 +2616,7 @@
const uchar *b, size_t b_length,
my_bool b_is_prefix)
@@ -7134,8 +7165,8 @@ diff -urN mysql-old/strings/ctype-gbk.c mysql/strings/ctype-gbk.c
#ifndef VARCHAR_WITH_DIFF_ENDSPACE_ARE_DIFFERENT_FOR_UNIQUE
diff -urN mysql-old/strings/ctype-mb.c mysql/strings/ctype-mb.c
---- mysql-old/strings/ctype-mb.c 2009-12-09 18:51:34.224802453 -0100
-+++ mysql/strings/ctype-mb.c 2009-12-09 18:51:45.325577336 -0100
+--- mysql-old/strings/ctype-mb.c 2009-12-09 22:18:32.008802770 -0100
++++ mysql/strings/ctype-mb.c 2009-12-09 22:22:13.180674559 -0100
@@ -368,7 +368,7 @@
const uchar *t, size_t tlen,
my_bool t_is_prefix)
@@ -7164,8 +7195,8 @@ diff -urN mysql-old/strings/ctype-mb.c mysql/strings/ctype-mb.c
bfill(dest + srclen, dstlen - srclen, ' ');
return dstlen;
diff -urN mysql-old/strings/ctype-simple.c mysql/strings/ctype-simple.c
---- mysql-old/strings/ctype-simple.c 2009-12-09 18:51:34.224802453 -0100
-+++ mysql/strings/ctype-simple.c 2009-12-09 18:51:45.326800206 -0100
+--- mysql-old/strings/ctype-simple.c 2009-12-09 22:18:32.008802770 -0100
++++ mysql/strings/ctype-simple.c 2009-12-09 22:22:13.182674610 -0100
@@ -159,7 +159,7 @@
diff_if_only_endspace_difference= 0;
#endif
@@ -7203,8 +7234,8 @@ diff -urN mysql-old/strings/ctype-simple.c mysql/strings/ctype-simple.c
diff -urN mysql-old/strings/ctype-tis620.c mysql/strings/ctype-tis620.c
---- mysql-old/strings/ctype-tis620.c 2009-12-09 18:51:34.221801624 -0100
-+++ mysql/strings/ctype-tis620.c 2009-12-09 18:51:45.327800162 -0100
+--- mysql-old/strings/ctype-tis620.c 2009-12-09 22:18:32.005801942 -0100
++++ mysql/strings/ctype-tis620.c 2009-12-09 22:22:13.184674643 -0100
@@ -581,7 +581,7 @@
a_length= thai2sortable(a, a_length);
b_length= thai2sortable(b, b_length);
@@ -7224,8 +7255,8 @@ diff -urN mysql-old/strings/ctype-tis620.c mysql/strings/ctype-tis620.c
len= thai2sortable(dest, len);
if (dstlen > len)
diff -urN mysql-old/strings/ctype-uca.c mysql/strings/ctype-uca.c
---- mysql-old/strings/ctype-uca.c 2009-12-09 18:51:34.220801130 -0100
-+++ mysql/strings/ctype-uca.c 2009-12-09 18:51:45.330799867 -0100
+--- mysql-old/strings/ctype-uca.c 2009-12-09 22:18:32.005801942 -0100
++++ mysql/strings/ctype-uca.c 2009-12-09 22:22:13.197674581 -0100
@@ -7567,7 +7567,7 @@
{
char tail[30];
@@ -7236,8 +7267,8 @@ diff -urN mysql-old/strings/ctype-uca.c mysql/strings/ctype-uca.c
my_snprintf(errstr,errsize-1,"%s at '%s'", txt, tail);
}
diff -urN mysql-old/strings/ctype-ucs2.c mysql/strings/ctype-ucs2.c
---- mysql-old/strings/ctype-ucs2.c 2009-12-09 18:51:34.220801130 -0100
-+++ mysql/strings/ctype-ucs2.c 2009-12-09 18:51:45.344675082 -0100
+--- mysql-old/strings/ctype-ucs2.c 2009-12-09 22:18:32.005801942 -0100
++++ mysql/strings/ctype-ucs2.c 2009-12-09 22:22:13.199674641 -0100
@@ -279,7 +279,7 @@
se= s + slen;
te= t + tlen;
@@ -7275,8 +7306,8 @@ diff -urN mysql-old/strings/ctype-ucs2.c mysql/strings/ctype-ucs2.c
cs->cset->fill(cs, (char*) dst + srclen, dstlen - srclen, ' ');
return dstlen;
diff -urN mysql-old/strings/ctype-utf8.c mysql/strings/ctype-utf8.c
---- mysql-old/strings/ctype-utf8.c 2009-12-09 18:51:34.220801130 -0100
-+++ mysql/strings/ctype-utf8.c 2009-12-09 18:51:45.345675240 -0100
+--- mysql-old/strings/ctype-utf8.c 2009-12-09 22:18:32.005801942 -0100
++++ mysql/strings/ctype-utf8.c 2009-12-09 22:22:13.205674578 -0100
@@ -1937,7 +1937,7 @@
const uchar *t, const uchar *te)
{
@@ -7287,8 +7318,8 @@ diff -urN mysql-old/strings/ctype-utf8.c mysql/strings/ctype-utf8.c
return cmp ? cmp : slen-tlen;
}
diff -urN mysql-old/strings/decimal.c mysql/strings/decimal.c
---- mysql-old/strings/decimal.c 2009-12-09 18:51:34.220801130 -0100
-+++ mysql/strings/decimal.c 2009-12-09 18:59:37.355550046 -0100
+--- mysql-old/strings/decimal.c 2009-12-09 22:18:32.004800665 -0100
++++ mysql/strings/decimal.c 2009-12-09 22:22:13.210674610 -0100
@@ -105,6 +105,7 @@
#include <my_sys.h> /* for my_alloca */
#include <m_string.h>
@@ -7315,6 +7346,17 @@ diff -urN mysql-old/strings/decimal.c mysql/strings/decimal.c
{
dec1 y=x/10;
*--s='0'+(uchar)(x-y*10);
+@@ -1517,8 +1518,8 @@
+
+ if (to != from || intg1>intg0)
+ {
+- dec1 *p0= buf0+intg0+max(frac1, frac0);
+- dec1 *p1= buf1+intg1+max(frac1, frac0);
++ dec1 *p0= buf0+intg0+MYSQL_MAX(frac1, frac0);
++ dec1 *p1= buf1+intg1+MYSQL_MAX(frac1, frac0);
+
+ while (buf0 < p0)
+ *(--p1) = *(--p0);
@@ -1529,7 +1530,7 @@
buf0=to->buf;
buf1=to->buf;
@@ -7324,6 +7366,15 @@ diff -urN mysql-old/strings/decimal.c mysql/strings/decimal.c
}
if (frac0 > frac1)
+@@ -1631,7 +1632,7 @@
+ scale=frac0*DIG_PER_DEC1;
+ error=E_DEC_TRUNCATED; /* XXX */
+ }
+- for (buf1=to->buf+intg0+max(frac0,0); buf1 > to->buf; buf1--)
++ for (buf1=to->buf+intg0+MYSQL_MAX(frac0,0); buf1 > to->buf; buf1--)
+ {
+ buf1[0]=buf1[-1];
+ }
@@ -1650,7 +1651,7 @@
/* making 'zero' with the proper scale */
dec1 *p0= to->buf + frac0 + 1;
@@ -7446,8 +7497,8 @@ diff -urN mysql-old/strings/decimal.c mysql/strings/decimal.c
if (unlikely(intg0+frac0 > to->len))
{
diff -urN mysql-old/strings/my_vsnprintf.c mysql/strings/my_vsnprintf.c
---- mysql-old/strings/my_vsnprintf.c 2009-12-09 18:51:34.220801130 -0100
-+++ mysql/strings/my_vsnprintf.c 2009-12-09 18:51:45.350675349 -0100
+--- mysql-old/strings/my_vsnprintf.c 2009-12-09 22:18:32.004800665 -0100
++++ mysql/strings/my_vsnprintf.c 2009-12-09 22:22:13.210674610 -0100
@@ -141,7 +141,7 @@
/* If %#d syntax was used, we have to pre-zero/pre-space the string */
if (store_start == buff)
@@ -7458,8 +7509,8 @@ diff -urN mysql-old/strings/my_vsnprintf.c mysql/strings/my_vsnprintf.c
{
size_t diff= (length- res_length);
diff -urN mysql-old/strings/str2int.c mysql/strings/str2int.c
---- mysql-old/strings/str2int.c 2009-12-09 18:51:34.224802453 -0100
-+++ mysql/strings/str2int.c 2009-12-09 18:51:45.350675349 -0100
+--- mysql-old/strings/str2int.c 2009-12-09 22:18:32.008802770 -0100
++++ mysql/strings/str2int.c 2009-12-09 22:22:13.210674610 -0100
@@ -82,7 +82,7 @@
machines all, if +|n| is representable, so is -|n|, but on
twos complement machines the converse is not true. So the
@@ -7470,8 +7521,8 @@ diff -urN mysql-old/strings/str2int.c mysql/strings/str2int.c
/* Calculate Limit using Scale as a scratch variable */
diff -urN mysql-old/tests/mysql_client_test.c mysql/tests/mysql_client_test.c
---- mysql-old/tests/mysql_client_test.c 2009-12-09 18:51:34.123800728 -0100
-+++ mysql/tests/mysql_client_test.c 2009-12-09 18:51:45.354675022 -0100
+--- mysql-old/tests/mysql_client_test.c 2009-12-09 22:18:31.914800811 -0100
++++ mysql/tests/mysql_client_test.c 2009-12-09 22:22:12.556674839 -0100
@@ -587,7 +587,7 @@
return row_count;
}
@@ -7482,8 +7533,8 @@ diff -urN mysql-old/tests/mysql_client_test.c mysql/tests/mysql_client_test.c
bzero((char*) buffer, sizeof(buffer));
bzero((char*) length, sizeof(length));
diff -urN mysql-old/vio/viosocket.c mysql/vio/viosocket.c
---- mysql-old/vio/viosocket.c 2009-12-09 18:51:34.231801123 -0100
-+++ mysql/vio/viosocket.c 2009-12-09 18:51:45.360674851 -0100
+--- mysql-old/vio/viosocket.c 2009-12-09 22:18:32.015800674 -0100
++++ mysql/vio/viosocket.c 2009-12-09 22:22:13.308674792 -0100
@@ -69,7 +69,7 @@
if (vio->read_pos < vio->read_end)