Commit graph

46798 commits

Author SHA1 Message Date
unknown
ea263c4a4d Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
2007-05-21 20:49:24 +02:00
unknown
3f946fac39 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-05-21 20:34:42 +02:00
unknown
25da4154ce Prevent the failing "jp" suite from causing havoc in release builds (28563).
Makefile.am:
  This is *no* fix, it is just to avoid the failure of the "jp" test suite 
  (28563 is the number of the bug) from causing havoc in release builds.
2007-05-21 20:24:34 +02:00
unknown
c367385f7f BUG#25659 - memory leak via "plugins" test
- Added suppressions for dlopen to make plugin test pass.
- Do not pass empty string to mysqld, since my_getopt is
  not capable to handle it.
- Re-enabled trailing UNINSTALL PLUGIN statement of plugin.test.

The memory leak described in the bug report happens in libdl, not
in mysqld. On some valgrind installations this error is suppressed
by default, no idea why it isn't suppressed on pb-valgrind.

<observation>
If library remains open after thread has finished, and is closed by
another thread, we get memory leak. But in case library is opened and
closed by the same thread no leak occurs.
</observation>


mysql-test/lib/mtr_io.pl:
  Do not pass empty string since my_getopt is not capable to handle it.
  This is required to make plugin.test work on platforms where
  ha_example is not compiled.
mysql-test/r/plugin.result:
  Updated test result.
mysql-test/t/plugin.test:
  Re-enabled UNINSTALL PLUGIN statement. It is a good idea to cleanup
  at the end of the test. Anyway bug22694 was fixed while this test
  was disabled.
mysql-test/valgrind.supp:
  Added suppressions for dlopen to make plugin test pass.
2007-05-21 17:48:29 +05:00
unknown
6ee2bfa246 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  mysql.com:/home/svoj/devel/mysql/BUG28341/mysql-5.1-engines
2007-05-21 14:33:54 +05:00
unknown
9004e31247 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


sql/ha_ndbcluster.cc:
  Auto merged
2007-05-21 09:01:06 +02:00
unknown
4d8de9e792 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-05-21 08:50:21 +02:00
unknown
66dc33eed2 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-05-21 08:49:49 +02:00
unknown
ae79786ecf Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2007-05-21 08:49:15 +02:00
unknown
0879be78f0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-21 08:48:33 +02:00
unknown
e67cdddefc BUG#25659 - memory leak via "plugins" test
Re-enabled plugin test to check if it still leaks memory.


mysql-test/t/disabled.def:
  Re-enabled plugin test.
2007-05-21 11:48:05 +05:00
unknown
654dcc13e4 Addition to fix for
BUG#28341 - Security issue still in library loading

Added required option files to rpl_udf test.


mysql-test/t/rpl_udf-master.opt:
  New BitKeeper file ``mysql-test/t/rpl_udf-master.opt''
mysql-test/t/rpl_udf-slave.opt:
  New BitKeeper file ``mysql-test/t/rpl_udf-slave.opt''
2007-05-21 11:34:39 +05:00
unknown
1b150aea90 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  mysql.com:/home/svoj/devel/mysql/BUG28341/mysql-5.1-engines
2007-05-21 10:08:28 +05:00
unknown
2343b95f8b Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-05-20 21:10:44 +05:00
unknown
3043367e73 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-05-19 18:25:33 +02:00
unknown
0a9d4ca373 Bug#28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE
- Upgrade result file for 5.1


mysql-test/r/mysql_upgrade.result:
  Update result for 5.1 - it has more system tables
2007-05-19 18:22:55 +02:00
unknown
f40047df9c Merge pilot.blaudden:/home/msvensson/mysql/bug28401/my50-bug28401
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-05-19 18:22:08 +02:00
unknown
c626ddb1ce Merge pilot.blaudden:/home/msvensson/mysql/bug28401/my50-bug28401
into  pilot.blaudden:/home/msvensson/mysql/bug28401/my51-bug28401


mysql-test/r/mysql_upgrade.result:
  Auto merged
mysql-test/t/mysql_upgrade.test:
  Auto merged
scripts/mysql_system_tables_fix.sql:
  Auto merged
2007-05-19 18:15:40 +02:00
unknown
f52f931f4b Bug #28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE
- The SQL commands used by mysql_upgrade are written to be run
    with sql_mode set to '' - thus the scripts should change sql_mode
    for the session to make sure the SQL is legal.


mysql-test/r/mysql_upgrade.result:
  Update test result
mysql-test/t/mysql_upgrade.test:
  The SQL commands used by mysql_upgrade are written to be run
  with sql_mode set to '' - thus the scripts should change sql_mode
  for the session to make sure the SQL is legal.
scripts/mysql_system_tables_fix.sql:
  Set sql_mode to '' before running the SQL commands
  to fix system tables - backport from 5.1
2007-05-19 18:15:08 +02:00
unknown
5d2075938a merging 2007-05-18 23:21:34 +05:00
unknown
7786aca798 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


mysql-test/r/ps.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/item.cc:
  Auto merged
mysql-test/r/sp_trans.result:
  merging
mysql-test/t/sp_trans.test:
  merging
2007-05-18 22:12:06 +05:00
unknown
8b33c41554 Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.cc:
  Auto merged
2007-05-18 22:09:15 +05:00
unknown
8933c18cca Merge bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.cc:
  Auto merged
2007-05-18 18:22:38 +02:00
unknown
f7434c4f93 added cleanup to some tests
mysql-test/r/sp_trans.result:
  added cleanup
mysql-test/r/strict.result:
  added cleanup
mysql-test/t/sp_trans.test:
  added cleanup
mysql-test/t/strict.test:
  added cleanup
2007-05-18 17:48:44 +02:00
unknown
d3b455137e Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.cc:
  Auto merged
2007-05-18 20:04:39 +05:00
unknown
f0abfddf07 Merge bk@192.168.21.1:mysql-5.1
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
2007-05-18 20:04:01 +05:00
unknown
5f66ebe8b7 Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-05-18 20:02:55 +05:00
unknown
caf045dbeb Merge bk@192.168.21.1:mysql-5.0
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.cc:
  Auto merged
2007-05-18 20:02:27 +05:00
unknown
25090a6da6 Merge bk@192.168.21.1:mysql-4.1
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
2007-05-18 20:01:49 +05:00
unknown
e0d006f348 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
mysql-test/r/ps.result:
  merging
mysql-test/r/subselect.result:
  merging
mysql-test/r/type_datetime.result:
  SCCS merged
mysql-test/t/ps.test:
  merging
mysql-test/t/subselect.test:
  merging
mysql-test/t/type_datetime.test:
  merging
sql/opt_sum.cc:
  SCCS merged
2007-05-18 20:00:49 +05:00
unknown
7839da601c BUG#28341 - Security issue still in library loading
UDF can be created from any library in any part of the server
LD_LIBRARY_PATH.

Allow to load udfs only from plugin_dir.
On windows, refuse to open udf in case it's path contains a slash.

No good test case for this bug because of imperfect error message
that includes error code and error string when it fails to dlopen a
library.


mysql-test/mysql-test-run.pl:
  Since plugins are allowed to be open only from plugin_dir:
  - there is no sence to update LD_LIBRARY_PATH
  - there is no sence to add plugin_dir arg by default
  - set UDF_EXAMPLE_LIB_OPT and EXAMPLE_PLUGIN_OPT to be used by
    udf and plugin tests accordingly.
mysql-test/r/plugin.result:
  Updated test result (we report addition warning).
sql/sql_udf.cc:
  Allow to load udfs only from plugin_dir.
  On windows, refuse to open udf in case it's path contains a slash.
mysql-test/t/plugin-master.opt:
  New BitKeeper file ``mysql-test/t/plugin-master.opt''
mysql-test/t/udf-master.opt:
  New BitKeeper file ``mysql-test/t/udf-master.opt''
2007-05-18 16:23:46 +05:00
unknown
c9e524d40d Merge bk-internal:/home/bk/mysql-5.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2007-05-18 13:01:05 +02:00
unknown
ca633f5f56 Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-05-18 12:58:28 +02:00
unknown
768eab64a1 Merge bk-internal:/home/bk/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-05-18 12:58:11 +02:00
unknown
c75d703502 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
2007-05-18 12:58:05 +02:00
unknown
f35dd61497 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  SCCS merged
2007-05-18 12:56:52 +02:00
unknown
421d8ca972 WL#2247 mysqltest: add option for sorting results
- Final touchups


client/mysqltest.c:
  Final touch ups, rename sorted_results to sorted_result
mysql-test/r/mysqltest.result:
  Update test result
mysql-test/t/mysqltest.test:
  Update results with additional subtests for empty result set,
  NULL values and 1024 rows
2007-05-18 12:50:23 +02:00
unknown
583dab0c87 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-05-18 12:01:54 +02:00
unknown
c960adfef1 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2007-05-18 11:43:43 +02:00
unknown
7514d2f755 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
2007-05-18 11:40:07 +02:00
unknown
507ad360d7 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/28261-bug-5.0-opt-mysql
2007-05-18 13:39:34 +04:00
unknown
51e7c8007b Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
2007-05-18 11:37:30 +02:00
unknown
c40e87527c Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
2007-05-18 11:36:24 +02:00
unknown
be77fa2853 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
2007-05-18 11:35:24 +02:00
unknown
deba58ee92 ndb - bug#28443
review comment 2, atleast 1 signal need for test prg


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  review comment, atleast 1 signal need
2007-05-18 11:34:57 +02:00
unknown
27d82d38c4 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
2007-05-18 11:17:27 +02:00
unknown
1bb62f5dc5 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
2007-05-18 11:16:47 +02:00
unknown
c979e32a66 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  merge
2007-05-18 11:10:04 +02:00
unknown
d1625447c0 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
2007-05-18 11:07:00 +02:00
unknown
692c13ab62 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2007-05-18 11:06:35 +02:00