Commit graph

16061 commits

Author SHA1 Message Date
unknown
1860466b7b Delete: mysql-test/mysql_test_run.c 2004-11-23 18:05:13 +05:00
unknown
4039df00d0 Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1bug


sql/mysqld.cc:
  Auto merged
2004-11-23 17:58:46 +05:00
unknown
14769b681c rename event_connect_request to smem_event_connect_request 2004-11-23 17:55:07 +05:00
unknown
2b65c829f6 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-11-23 13:09:28 +01:00
unknown
0b6f218e71 small bug fix for ndb restarter 2004-11-23 09:12:56 +00:00
unknown
f57d5412e4 merged
BitKeeper/etc/logging_ok:
  auto-union
Docs/Support/texi2html:
  Auto merged
client/mysqltest.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/rpl000015.result:
  Auto merged
mysql-test/r/rpl_log_pos.result:
  Auto merged
mysql-test/r/rpl_rotate_logs.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl000015.test:
  Auto merged
mysql-test/t/rpl_log_pos.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
2004-11-22 20:15:48 +01:00
unknown
158d655cc0 "Table file %s was created in MySQL 4.1+" is an error, not a warning 2004-11-22 19:18:35 +01:00
unknown
1dc1ad9c9a Bug#6252 - Duplicate columns in keys should fail
Added check for duplicate column in key
  Added tests and fixed tests which exploit bug


mysql-test/r/delete.result:
  Fix test as it exploited Bug#6252
mysql-test/r/innodb.result:
  Test for Bug#6126
mysql-test/r/key.result:
  Test for Bug#6126/6252
mysql-test/r/type_blob.result:
  Fix test as it exploited Bug#6252
mysql-test/t/delete.test:
  Fix test as it exploited Bug#6252
mysql-test/t/innodb.test:
  Test for Bug#6126
mysql-test/t/key.test:
  Test for Bug#6126/6252
mysql-test/t/type_blob.test:
  Fix test as it exploited Bug#6252
sql/sql_table.cc:
  Bug#6252 - Duplicate columns in keys should fail
    Added check for duplicate column.
2004-11-22 18:07:04 +00:00
unknown
0d37be0291 merged with ul
BitKeeper/etc/logging_ok:
  auto-union
Docs/Support/texi2html:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl000015.test:
  Auto merged
mysql-test/t/rpl_log_pos.test:
  Auto merged
2004-11-22 18:59:17 +01:00
unknown
f74af1b7cb ndb: fix blob performance in long transactions
ndb/include/ndbapi/NdbConnection.hpp:
  fix blob performance in long transactions
ndb/src/ndbapi/NdbConnection.cpp:
  fix blob performance in long transactions
ndb/test/ndbapi/testBlobs.cpp:
  fix blob performance in long transactions
2004-11-22 18:54:06 +01:00
unknown
e65956d067 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-11-22 18:47:23 +01:00
unknown
2934e7ebe6 ft_boolean_search.c:
bug#6705 - (+trunc1* +trunc2*)
fulltext.test, fulltext.result:
  bug#6705


mysql-test/r/fulltext.result:
  bug#6705
mysql-test/t/fulltext.test:
  bug#6705
myisam/ft_boolean_search.c:
  bug#6705 - (+trunc1* +trunc2*)
2004-11-22 18:37:30 +01:00
unknown
12c0a34205 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-11-22 17:12:45 +01:00
unknown
7730590080 - renamed mysqladmin.c -> mysqladmin.cpp to fix the Windows builds
BitKeeper/etc/ignore:
  Added ac_available_languages_fragment to the ignore list
2004-11-22 17:08:06 +01:00
unknown
94c7e14c3b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
2004-11-22 15:53:06 +00:00
unknown
25678df9b1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-22 16:47:23 +01:00
unknown
dc62c0cb6b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-22 15:47:22 +00:00
unknown
a2aa366e6e added --no-defaults to ndb_drop_table in autodiscover test 2004-11-22 15:05:51 +00:00
unknown
1f63a25d97 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl2077


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 15:28:13 +01:00
unknown
223c5d04a0 wl2077 - bug fix for SCAN_TABREF
ndb/src/ndbapi/NdbScanOperation.cpp:
  1 more fix of premature scan closure
2004-11-22 15:27:28 +01:00
unknown
8984d00706 uca-dump.c:
Better variable names in dump.
  Dump tertiary weight in reverse order, to sort upper letters before their lower counterparts.


strings/uca-dump.c:
  Better variable names in dump.
  Dump tertiary weight in reverse order, to sort upper letters before their lower counterparts.
2004-11-22 18:17:41 +04:00
unknown
c8a30eb0c6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-22 14:55:20 +01:00
unknown
01604355ac Bug #6748 heap_rfirst() doesn't work (and never did!)
range for BETWEEN typo fixed


extra/perror.c:
  meaningless error message fixed
heap/hp_rfirst.c:
  Bug #6748 heap_rfirst() doesn't work (and never did!)
mysql-test/r/heap.result:
  Bug #6748 heap_rfirst() doesn't work (and never did!)
mysql-test/r/range.result:
  range for BETWEEN typo fixed
mysql-test/t/heap.test:
  Bug #6748 heap_rfirst() doesn't work (and never did!)
sql/handler.cc:
  Bug #6748 heap_rfirst() doesn't work (and never did!)
sql/sql_select.cc:
  range for BETWEEN typo fixed
2004-11-22 14:53:18 +01:00
unknown
2b4d787727 Merge
ndb/src/ndbapi/NdbScanOperation.cpp:
  SCCS merged
2004-11-22 13:48:19 +00:00
unknown
cfca008544 added force send interface to scan
prepared for using query cache in ndb


ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  added force send interface to scan
ndb/include/ndbapi/NdbResultSet.hpp:
  added force send interface to scan
ndb/include/ndbapi/NdbScanOperation.hpp:
  added force send interface to scan
ndb/src/ndbapi/NdbResultSet.cpp:
  added force send interface to scan
ndb/src/ndbapi/NdbScanOperation.cpp:
  added force send interface to scan
2004-11-22 13:41:46 +00:00
unknown
2b04b042cd Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-11-22 13:58:50 +01:00
unknown
bbbfd3e297 Added NULL value tests for UNIQUE index 2004-11-22 13:58:11 +01:00
unknown
2fef897cbc Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-11-22 14:20:35 +02:00
unknown
9639bc214f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg6462
2004-11-22 14:21:49 +03:00
unknown
e112166f00 Backport of fix making myisam test results repeatable 2004-11-22 14:17:04 +03:00
unknown
5b2d1a65b2 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin


ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
ndb/src/mgmclient/main.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  Auto merged
ndb/tools/select_all.cpp:
  Auto merged
ndb/tools/waiter.cpp:
  Auto merged
2004-11-22 11:07:52 +00:00
unknown
6c81b518c0 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-11-22 12:02:32 +01:00
unknown
6aebd056cf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-22 10:56:20 +00:00
unknown
404b152485 removed unused variables
assigned "localhost" as default connectstring
    added a disconnect() first in connect()
    removed double implementation of connect code, use connect() in NdbRestarter
    removed extra "host=" in connectstring


ndb/include/mgmapi/mgmapi.h:
  removed wrong comment
ndb/test/include/NdbRestarter.hpp:
  removed unused variables
ndb/test/src/NdbBackup.cpp:
  removed double implementation of connect code, use connect() in NdbRestarter
  removed extra "host=" in connectstring
ndb/test/src/NdbRestarter.cpp:
  removed unused variables
  assigned "localhost" as default connectstring
  added a disconnect() first in connect()
2004-11-22 10:47:59 +00:00
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