Commit graph

35321 commits

Author SHA1 Message Date
unknown
e320fd7869 Bug#24568, NdbScanFilter NAND/NOR operations sometimes do not works as expected
this patch is an absolutely necessary supplement of the previous patch,
the previous patch doesnot cover isnull() and isnotnull() methods' effect.


ndb/src/ndbapi/NdbScanFilter.cpp:
  correct isnull() and isnotnull() when these two methods called in a NAND/NOR operation
2007-03-21 15:36:22 +08:00
unknown
91a88d1037 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj-merge


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanFilter.cpp:
  Auto merged
2007-03-16 12:23:31 +08:00
unknown
28d696d18b Merge ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
into  ymer.(none):/usr/local/mysql/mysql-5.0-ndb
2007-03-12 10:18:34 +01:00
unknown
3c81172776 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  poseidon.mysql.com:/home/tomas/mysql-5.0
2007-03-10 11:49:04 +07:00
unknown
ff94fdda37 disabling _new_ unstable test case 2007-03-10 11:46:20 +07:00
unknown
f5c27523fc BUG#27018: Partial blob write inside blob clobbers data after the write.
When doing partial blob update with NdbBlob::writeData(), zero-padding
after the write was wrongly done, causing part of the old blob value
to be overwritten with zeros (or spaces for text field).

Fixed by only padding when needed (when writing at end of the blob).


ndb/src/ndbapi/NdbBlob.cpp:
  Do not pad rest of blob part after the write, unless it is a write at the
  end of the blob.
ndb/test/ndbapi/testBlobs.cpp:
  Add test case.
2007-03-09 23:37:33 +01:00
unknown
8f6972dd6d Merge bk-internal:/home/bk/mysql-5.0
into  production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.0-build
2007-03-09 23:01:12 +01:00
unknown
e2d34902e5 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean
into  poseidon.mysql.com:/home/tomas/mysql-5.0
2007-03-09 20:39:59 +07:00
unknown
07fa209b6c Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
2007-03-09 20:36:04 +07:00
unknown
7c14308058 added error code for failing send signal and timeout waiting for node failure
added error code for failing send signal and timeout waiting for node failure


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  added error code for failing send signal and timeout waiting for node failure
ndb/src/ndbapi/ndberror.c:
  added error code for failing send signal and timeout waiting for node failure
2007-03-09 20:34:00 +07:00
unknown
e68df7a1ab Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  olga.mysql.com:/home/igor/mysql-5.0-opt


sql/item.cc:
  Auto merged
2007-03-09 02:45:17 -08:00
unknown
97b5083392 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean
into  poseidon.mysql.com:/home/tomas/mysql-5.0
2007-03-09 17:28:38 +07:00
unknown
413604f907 Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26661
2007-03-09 01:50:17 -08:00
unknown
729bcaf430 Fixed bug : crash when order by clause in a union
construct references invalid name.
Derived tables currently cannot use outer references.
Thus there is no outer context for them.
The 4.1 code takes this fact into account while the 
Item_field::fix_outer_field code of 5.0 lost the check that blocks
any attempts to resolve names in outer context for derived tables.


mysql-test/r/union.result:
  Added a test case for bug .
mysql-test/t/union.test:
  Added a test case for bug .
sql/item.cc:
  Fixed bug .
  Derived tables currently cannot use outer references.
  Thus there is no outer context for them.
  The 4.1 code takes this fact into account while the 
  Item_field::fix_outer_field code of 5.0 lost the check that blocks
  any attempts to resolve names in outer context for derived tables.
2007-03-09 01:45:32 -08:00
unknown
76542acdce Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt


sql/sql_select.cc:
  Auto merged
2007-03-09 13:44:43 +04:00
unknown
09ea47d4b0 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean
2007-03-09 16:40:19 +07:00
unknown
3dbfc95c33 ndb single user basic test 2007-03-09 16:39:13 +07:00
unknown
3cd8b8817d Merge mysql.com:/home/hf/work/mrg/mysql-4.1-opt
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-09 13:39:03 +04:00
unknown
5c1e48c51d aftermerge fix
mysql-test/r/view.result:
  merging
2007-03-09 13:37:06 +04:00
unknown
6b9f1ef2db Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean
into  poseidon.mysql.com:/home/tomas/mysql-5.0
2007-03-09 15:50:21 +07:00
unknown
9565e8cd23 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
2007-03-09 15:38:44 +07:00
unknown
582221604e Bug SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
- correction of part 1
    add ndb_waiter option to wait for single user mode


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Bug  SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
  - correction of part 1
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Bug  SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
  - correction of part 1
ndb/tools/waiter.cpp:
  add ndb_waiter option to wait for single user mode
2007-03-09 15:37:10 +07:00
unknown
12af658570 Merge bk@192.168.21.1:mysql-5.0
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt


mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
mysql-test/r/func_str.result:
  merging
mysql-test/r/sp.result:
  merging
mysql-test/r/view.result:
  merging
mysql-test/t/func_str.test:
  merging
mysql-test/t/view.test:
  merging
2007-03-08 21:42:41 +04:00
unknown
0fcd9c2bfb Merge bk@192.168.21.1:mysql-4.1
into  mysql.com:/home/hf/work/mrg/mysql-4.1-opt
2007-03-08 21:14:31 +04:00
unknown
4c0ab891ea sql_select.cc:
Postfix for bug#22331.


sql/sql_select.cc:
  Postfix for bug#22331.
2007-03-08 19:38:21 +03:00
unknown
5130e88e41 Merge bk-internal:/home/bk/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-03-08 15:10:24 +01:00
unknown
d6bd171fd2 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Manual merge
2007-03-08 14:55:39 +01:00
unknown
cc379fff6d Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


extra/comp_err.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-03-08 13:30:04 +01:00
unknown
0a5780bc03 comp_err.c: return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning
extra/comp_err.c:
  return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning
2007-03-08 08:15:30 +01:00
unknown
12df5509e7 Merge bk-internal:/home/bk/mysql-5.0-ndb
into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-maint
2007-03-08 04:23:19 +01:00
unknown
02fa7a1651 Merge poseidon.mysql.com:/home/tomas/mysql-5.0
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-08 08:33:38 +07:00
unknown
1d07e34624 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
2007-03-08 02:22:50 +01:00
unknown
270f20ae4f Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
2007-03-08 01:12:09 +01:00
unknown
f2044997d8 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/40
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41
2007-03-08 01:06:04 +01:00
unknown
8a01882a42 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50


scripts/make_binary_distribution.sh:
  Auto merged
2007-03-08 01:00:49 +01:00
unknown
ae8cad4424 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-build
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41
2007-03-08 00:59:15 +01:00
unknown
30c1622ec4 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50


sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2007-03-07 23:55:25 +01:00
unknown
7a512b029d Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/40
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/40
2007-03-07 23:54:52 +01:00
unknown
5501a2915a update test results for bdb_gis after merge of fix for b26038 2007-03-07 23:49:46 +01:00
unknown
245f130858 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-07 23:07:03 +01:00
unknown
dc45145483 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-07 23:05:46 +01:00
unknown
4c1312d446 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-03-07 23:04:25 +01:00
unknown
1631f65dfd sql_select.cc:
Postfix for bug#22331 for windows platform.
explain.test, explain.result:
  Cleanup after bugfix#22331.


mysql-test/t/explain.test:
  Cleanup after bugfix#22331.
mysql-test/r/explain.result:
  Cleanup after bugfix#22331.
sql/sql_select.cc:
  Postfix for bug#22331 for windows platform.
2007-03-08 00:27:42 +03:00
unknown
d773874044 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql


sql/sql_select.cc:
  Auto merged
2007-03-07 22:23:08 +03:00
unknown
6f18c39265 Merge moonbone.local:/mnt/gentoo64/work/22331-bug-5.0-opt-mysql
into  moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql


mysql-test/r/subselect.result:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_lex.cc:
  SCCS merged
2007-03-07 22:22:19 +03:00
unknown
11b533b8be Bug#25373: Stored functions wasn't compared correctly which leads to a wrong
result.

For built-in functions like sqrt() function names are hard-coded and can be
compared by pointer. But this isn't the case for a used-defined stored
functions - names there are dynamical and should be compared as strings.

Now the Item_func::eq() function employs my_strcasecmp() function to compare
used-defined stored functions names.


mysql-test/t/sp.test:
  Added a test case for bug#25373: Stored functions wasn't compared correctly which leads to a wrong result.
mysql-test/r/sp.result:
  Added a test case for bug#25373: Stored functions wasn't compared correctly which leads to a wrong result.
sql/item_func.cc:
  Bug#25373: Stored functions wasn't compared correctly which leads to a wrong
  result.
  Now the Item_func::eq() function employs my_strcasecmp() function to compare
  used-defined stored functions names.
2007-03-07 22:11:57 +03:00
unknown
6de277910b Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
away.

During optimization stage the WHERE conditions can be changed or even
be removed at all if they know for sure to be true of false. Thus they aren't
showed in the EXPLAIN EXTENDED which prints conditions after optimization.

Now if all elements of an Item_cond were removed this Item_cond is substituted
for an Item_int with the int value of the Item_cond.
If there were conditions that were totally optimized away then values of the
saved cond_value and having_value will be printed instead.


mysql-test/t/explain.test:
  Added a test case for the bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized away.
mysql-test/r/subselect.result:
  Corrected test case result after fix for bug#22331.
mysql-test/r/func_test.result:
  Corrected test case result after fix for bug#22331.
mysql-test/r/explain.result:
  Added a test case for the bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized away.
sql/sql_select.cc:
  Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
  away.
  Now if all elements of an Item_cond were removed this Item_cond is substituted
  for an Item_int with the int value of the Item_cond.
  If there were conditions that were totally optimized away then values of the
  saved cond_value and having_value will be printed instead.
sql/sql_lex.h:
  Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
  away.
  The cond_value and the having_value variables are
  added to the SELECT_LEX class.
sql/sql_lex.cc:
  Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
  away.
  The initialization of the cond_value and the having_value variables.
sql/sql_select.h:
  Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
  away.
  Now having_value is also stored in the JOIN class.
2007-03-07 21:44:58 +03:00
unknown
e4cdb58013 Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26560


sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2007-03-07 07:58:34 -08:00
unknown
83def161de Bug#25222 Win32 HANDLE leak in my_sopen()
- When attempting to associate a Windows File handle to a C run-time file
handle there is an upper bound.  Once reached, the newly created handles
will cause a memory leak since they are not properly associated with a
handle that can later be cleaned up.


mysys/my_open.c:
  Bug#25222 Win32 HANDLE leak in my_sopen()
  - Check for failure in _open_osfhandle and close allocated HANDLE on failure.
2007-03-07 10:46:38 -05:00
unknown
4d6e16f284 A fix for the windows build (harmless warning).
sql/sql_lex.cc:
  A fix for the windows build.
2007-03-07 14:03:44 +03:00