Commit graph

20927 commits

Author SHA1 Message Date
unknown
e64fe38a39 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/log.cc:
  Auto merged
2005-03-03 17:29:22 +01:00
unknown
65c830aecb Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-03 19:21:26 +03:00
unknown
c7fdbffa0d Fix for bug #8164: subquery with INFORMATION_SCHEMA.COLUMNS, 100 % CPU 2005-03-03 19:20:16 +03:00
unknown
b33746fda3 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports


ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
2005-03-04 03:11:44 +11:00
unknown
560968258f srv0start.c:
Work around the AIX 5.1 security patch ML7 problem in errno when it should be EEXIST


innobase/srv/srv0start.c:
  Work around the AIX 5.1 security patch ML7 problem in errno when it should be EEXIST
2005-03-03 18:00:34 +02:00
unknown
be63bf616b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-03-03 16:52:03 +01:00
unknown
f3d52f8c8c Merge
innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0start.c:
  SCCS merged
2005-03-03 17:50:04 +02:00
unknown
afc8527360 srv0start.c:
Work around the AIX 5.1 ML7 patch problem in errno at a higher level, in srv0start.c
os0file.c:
  Revert the AIX patch here


innobase/os/os0file.c:
  Revert the AIX patch here
innobase/srv/srv0start.c:
  Work around the AIX 5.1 ML7 patch problem in errno at a higher level, in srv0start.c
2005-03-03 17:46:56 +02:00
unknown
4e4fbf4839 Merge hundin.mysql.fi:/home/heikki/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.1


innobase/os/os0file.c:
  Auto merged
2005-03-03 17:26:12 +02:00
unknown
969be90f71 os0file.c:
AIX 5.1 after security patch ML7 seems to contain a bug that instead of EEXIST it sets errno to 0 if a file creation fails because the file already exists. Work around that bug by interpreting errno 0 in AIX as EEXIST.


innobase/os/os0file.c:
  AIX 5.1 after security patch ML7 seems to contain a bug that instead of EEXIST it sets errno to 0 if a file creation fails because the file already exists. Work around that bug by interpreting errno 0 in AIX as EEXIST.
2005-03-03 17:20:05 +02:00
unknown
5a9efeedf1 Ensure that '*.disabled' files are truly optional, so that their non-existence
will not cause "make" to fail.


mysql-test/Makefile.am:
  Files of the '*.disabled' pattern may exist, but need not.
  So it is important to ignore command failures arising from this pattern not finding
  any matches - whereas files of the other types must be present.
2005-03-03 16:01:39 +01:00
unknown
2860a7723e Fixes for bug#8115 "Server Crash with prepared statement"
and bug#8849 "problem with insert statement with table alias's": 
make equality propagation work in stored procedures and prepared 
statements.
Equality propagation can change AND/OR structure of ON expressions,
so the fix is to provide each execution of PS/SP with it's own
copy of AND/OR tree. We have been doing that already for WHERE clauses,
now ON clauses are also copied.


mysql-test/r/ps.result:
  Bug#8115: test results fixed.
mysql-test/r/sp.result:
  Bug#8849: test results fixed.
mysql-test/t/ps.test:
  A test case for Bug#8115 "Server Crash with prepared statement".
mysql-test/t/sp.test:
  A test case for Bug#8849 "problem with insert statement with table 
  alias's".
sql/item_cmpfunc.cc:
  Comment a parse tree transformation.
sql/item_cmpfunc.h:
  Comment how Item_equal works with PS/SP.
sql/mysql_priv.h:
  Add declaration for init_stmt_after_parse.
sql/sp_head.cc:
  Call init_stmt_after_parse in restore_lex(), which is used to
  grab TABLE_LIST and SELECT_LEX list of a parsed substatement of
  stored procedure. This is a necessary post-init step which 
  must be done for any statement which can be executed many times.
sql/sql_prepare.cc:
  Implement init_stmt_after_parse() which prepares AND/OR
  structure of all ON expressions and WHERE clauses of a statement
  for copying.
sql/sql_select.cc:
  Implementation of equality propagation inspected with regard to 
  prepared statements and stored procedures. We now restore
  AND/OR structure of every ON expression in addition to AND/OR
  structure of WHERE clauses when reexecuting a PS/SP.
sql/table.h:
  Add declaration for TABLE::prep_on_expr.
2005-03-03 17:38:59 +03:00
unknown
66d2d13a8e Fix for bug#8740: Server crash at start on Solaris 9 (64 bit) 2005-03-03 17:38:58 +03:00
unknown
85f94ce992 ndb - bug#8876 third and final solution
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  lqh to forward abort within ng
2005-03-03 12:45:49 +01:00
unknown
43668c53e0 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-03-03 12:45:05 +01:00
unknown
a455733cf7 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2005-03-03 12:43:01 +01:00
unknown
ad5174af41 Bugs: #8063: make test mysqldump [ fail ]
See mysqldump.test diff for more details
2005-03-03 15:43:00 +04:00
unknown
da4ea4fa23 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0
2005-03-03 15:38:00 +04:00
unknown
0c88d48d50 After merge fix.
sql/sql_lex.cc:
  No need to change options here.
2005-03-03 15:37:14 +04:00
unknown
5841c6309a Prevent a collision with the system's '#define errno ...' by guarding the variable declaration.
include/my_sys.h:
  There are platforms which use '#define errno ...' and then cause a collision with
  'extern int errno;', one example is OpenBSD.
  Rather than treat them explicitly by the 'HAVE_ERRNO_AS_DEFINE', we can check for these
  by using '#ifndef errno'.
2005-03-03 12:35:39 +01:00
unknown
b6a9dc96c9 ndb - bug#8876
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge error?
2005-03-03 11:38:50 +01:00
unknown
0abf1f6d3f manual merge 2005-03-03 14:29:37 +04:00
unknown
d6c9c19412 Bug#8840 Empty string comparison and character set 'cp1250'
Secondary weight out of bounds was picked up in mistake when
the string is empty, instead of returning 0.
2005-03-03 14:15:37 +04:00
unknown
78c09205fc Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-03-03 10:51:20 +01:00
unknown
77eff470ce Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-xa
2005-03-03 10:51:19 +01:00
unknown
f0005562e1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-03-03 09:55:04 +01:00
unknown
b79de1d129 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-03-03 09:52:25 +01:00
unknown
17ff0a138a Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/data0/mysqldev/my/mysql-5.0-merge


BitKeeper/deleted/.del-federated.disabled~a5703a3321e4108:
  Auto merged
2005-03-03 09:50:06 +01:00
unknown
793699f330 Add ndb/src/mgmapi/mgmapi_internal.h
move internal mgmapi functions into it.

should also fix AIX build problem.


ndb/include/mgmapi/mgmapi.h:
  Move ndb_mgm_convert_to_transporter to mgmapi_internal.h
  
  Should fix AIX build problem
ndb/include/mgmapi/mgmapi_debug.h:
  Move ndb_mgm_(get|set)_connection_int_parameter to mgmapi_internal.h
ndb/src/common/transporter/Makefile.am:
  Add ndb/src/mgmapi to include for common/transporter (TransporterRegistry requires the use of mgmapi_internal.h)
ndb/src/common/transporter/TransporterRegistry.cpp:
  Use mgmapi_internal.h
ndb/src/mgmapi/mgmapi.cpp:
  some functions defined in mgmapi_internal.h
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  use functions from mgmapi_internal.h
2005-03-03 19:49:58 +11:00
unknown
7cd4805654 committing this deletion of federated.disabled, which was already committed in another tree apparently; just to make bk happy.
BitKeeper/deleted/.del-federated.disabled~a5703a3321e4108:
  Delete: mysql-test/t/federated.disabled
2005-03-03 09:49:34 +01:00
unknown
37306fb125 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-03-03 09:46:13 +01:00
unknown
a8e2957382 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-xa
2005-03-03 09:37:07 +01:00
unknown
7ba75eb8ba Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-03-03 08:52:44 +01:00
unknown
89f616a66b Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
ndb/include/kernel/signaldata/CreateIndx.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-03-03 08:50:37 +01:00
unknown
763ce399f7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2005-03-03 08:38:10 +01:00
unknown
e4d12c5ace Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-03-03 08:35:55 +01:00
unknown
f88269794e Avoid calls to my_seek() and my_tell() on log files so that
non-seekable files like FIFOs can be used for logs other
than the binlog. (Bug #8271)


include/my_sys.h:
  Add APPEND_CACHE cache type
mysys/mf_iocache.c:
  Handle APPEND_CACHE cache type to avoid calling my_seek() and my_tell()
  on logs opened O_APPEND that we never read from (so they can be a
  non-seekable file like a FIFO).
sql/mysqld.cc:
  Use APPEND_CACHE for log files not set to SEQ_READ_APPEND.
2005-03-02 18:14:58 -08:00
unknown
69a1579af0 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bugs
2005-03-03 05:04:00 +03:00
unknown
d88c56a637 Comments added 2005-03-03 05:03:21 +03:00
unknown
c9b4f8c3d7 Fix bug in checking of table-specific grats that caused IP/NETMASK
hostnames to not be matched correctly. (Bug #3309)


sql/sql_acl.cc:
  Use an acl_host_or_ip in the GRANT_TABLE struct instead of storing the host
  itself, and use compare_hostname() in testing it. This adds support for IP
  addresses with netmasks to table-specific grants, and results in simplified
  code by making use of compare_hostname() in more places.
mysql-test/r/grant2.result:
  Add new results
mysql-test/t/grant2.test:
  Add new regression test
2005-03-02 16:30:24 -08:00
unknown
41624daa4c WL# 2094, removed federated 'disable' file.
BitKeeper/deleted/.del-federated.disabled~a5703a3321e4108:
  Delete: mysql-test/t/federated.disabled
2005-03-02 16:14:46 -08:00
unknown
92014782ac ndb - bug#8876
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  typo - use of global var, spotted by mikael
2005-03-03 01:07:03 +01:00
unknown
564a7d7cd8 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/devel/im-fix-review
2005-03-02 23:18:53 +03:00
unknown
6990e80de8 fix to avoid relinking on each "make"
server-tools/instance-manager/Makefile.am:
  "Makefile" target removed
2005-03-02 23:16:32 +03:00
unknown
968af1f3dd Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean


sql/item_func.cc:
  Auto merged
2005-03-02 10:23:07 -08:00
unknown
436e2f8308 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-03-02 18:05:57 +01:00
unknown
a766c7bf6f Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-merge
into krsna.patg.net:/home/patg/mysql-5.0
2005-03-02 09:01:07 -08:00
unknown
5a5fc3433c Last part of fix for BUG#7998 "Replication should be more clever about when to replicate RELEASE_LOCK()" + fixes after merge
mysql-test/r/drop_temp_table.result:
  result update
mysql-test/r/mix_innodb_myisam_binlog.result:
  result update
mysql-test/r/rpl000001.result:
  result update
mysql-test/r/rpl_change_master.result:
  result update
mysql-test/r/rpl_deadlock.result:
  result update (merge)
mysql-test/t/rpl000001.test:
  can't rely on GET_LOCK() to do slave synchro (use table lock instead)
mysql-test/t/rpl_change_master.test:
  changing the test as we can't use GET_LOCK() for slave synchro
mysql-test/t/rpl_deadlock.test:
  update (merge) binlog positions
mysql-test/t/rpl_get_lock.test:
  comment
2005-03-02 17:52:38 +01:00
unknown
5699934fe0 Fixed BUG#8762: Stored Procedures: Inconsistent behavior
of DROP PROCEDURE IF EXISTS statement.


mysql-test/r/sp.result:
  New test case for BUG#8757
mysql-test/t/sp.test:
  New test case for BUG#8757
sql/sp.cc:
  Don't zap lex->found_semicolon. (For compound statements)
2005-03-02 17:25:58 +01:00
unknown
90eed6566b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1
2005-03-02 20:04:38 +04:00