Commit graph

16294 commits

Author SHA1 Message Date
unknown
f72b5978c4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg6462


sql/set_var.cc:
  Auto merged
2004-11-22 13:06:31 +03:00
unknown
4389be7557 Fix for bug #6462 "Same request on same data returns different
results." a.k.a. "Proper cleanup of subqueries is missing for SET and DO
statements". (Version #2 with after-review fixes).

To perform proper cleanup for statements that can contain subqueries 
but don't have main select we must call free_undelaid_joins().


mysql-test/r/subselect.result:
  Added test for bug #6462 "Same request on same data returns different
  results." a.k.a. "Proper cleanup of subqueries is missing for SET and DO
  statements".
mysql-test/t/subselect.test:
  Added test for bug #6462 "Same request on same data returns different
  results." a.k.a. "Proper cleanup of subqueries is missing for SET and DO
  statements".
sql/set_var.cc:
  Added missing cleanup of joins used in subqueries to SET statement.
sql/sql_do.cc:
  Added missing cleanup of joins used in subqueries to DO statement.
2004-11-22 13:05:10 +03:00
unknown
5672598f0a Added checks for NOT NULL for all fields in UNIQUE INDEX (USING HASH) 2004-11-22 10:35:03 +01:00
unknown
abb53b6f99 uca-dump.c:
Mofidications to dump secondary and tertiary weigthts
  And some minor improvements


strings/uca-dump.c:
  Mofidications to dump secondary and tertiary weigthts
  And some minor improvements
2004-11-22 13:02:27 +04:00
unknown
d2d4b48876 Fixed BUG #6747: innodb_locks_unsafe_for_binlog still uses next-key locking.
innobase/row/row0sel.c:
  Fixed bug: innodb_locks_unsafe_for_binlog still uses next-key locking (BUG #6747).
  We do not take gap type locks when using InnoDB startup option 
  innodb_locks_unsafe_for_binlog. Some code polishing also done.
2004-11-22 10:34:29 +02:00
unknown
3e779698ab aligned connect string option on all cluster executables, --ndb-connectstring is now supported by all
enabled new section in my.cnf [mysql_cluster], which is read by all executables, where connect string can be put for all cluster executables
2004-11-22 08:06:39 +00:00
unknown
6d6b38c27f Bug #6737: REGEXP gives wrong result with case sensitive collation:
- A new flag MY_CS_CSSORT was introduced for case sensitivity.
- Item_func_regexp doesn't substiture ICASE not only
  for binary collations but for case sensitive collations as well.
2004-11-22 11:58:40 +04:00
unknown
366ef4faeb Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl2077


client/Makefile.am:
  Auto merged
client/mysqladmin.cc:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
2004-11-22 08:20:34 +01:00
unknown
3d69849543 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-fix


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/ndbapi/testReadPerf.cpp:
  Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
  Auto merged
2004-11-22 07:52:42 +01:00
unknown
5a022e7ba9 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl2077
2004-11-22 07:23:58 +01:00
unknown
9db732ebe6 wl2077 - ndb, fix testDict 2004-11-22 07:22:08 +01:00
unknown
48e8febccd Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl2077


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2004-11-21 22:18:09 +01:00
unknown
9e26c327a0 wl2077 - ndb close scan - fix introduced bugs wrt premature close of scan
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Fix printout
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle already closed fragments
ndb/src/ndbapi/NdbConnectionScan.cpp:
  Better handling of SCAN_TABREF
ndb/src/ndbapi/NdbScanOperation.cpp:
  Removed some special cases by setting up them instead
ndb/test/src/NDBT_Test.cpp:
  Fix createTable(false)
ndb/tools/select_all.cpp:
  Use full scan as default
2004-11-21 22:15:44 +01:00
unknown
5a7198f54d trx0undo.c, trx0purge.c:
Print a warning to the .err log if the InnoDB history list length is > 20 000 even though purge reaches the list head; this is to track corruption reported on the MySQL mailing list Nov 9, 2004
lock0lock.c:
  Let SHOW INNODB STATUS print the history list length


innobase/lock/lock0lock.c:
  Let SHOW INNODB STATUS print the history list length
innobase/trx/trx0purge.c:
  Print a warning to the .err log if the InnoDB history list length is > 20 000 even though purge reaches the list head; this is to track corruption reported on the MySQL mailing list Nov 9, 2004
innobase/trx/trx0undo.c:
  Print a warning to the .err log if the InnoDB history list length is > 20 000 even though purge reaches the list head; this is to track corruption reported on the MySQL mailing list Nov 9, 2004
2004-11-21 17:38:15 +02:00
unknown
2d0011fce8 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/orca/space/pekka/ndb/version/my41
2004-11-21 11:08:59 +01:00
unknown
3507a52e60 A fix and test case for Bug#6297 "prepared statement, wrong handling
of <parameter> IS NULL":
we must not only set Item::null_value in Item_param, but implement
Item_param::is_null() to work well with IS NULL/IS NOT NULL clauses.


mysql-test/r/ps.result:
  Test case for Bug#6297: test results fixed.
mysql-test/t/ps.test:
  A test case for Bug#6297 "prepared statement, wrong handling of 
  <parameter> IS NULL"
sql/item.h:
  A fix for Bug#6297: we must not only set null_value in Item_param, but
  also implement Item_param::is_null() to work well with  IS NULL/
  IS NOT NULL.
  Item::is_null() commented.
2004-11-21 12:04:27 +03:00
unknown
99d2d10097 mysql.cc:
Tweak some help text.


client/mysql.cc:
  Tweak some help text.
2004-11-19 14:53:40 -06:00
unknown
a3740c887e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg6266
2004-11-19 21:51:37 +03:00
unknown
79997ff7bd Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg6439
2004-11-19 21:38:51 +03:00
unknown
4285cd993d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/cps/mysql/trees/mysql-4.1
2004-11-19 20:21:28 +03:00
unknown
724697f54c Makefile.am, mysqladmin.cc:
reverting linking ndbclisnt to mysqladmin.cc


client/mysqladmin.cc:
  reverting linking ndbclisnt to mysqladmin.cc
client/Makefile.am:
  reverting linking ndbclisnt to mysqladmin.cc
2004-11-19 17:21:27 +00:00
unknown
2d5f9f57ce acinclude.m4:
reverting my last fix


acinclude.m4:
  reverting my last fix
2004-11-19 17:18:46 +00:00
unknown
fc347af535 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-19 17:04:40 +00:00
unknown
d831ff2648 corrected some erroneous size calculations in tup
fixed erroneous error message - set auto increment was done even if create table failed so real error message got lost behind "table not found"
    and simplified code a bit


ndb/src/kernel/vm/Configuration.cpp:
  corrected some erroneous size calculations
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  fixed erroneous error message - set auto increment was done even if create table failed so real error message got lost behind "table not found"
  and simplified code a bit
2004-11-19 16:58:02 +00:00
unknown
7c0504ad17 Manual merge of fix for bug #6439 "from_unixtime() function returns
wrong datetime values for too big argument" from 4.0 tree to 4.1 tree.


mysql-test/r/func_time.result:
  Manual merge
mysql-test/t/func_time.test:
  Manual merge
sql/item_timefunc.cc:
  Manual merge
2004-11-19 19:19:45 +03:00
unknown
13f07cf2cd Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-11-19 16:54:41 +01:00
unknown
79d806693f ndb: do not crash on config mismatch if release compiled
ndb/src/kernel/blocks/ERROR_codes.txt:
  do not crash on config mismatch if release compiled
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  do not crash on config mismatch if release compiled
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  do not crash on config mismatch if release compiled
ndb/test/ndbapi/testDict.cpp:
  do not crash on config mismatch if release compiled
2004-11-19 16:49:17 +01:00
unknown
42fb593782 func_str.result:
This test was moved into func_group.


mysql-test/r/func_str.result:
  This test was moved into func_group.
2004-11-19 19:35:37 +04:00
unknown
7368b14719 Manual merge of fix for bug #6266 "Invalid DATETIME value is not handled
properly" with main tree.


libmysql/libmysql.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
tests/client_test.c:
  Manual merge.
2004-11-19 18:35:36 +03:00
unknown
716b401817 Added --disable-log-bin option to the mysqlbinlog (WL1787)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-11-19 18:35:36 +03:00
unknown
aa6785d7a8 Bug #6658 MAX(column) returns incorrect coercibility
Also, Item_sum_hybrid->charset was removed as redundant,
and switched to use collation.collation instead.


mysql-test/r/func_group.result:
  Bug #6658 MAX(column) returns incorrect coercibility
mysql-test/r/func_str.result:
  Bug #6658 MAX(column) returns incorrect coercibility
mysql-test/t/func_group.test:
  Bug #6658 MAX(column) returns incorrect coercibility
sql/item_func.cc:
  Bug #6658 MAX(column) returns incorrect coercibility
sql/item_sum.cc:
  Bug #6658 MAX(column) returns incorrect coercibility
sql/item_sum.h:
  Bug #6658 MAX(column) returns incorrect coercibility
2004-11-19 19:35:36 +04:00
unknown
77c163c3e3 correct some linking problem 2004-11-19 15:35:35 +00:00
unknown
801a2fa308 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg6439
2004-11-19 17:54:14 +03:00
unknown
7785740f1d Merge tulin@bk-internal.mysql.com:/tmp/my4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
2004-11-19 14:25:59 +00:00
unknown
d375a4c35a Merge
ndb/src/kernel/vm/Configuration.cpp:
  SCCS merged
2004-11-19 14:18:24 +00:00
unknown
dd5322a16a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-19 13:55:55 +00:00
unknown
f85b20aa78 set sizes array sizes correctly in ndb blocks configuration 2004-11-19 13:52:21 +00:00
unknown
bbe0d7ddeb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
2004-11-19 13:25:31 +00:00
unknown
41a681b916 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl2077


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2004-11-19 13:52:26 +01:00
unknown
eed2b972de wl2077: ndb, disable scanning of backup fragments
(temporary)
2004-11-19 13:52:01 +01:00
unknown
f598a8bf69 Merge joreland@bk-internal.mysql.com:/tmp/my4.1-ndb
into mysql.com:/home/jonas/src/wl2077
2004-11-19 13:35:14 +01:00
unknown
74301a38bc Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl2077


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testReadPerf.cpp:
  Auto merged
2004-11-19 13:31:50 +01:00
unknown
b699f969a5 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-11-19 13:26:47 +01:00
unknown
f89b4dced1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-19 12:26:46 +00:00
unknown
a16102a8cc Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-11-19 12:20:57 +01:00
unknown
83f39beea2 fixed error messages for some error codes 2004-11-19 11:19:27 +00:00
unknown
018cac9588 wl2077 - scan optimizations
(recommit in clean clone)


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  removed unused variable
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Always give all nodes in DIGETPRIMREQ
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Allow readcommited-scans to scan backup fragments
ndb/test/ndbapi/testReadPerf.cpp:
  better printous
2004-11-19 11:37:16 +01:00
unknown
9e9715963a Reuse ctype_common.inc instead of retyping
the same queries.
2004-11-19 14:33:55 +04:00
unknown
c3211458ac wl2077 - ndb scan optimizations
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  remove unused variable
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Always supply all nodes
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Enable scanning of backup fragments when read committed
ndb/test/ndbapi/testReadPerf.cpp:
  Better printout
2004-11-19 11:31:20 +01:00
unknown
e136b46250 Incorrect response with partial utf8 index
strings/ctype-mb.c:
  Incorrect response with partial utf8 index:
  Fill the max string with max_sort_char up to res_length bytes.
strings/ctype-uca.c:
  Incorrect response with partial utf8 index.
  Typo fixes for UTF8 collations.
2004-11-19 14:25:25 +04:00