Commit graph

15012 commits

Author SHA1 Message Date
unknown
838af107a3 bug#5736, subqueries and not in
and testcases


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  bug#5736, subqueries and not in
sql/ha_ndbcluster.cc:
  bug#5736, subqueries and not in
2004-10-06 13:18:55 +00:00
unknown
7d583c5834 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bf


sql/field.cc:
  Auto merged
2004-10-05 21:24:08 +04:00
unknown
ef92a390b1 Fixed small bug in handling of pre-4.1 TIMESTAMP columns which was
introduced during implementation of TIMESTAMP columns, which are able 
to store NULLs (Unfortunately it is impossible to write test case for
this. Kudos to Holyfoot for noticing it!)


sql/field.cc:
  Field_timestamp::get_auto_set_type(): To preserve compatibility 
  with pre-4.1 we have to handle TIMESTAMP_OLD_FIELD columns properly. 
  (It is ok to handle them as TIMESTAMP_DNUN_FIELD since value of first
   such column should be set to current timestamp on both INSERT and UPDATE
   operations, and we don't call this method for rest of them).
2004-10-05 21:23:38 +04:00
unknown
28b0e7fe1c Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5730
2004-10-05 21:29:40 +05:00
unknown
70a3abf259 Bug #5832 SELECT doesn't return records in some cases 2004-10-05 21:22:14 +05:00
unknown
48ff8f4ddb dict0mem.h:
Fix typos in previous push


innobase/include/dict0mem.h:
  Fix typos in previous push
2004-10-05 19:22:13 +03:00
unknown
3e0df1999a Merge heikki@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2004-10-05 19:22:12 +03:00
unknown
4390cd3484 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-05 16:22:11 +00:00
unknown
7121d37498 more and better arbitration warnings for cluster config 2004-10-05 15:18:32 +00:00
unknown
0b8c68ce5c ha_innodb.cc:
Raise maximum column prefix len to 767 bytes, so that MySQL can create a column prefix index of 255 UTF-8 characters (each takes 3 bytes at the maximum); add comments about why innobase_get_at_most_n_mbchars() works ok
dict0mem.h:
  Raise maximum column prefix len to 767 bytes, so that MySQL can create a column prefix index of 255 UTF-8 characters (each takes 3 bytes at the maximum)
row0mysql.c:
  If MySQL tries to create a column prefix index longer that 255 UTF-8 characters, give an error, and drop the table from the InnoDB internal data dictionary. MySQL did not drop the table there in its own error handling.


innobase/row/row0mysql.c:
  If MySQL tries to create a column prefix index longer that 255 UTF-8 characters, give an error, and drop the table from the InnoDB internal data dictionary. MySQL did not drop the table there in its own error handling.
innobase/include/dict0mem.h:
  Raise maximum column prefix len to 767 bytes, so that MySQL can create a column prefix index of 255 UTF-8 characters (each takes 3 bytes at the maximum)
sql/ha_innodb.cc:
  Raise maximum column prefix len to 767 bytes, so that MySQL can create a column prefix index of 255 UTF-8 characters (each takes 3 bytes at the maximum); add comments about why innobase_get_at_most_n_mbchars() works ok
2004-10-05 17:08:22 +03:00
unknown
fdbc804c32 Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-10-05 16:02:10 +03:00
unknown
08e56fae98 Fix for bug #5555: "GROUP BY enum_field" returns incorrect results 2004-10-05 17:02:09 +04:00
unknown
15c2ecb543 Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-10-05 13:22:14 +03:00
unknown
ab5c7a9e0e moved code out of DBUG_ASSERT 2004-10-05 10:04:09 +00:00
unknown
2f3212910f last try didnt work 2004-10-05 07:48:51 +00:00
unknown
9d2c186c51 bumped up version to 3.5.2
removed staus flag
2004-10-05 06:49:11 +00:00
unknown
ec735ea8f7 InnoDB: Fix ALTER TABLE t DISCARD TABLESPACE (Bug #5851)
innobase/include/ut0mem.h:
  Improve documentation of ut_strlenq(), ut_strcpyq() and ut_memcpyq()
innobase/include/ut0mem.ic:
  Improve documentation of ut_strlenq()
innobase/row/row0mysql.c:
  row_discard_tablespace_for_mysql(): Add quotes around table_name
  in DISCARD_TABLESPACE_PROC (Bug #5851)
innobase/ut/ut0mem.c:
  Improve documentation of ut_strcpyq() and ut_memcpyq()
2004-10-04 20:38:23 +03:00
unknown
ef40ba04e8 lock0lock.c:
Fix compiler warning


innobase/lock/lock0lock.c:
  Fix compiler warning
2004-10-04 19:48:41 +03:00
unknown
d36e601928 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-ryan
2004-10-04 20:46:51 +04:00
unknown
f4bd4e6017 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2004-10-04 18:14:36 +02:00
unknown
5b47c974d8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-ryan
2004-10-04 20:13:16 +04:00
unknown
ae14bc779e Comments to the single-select optimization algorithm. 2004-10-04 18:58:06 +04:00
unknown
0afb328e36 corrected merge error rgarding NDB_CONNECTSTRING 2004-10-04 13:53:36 +00:00
unknown
1c0213eb3e added debug printouts in ndbapi 2004-10-04 13:26:33 +00:00
unknown
6ed4888cb8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-ryan
2004-10-04 17:16:49 +04:00
unknown
76c9e10ebd Made TIMESTAMP NULL columns without explicit DEFAULT value to be always
treated as DEFAULT NULL columns (independently from their position in
table).

(still to be discussed with Monty, Brian, Trudy et al. before push)


mysql-test/r/type_timestamp.result:
  Update test after making TIMESTAMP NULL columns without explicit 
  DEFAULT value to be always treated as DEFAULT NULL columns 
  (independently from their position in table).
mysql-test/t/type_timestamp.test:
  Update test after making TIMESTAMP NULL columns without explicit 
  DEFAULT value to be always treated as DEFAULT NULL columns 
  (independently from their position in table).
sql/sql_parse.cc:
  add_field_to_list(): made TIMESTAMP NULL columns without explicit 
  DEFAULT value to be always treated as DEFAULT NULL columns (independently
  from their position in table). This also simplifies code a bit.
2004-10-04 17:13:31 +04:00
unknown
8f9e1eb504 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge


sql/ha_ndbcluster.cc:
  Auto merged
2004-10-04 12:52:12 +00:00
unknown
4d28883872 typo 2004-10-04 12:40:46 +00:00
unknown
035d92f4b6 Merge
sql/sql_show.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  SCCS merged
2004-10-04 12:36:25 +00:00
unknown
ab600d1646 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-04 12:27:43 +00:00
unknown
5e458aac1e bug #5872, transactions should only be restarted with transaction.on flag off if execute_commit has been performed
added testcase for this
use force send for all executes


mysql-test/r/ndb_blob.result:
  added testcase for alter table of blob from ndb to myisam
mysql-test/t/ndb_blob.test:
  added testcase for alter table of blob from ndb to myisam
sql/ha_ndbcluster.cc:
  bug #5872, transactions should only be restarted with transaction.on flag off if execute_commit has been performed
  use force send for all executes
2004-10-04 12:26:26 +00:00
unknown
48bf825902 A couple of typos fixed.
sql/item.cc:
  A typo fixed in a comment, which is probably not valid any more
sql/sql_class.h:
  no such class Ttem_subselect.
2004-10-04 14:14:30 +04:00
unknown
1d060ec093 To allow compilation on Tru64, the MySQL code should not mess
with the system-reserved (and system-defined) '_REENTRANT' 
CPP identifier.
Especially, it must not be "undefine"d, because the Tru64 compiler
needs it if threads are enabled.


include/my_pthread.h:
  On Tru64, '_REENTRANT' is set by the compiler when the "-pthread" 
  option is given, and it must be set when the system's 'pthread.h' is 
  included (or else a '#error' is activated).
  So it must not be undef'ed, and it should not be def'ed either, as it
  is a system-reserved CPP identifier with which we should not mess
  anyway - it is risky to use it!
  Build on all platforms was checked privately, change caused no errors!
2004-10-04 11:45:07 +02:00
unknown
599a784218 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
2004-10-04 06:59:12 +00:00
unknown
77fd668ef4 addes auto pointer class for using with my_ functions
switch to using my_ for heap allocations


ndb/include/util/NdbAutoPtr.hpp:
  addes auto pointer class for using with my_ functions
ndb/src/mgmclient/CommandInterpreter.cpp:
  switch to using my_ for heap allocations
2004-10-04 06:58:33 +00:00
unknown
b3b26c05dc sql_show.cc:
ctype_recode does not hang anymore. Small fix after Marko's change.


sql/sql_show.cc:
  ctype_recode does not hang anymore. Small fix after Marko's change.
2004-10-04 11:50:31 +05:00
unknown
15d474b20c Merge
mysql-test/mysql-test-run.sh:
  SCCS merged
2004-10-04 00:34:34 +00:00
unknown
9752b3154c use new function stop_ndbcluster 2004-10-04 00:25:04 +00:00
unknown
de3a7d1107 Merge
mysql-test/mysql-test-run.sh:
  SCCS merged
2004-10-04 00:15:32 +00:00
unknown
2ed312cef1 better cleanup of cluster processes with test failure 2004-10-04 00:10:33 +00:00
unknown
606d13eb26 make sure old mysqld's are shutdown 2004-10-03 23:41:15 +00:00
unknown
e2ca20ca9a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-03 23:23:13 +00:00
unknown
8ab3ebe2ca merge error 2004-10-03 23:20:05 +00:00
unknown
1f16f2db95 merge error 2004-10-03 22:27:04 +00:00
unknown
ec81fca2d0 Merge
BitKeeper/etc/logging_ok:
  auto-union
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  SCCS merged
sql/ha_ndbcluster.cc:
  SCCS merged
2004-10-03 21:39:04 +00:00
unknown
4defd5d544 mysqldump.c:
typos in comment.


client/mysqldump.c:
  typos in comment.
2004-10-02 20:16:14 -05:00
unknown
52d5c01d87 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-01 22:15:05 +00:00
unknown
4b6fbbc7b4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


sql/ha_ndbcluster.cc:
  Auto merged
2004-10-01 21:35:50 +00:00
unknown
61ef4d2923 Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.1
2004-10-01 14:53:52 -05:00
unknown
f0440c27e1 grant.test, grant.result, sql_acl.cc:
BUG #5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass.


sql/sql_acl.cc:
  BUG #5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass.
mysql-test/r/grant.result:
  BUG #5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass.
mysql-test/t/grant.test:
  BUG #5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass.
2004-10-01 14:48:48 -05:00