Below is the list of changes that have just been committed into a local
4.1 repository of alexi. When alexi 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.2340 05/07/26 20:37:12 aivanov (AT) mysql (DOT) com +2 -0
BUG# <no-such-number> : some fix

sql/item_strfunc.cc
1.233 05/07/26 20:36:51 aivanov (AT) mysql (DOT) com +3 -1
BUG# <no-such-number> : some fix

mysql-test/t/select.test
1.46 05/07/26 20:36:51 aivanov (AT) mysql (DOT) com +2 -0
BUG# <no-such-number>

# 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: aivanov
# Host: mysql.creware.com
# Root: /home/alexi/mysql-4.1-bug1

--- 1.232/sql/item_strfunc.cc 2005-07-19 20:24:59 +04:00
+++ 1.233/sql/item_strfunc.cc 2005-07-26 20:36:51 +04:00
@@ -2130,7 +2130,9 @@
{
ulonglong length= ((ulonglong) args[1]->val_int() *
collation.collation->mbmaxlen);
- length= max((ulonglong) args[0]->max_length, length);
+ /*a comment before */
+ length= max((ulonglong)args[0]->max_length, length);
+ /*a comment after */
if (length >= MAX_BLOB_WIDTH)
{
length= MAX_BLOB_WIDTH;

--- 1.45/mysql-test/t/select.test 2005-07-19 20:24:58 +04:00
+++ 1.46/mysql-test/t/select.test 2005-07-26 20:36:51 +04:00
@@ -2162,4 +2162,6 @@
select SQL_CALC_FOUND_ROWS count(*) from t1 limit 2,3;
select found_rows();

+#BUG#234321
+select 2+23;
DROP TABLE t1;

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