Commit graph

30753 commits

Author SHA1 Message Date
unknown
ed5ac749b9 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2006-05-17 20:56:52 -07:00
unknown
087be9ba2d Fixed bug #19816.
This bug was introduced when the patch resolving the
performance problem 17164 was applied. As a result
of that modification the not_null_tables attributes
were calculated incorrectly for constant OR conditions.
This triggered invalid conversion of outer joins into
inner joins.


mysql-test/r/join_outer.result:
  Added a test case for bug #19816.
mysql-test/t/join_outer.test:
  Added a test case for bug #19816.
2006-05-17 20:48:48 -07:00
unknown
1c6beaee06 Fixed bug#19077: A nested materialized derived table is used before being populated.
The convert_constant_item() function converts constant items to ints on
prepare phase to optimize execution speed. In this case it tries to evaluate
subselect which contains a derived table and is contained in a derived table. 
All derived tables are filled only after all derived tables are prepared.
So evaluation of subselect with derived table at the prepare phase will
return a wrong result.

A new flag with_subselect is added to the Item class. It indicates that
expression which this item represents is a subselect or contains a subselect.
It is set to 0 by default. It is set to 1 in the Item_subselect constructor
for subselects.
For Item_func and Item_cond derived classes it is set after fixing any argument
in Item_func::fix_fields() and Item_cond::fix_fields accordingly.
The convert_constant_item() function now doesn't convert a constant item
if the with_subselect flag set in it. 


mysql-test/t/view.test:
  Added test case for bug#19077: A nested materialized derived table is used before being populated.
mysql-test/t/subselect.test:
  Added test case for bug#19077: A nested materialized derived table is used before being populated.
mysql-test/r/view.result:
  Added test case for bug#19077: A nested materialized derived table is used before being populated.
mysql-test/r/subselect.result:
  Added test case for bug#19077: A nested materialized derived table is used before being populated.
sql/item_subselect.cc:
  Fixed bug#19077: A nested materialized derived table is used before being populated.
  The Item_subselect class constructor sets new with_subselect flag to 1.
sql/item_func.cc:
  Fixed bug#19077: A nested materialized derived table is used before being populated.
  
  The Item_func::fix_fields() sets new with_subselect flag from with_subselect flags of its arguments.
sql/item_cmpfunc.cc:
  Fixed bug#19077: A nested materialized derived table is used before being populated.
  The convert_constant_item() function now doesn't convert a constant item
  with the with_subselect flag set.
  The Item_cond::fix_fields() sets new with_subselect flag from with_subselect flags of its arguments.
sql/item.cc:
  Fixed bug#19077: A nested materialized derived table is used before being populated.
  Set new with_subselect flag to default value - 0 in the Item constructor.
sql/item.h:
  Fixed bug#19077: A nested materialized derived table is used before being populated.
  A new flag with_subselect is added to the Item class. It indicates that
  expression which this item represents is a subselect or contains a subselect.
  It is set to 0 by default.
2006-05-18 00:55:28 +04:00
unknown
ce288ebc2b Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new


BitKeeper/deleted/.del-disabled.def:
  Auto merged
2006-05-17 22:48:36 +02:00
unknown
7a98803060 Merge mysql.com:/M50/bug19040-5.0 into mysql.com:/M50/mysql-5.0 2006-05-17 20:41:01 +02:00
unknown
8d4cbe39a6 Include "config.h" (if it exists) in all yaSSL files via their "runtime.hpp".
Fixes bug#19040 "yaSSL does not compile on AIX".


extra/yassl/taocrypt/include/runtime.hpp:
  Include "config.h" (if it exists) in all yaSSL files. This is needed to ensure the same 
  configure settings are used for yaSSL as for the other modules linked together.
  Example: the settings for "large file" on AIX.
  Fixes bug#19040 "yaSSL does not compile on AIX".
2006-05-17 19:08:18 +02:00
unknown
abc6e665e1 Merge mysql.com:/home/hf/work/mysql-4.1.clean
into mysql.com:/home/hf/work/mysql-5.0.mrg


mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/wait_timeout.test:
  Auto merged
2006-05-17 18:01:05 +05:00
unknown
5fb23aa324 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug18818/my50-bug18818
2006-05-17 14:51:50 +02:00
unknown
0138267b45 Merge bk-internal:/home/bk/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/bug18818/my41-bug18818
2006-05-17 14:14:54 +02:00
unknown
4e6efa1023 ndb - bug#14509 [related] re-do auto-incr error handling
ndb/include/ndbapi/Ndb.hpp:
  make auto-incr methods return int 0/-1
ndb/src/ndbapi/Ndb.cpp:
  make auto-incr methods return int 0/-1
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  make auto-incr methods return int 0/-1
ndb/test/ndbapi/testDict.cpp:
  make auto-incr methods return int 0/-1
ndb/tools/restore/consumer_restore.cpp:
  make auto-incr methods return int 0/-1
sql/ha_ndbcluster.cc:
  make auto-incr methods return int 0/-1
2006-05-17 12:40:10 +02:00
unknown
76408cc8de Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  production.mysql.com:/usersnfs/tulin/mysql-4.1
2006-05-17 09:34:55 +02:00
unknown
f1efd0883d Fixed bug #19573.
The select statement that specified a view could be
slightly changed when the view was saved in a frm file.
In particular references to an alias name in the HAVING
clause could be substituted for the expression named by
this alias.
This could result in an error message for a query of
the form SELECT * FROM <view>. Yet no such message
appeared when executing the query specifying the view.


mysql-test/r/having.result:
  Adjusted results after fixing bug #19573.
mysql-test/r/view.result:
  Added a test case for bug #19573.
mysql-test/t/view.test:
  Added a test case for bug #19573.
2006-05-16 22:19:44 -07:00
unknown
2cd08261d4 Merge tulin@production.mysql.com:mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-05-17 00:33:12 +02:00
unknown
a35a5cd335 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-05-17 00:28:33 +02:00
unknown
7e3eddd9a1 Merge tulin@production.mysql.com:mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-05-17 00:25:51 +02:00
unknown
a7980fb604 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-05-17 00:23:55 +02:00
unknown
6ee68c82fb Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/tools/waiter.cpp:
  Auto merged
2006-05-17 00:23:40 +02:00
unknown
a2f26487ff ndb: added some missing error codes to mgmapi
ndb: ndb_waiter disconnect/reconnect on get status error


ndb/src/mgmapi/mgmapi.cpp:
  ndb: added some missing error codes to mgmapi
ndb/tools/waiter.cpp:
  ndb: ndb_waiter disconnect/reconnect on get status error
2006-05-17 00:22:43 +02:00
unknown
afb3f432b0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  production.mysql.com:/usersnfs/tulin/mysql-4.1
2006-05-16 21:46:52 +02:00
unknown
d1ccab4129 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  production.mysql.com:/usersnfs/tulin/mysql-5.0
2006-05-16 21:46:00 +02:00
unknown
59b41621c3 Merge mysql.com:/data0/mysqldev/my/bk_saved/mysql-4.1.18-release
into  mysql.com:/data0/mysqldev/my/mysql-4.1


mysql-test/t/disabled.def:
  SCCS merged
2006-05-16 19:25:10 +02:00
unknown
a514a26cd0 Merge mysql.com:/usr_rh9/home/elkin.rh9/4.1
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0


mysql-test/t/rpl_temporary.test:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
ndb/test/ndbapi/Makefile.am:
  Auto merged
2006-05-16 19:33:24 +03:00
unknown
ab9eadf215 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
2006-05-16 18:26:25 +04:00
unknown
864bd28331 ndb - bug#14509 [related] fix a return value
ndb/src/ndbapi/Ndb.cpp:
  fix a return value
2006-05-16 16:17:30 +02:00
unknown
32d954f3e6 BUG#14157: utf8 encoding in binlog without set character_set_client: e.g DROP temporary
fixing encoding example because of table names can not be in koi8r 
on some platforms.


mysql-test/t/rpl_temporary.test:
  koi8r encoding to name tables is changed for latin1 for the former does not work
  on some platforms.
  The effect of the test remains: a test table is named to have multibyte utf8 representation,
  which is the essence of the bug.
2006-05-16 16:50:05 +03:00
unknown
7f20ecc7ec BUG#17001 - Table and server crash on ALTER TABLE
frm and data files for tables created by earlier MySQL
versions becomes out of sync after certain ALTER TABLE statements:
- One that changes column default value;
- One that changes table comment;
- One that changes table password.

As a result one can expirience either server crash or data corruption/loss.

This fix ensures that running ALTER TABLE on tables created by earlier
MySQL versions recreates data files.


sql/sql_table.cc:
  Ensure that running ALTER TABLE on tables created by earlier
  MySQL versions recreates data files.
2006-05-16 18:37:23 +05:00
unknown
31169b8027 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug19618
2006-05-16 15:34:23 +04:00
unknown
0219f8b003 ndb - bug#14509 [related] setAutoIncrement: add error handling
ndb/include/ndbapi/Ndb.hpp:
  setAutoIncrement: add error handling
ndb/src/ndbapi/Ndb.cpp:
  setAutoIncrement: add error handling
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  setAutoIncrement: add error handling
ndb/tools/restore/consumer_restore.cpp:
  setAutoIncrement: add error handling
sql/ha_ndbcluster.cc:
  setAutoIncrement: add error handling
2006-05-16 12:58:41 +02:00
unknown
5aabf1a9af Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-05-16 12:33:24 +02:00
unknown
c62cf51859 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-05-16 12:32:36 +02:00
unknown
bb03e2b7e3 Merge mysql.com:/opt/local/work/mysql-5.0-root
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
2006-05-16 13:57:43 +04:00
unknown
f5afd23358 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
2006-05-16 11:50:13 +02:00
unknown
976deafba6 Bug #18591 Repeated "show" and "all status" calls to ndb_mgm causes mgmd to crash
- not having lock can cause "block number list" to become corrupt => crash
- also may result in 2 threads receiving same block no => possble cause of
Bug #13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd


ndb/src/mgmsrv/MgmtSrvr.cpp:
  ndb: added missing lock of mutex
2006-05-16 11:47:33 +02:00
unknown
3b168d1d48 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug19618
2006-05-16 13:46:30 +04:00
unknown
545ce85795 BUG#19618: post-review fixes: better comments 2006-05-16 13:39:03 +04:00
unknown
9f46b3b53e Merge jonas@perch:src/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


support-files/mysql.spec.sh:
  Auto merged
2006-05-16 11:31:10 +02:00
unknown
c1a2870988 Merge jonas@perch:src/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


support-files/mysql.spec.sh:
  Auto merged
2006-05-16 11:05:50 +02:00
unknown
6513fda87e Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/data0/knielsen/tmp-5.0
2006-05-16 10:34:12 +02:00
unknown
808f77f6b0 Test used a charset not available on many platforms 2006-05-16 10:01:07 +02:00
unknown
bccff08cba Fixed result file (rpl_temporary)
mysql-test/r/rpl_temporary.result:
  Fixed result file
2006-05-16 09:26:57 +02:00
unknown
dd8c47efa8 Merge mysql.com:/opt/local/work/mysql-5.0-root
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
2006-05-16 03:44:50 +04:00
unknown
29bf657581 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/data0/knielsen/tmp-5.0
2006-05-15 23:21:37 +02:00
unknown
bb1c6bf6e4 Merge mysql.com:/users/lthalmann/bkroot/andrei-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-rpl
2006-05-15 20:49:14 +02:00
unknown
326ebe4c5b correction of merge 2006-05-15 20:29:50 +02:00
unknown
167d54cd63 Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix
into  mysql.com:/usr/local/mysql/tmp-5.0


include/my_sys.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
2006-05-15 19:57:12 +02:00
unknown
9287933ac7 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  dl145j.mysql.com:/tmp/andrei/5.0


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
2006-05-15 19:57:11 +02:00
unknown
f3be3b6a91 Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix2
into  mysql.com:/usr/local/mysql/tmp-5.0
2006-05-15 19:57:11 +02:00
unknown
798e910bad After-merge fixes; some function signatures changed from Item * to Item **.
sql/item.cc:
  After-merge fixes.
sql/item.h:
  After-merge fixes.
sql/item_func.cc:
  After-merge fixes.
sql/item_func.h:
  After-merge fixes.
sql/sp_head.cc:
  After-merge fixes.
2006-05-15 19:57:10 +02:00
unknown
438131dde2 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/local/mysql/tmp-5.0


sql/sp_head.cc:
  Manual merge.
2006-05-15 19:57:09 +02:00
unknown
30c03e202d Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss547
2006-05-15 21:57:08 +04:00