Commit graph

29977 commits

Author SHA1 Message Date
unknown
e504f8facf Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.1-release
into  perch.ndb.mysql.com:/home/jonas/tmp/mysql-5.1-release
2006-02-08 14:27:25 +01:00
unknown
caf5761648 5.1.6 release ndb dd - fix problem with O_DIRECT on some platforms
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  reopen wo/ O_DIRECT if firts write fails
2006-02-08 11:59:45 +01:00
unknown
8835aa9683 Modified RPM spec to match new 5.1 debug+max combined community packaging. 2006-02-08 11:42:17 +01:00
unknown
d4e3c82753 sql_plugin.cc:
Bug#17196, --default-storage-engine option broken
configure.in:
  This is an alpha


configure.in:
  This is an alpha
sql/sql_plugin.cc:
  Bug#17196, --default-storage-engine option broken
2006-02-07 22:39:55 +01:00
unknown
0ca5886f45 Merge mysql.com:/M51/packtool-5.1 into mysql.com:/M51/clone-5.1 2006-02-07 19:08:33 +01:00
unknown
4a7347d8b1 scripts/make_binary_distribution.sh : Care about the debug server in the 5.1 packages.
scripts/make_binary_distribution.sh:
  As of 5.1, any package will contain both an optimized and a debugging server,
  built with identical configuration (features / table handlers).
  This "mysqld-debug" must be contained in the package.
  Also, the server will not be stripped any more.
  Also, get rid of the old compatibility symlink "safe_mysqld" dating back to 4.0.
2006-02-07 19:06:55 +01:00
unknown
7e31734ce0 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.1-release
into mysql.com:/M51/clone-5.1
2006-02-07 17:58:08 +01:00
unknown
99135e33bf Merge mysql.com:/M51/packtool-5.1 into mysql.com:/M51/clone-5.1 2006-02-07 17:44:01 +01:00
unknown
e36d465222 scripts/make_binary_distribution.sh :
Adaption of the 5.1.6 build clone to the new "storage" directory layer,
already done in the general tree by Jani.


scripts/make_binary_distribution.sh:
  Adaption of the 5.1.6 build clone to the new "storage" directory layer,
  already done in the general tree by Jani:
      2006/02/02 16:22:22+02:00 jani@ua141d10.elisa.omakaista.fi +2 -2
      Fix to reflect change in directory structure.
2006-02-07 17:42:04 +01:00
unknown
5295a17574 Merge mysql.com:/usr/local/mysql/mysql-5.1-winfix
into  mysql.com:/usr/local/mysql/mysql-5.1-release
2006-02-07 16:34:41 +01:00
unknown
547b0c4f27 Add cast to fix Windows compilation.
sql/sql_show.cc:
  Add cast for Windows.
2006-02-07 16:30:26 +01:00
unknown
ef7015fab2 post-merge fix 2006-02-06 18:36:13 +03:00
unknown
387e56aa82 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug


mysql-test/mysql-test-run.pl:
  Auto merged
sql/log.cc:
  Auto merged
sql/log.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2006-02-06 17:35:10 +03:00
unknown
9aac55c4c0 cleanup
sql/mysql_priv.h:
  remove reference to variable removed in the previous patch
2006-02-06 17:30:44 +03:00
unknown
c21fe93c13 post-review fixes to WL#3117 Change option handling
for the log tables.


sql/mysqld.cc:
  post-review fixes
2006-02-06 14:31:43 +03:00
unknown
733b1c4005 Copied patch for BUG#15588 (BUG#16621) from 5.0 into 5.1-release.
sql/field.cc:
  Use memmove() instead of memcpy() -- after implementation of WL#2984
  (Make stored routine variables work according to the standard) it is
  possible to store in the field the value from this field. For instance,
  this can happen for the following statement:
    SET sp_var = SUBSTR(sp_var, 1, 3);
sql/sp_head.cc:
  Work correctly with String:
  - String length has to be be reset before use;
  - qs_append() does not allocate memory, so the memory should
    be reserved beforehand.
2006-02-03 01:49:33 +03:00
unknown
16a849f257 storage/example/ha_example.cc
Copied from the general tree, to solve a build problem:
    ChangeSet 1.2121.1.5 2006/02/02 11:02:09 stewart@mysql.com
      build fix when building with example storage engine.


storage/example/ha_example.cc:
  Copied from the general tree, to solve a build problem:
  ChangeSet 1.2121.1.5 2006/02/02 11:02:09 stewart@mysql.com
    build fix when building with example storage engine.
2006-02-02 19:40:58 +01:00
unknown
a5295c9b3f Merge mysqldev@production.mysql.com:my/mysql-5.1-release/
into  mysql.com:/home/dlenev/src/mysql-5.1-bfix
2006-02-02 13:53:35 +03:00
unknown
c20d947470 Yet another addition to the fix for BUG#9412 "Triggers: should have trigger
privilege".

Corrected addition of TRIGGER privilege by "mysql_fix_privilege_tables" script.
Problem with it should have been caught by system_mysql_db/system_mysql_db_fix
tests but they were disabled. Enabled them back.


mysql-test/r/system_mysql_db.result:
  Updated test results after addition of TRIGGER privilege.
mysql-test/t/disabled.def:
  Enabled back test system_mysql_db/system_mysql_db_fix tests.
scripts/mysql_fix_privilege_tables.sql:
  Corrected addition of TRIGGER privilege.
2006-02-02 13:36:07 +03:00
unknown
f4c3c35660 Bug #16753 DD: mysqldump does not support Cluster Disk Data backups 2006-02-02 10:56:04 +01:00
unknown
e319fb893b Bug #16753 DD: mysqldump does not support Cluster Disk Data backups
mysql-test/r/ndb_dd_dump.result:
  New BitKeeper file ``mysql-test/r/ndb_dd_dump.result''
mysql-test/t/ndb_dd_dump.test:
  New BitKeeper file ``mysql-test/t/ndb_dd_dump.test''
2006-02-02 00:52:58 +01:00
unknown
66581f5da3 bug, added error handling to information_schema files 2006-02-02 00:24:42 +01:00
unknown
d8acfecb06 bug, retry handling in "ndb schema propagation" incorrect 2006-02-01 23:55:04 +01:00
unknown
664bab064e bug, ndb onject on thread unitialized on handlerton call in files information schema 2006-02-01 22:37:25 +01:00
unknown
02296b58ca Addition to the fix for BUG#9412 "Triggers: should have trigger privilege".
When we add new privilege we should update mysql-test/lib/init_db.sql
accordingly.


mysql-test/lib/init_db.sql:
  Added TRIGGER privilege.
sql/sql_acl.h:
  Updated comment describing process of addition of new privileges - added yet
  another script place which should be modified when new privilege is added.
2006-02-01 21:27:12 +03:00
unknown
60ce9b7c1a Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/home/stewart/Documents/MySQL/5.1/tmp_merge
2006-02-02 00:53:45 +11:00
unknown
c59e5f8282 Merge mysql.com:/home/stewart/Documents/MySQL/5.1/wl1359
into  mysql.com:/home/stewart/Documents/MySQL/5.1/tmp_merge


mysql-test/r/information_schema.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
2006-02-02 00:52:32 +11:00
unknown
9be61bbc02 some fixes from review of WL1359.
fix up test cases.


mysql-test/r/information_schema.result:
  update result for INFORMATION_SCHEMA.FILES
mysql-test/r/information_schema_db.result:
  update result for INFORMATION_SCHEMA.FILES
sql/ha_ndbcluster.cc:
  in fill_files_table, use my_snprintf instead of snprintf
sql/sql_show.cc:
  correct DBUG_ENTER for fill_schema_files
sql/table.h:
  add SCH_FILES to information schema enum
2006-02-02 00:47:08 +11:00
unknown
41849b9c3e Change 5.1.6 from alpha to beta release 2006-02-01 13:30:56 +01:00
unknown
590ca269cd added check if replication already setup by autodiscover 2006-02-01 13:16:36 +01:00
unknown
1fd551adff Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql51


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
2006-02-01 13:04:47 +01:00
unknown
bd9bb91a92 another attempt to make testcase predictable :) 2006-02-01 12:30:36 +01:00
unknown
7c55e7d2b5 Bug #16466 DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK
corrected test case
2006-02-01 12:12:48 +01:00
unknown
30d4843391 Bug #16466 DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK
correction
2006-02-01 12:01:52 +01:00
unknown
9796f9c960 MySQL Bugs: #16466: DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK 2006-02-01 11:56:20 +01:00
unknown
0b88ef9dc7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.1-bug9412-latest
2006-02-01 13:32:15 +03:00
unknown
6aaed7330c Fix for BUG#9412: Triggers: should have trigger privilege.
Implement table-level TRIGGER privilege to control access to triggers.
Before this path global SUPER privilege was used for this purpose, that
was the big security problem.

In details, before this patch SUPER privilege was required:
  - for the user at CREATE TRIGGER time to create a new trigger;
  - for the user at DROP TRIGGER time to drop the existing trigger;
  - for the definer at trigger activation time to execute the trigger (if the
    definer loses SUPER privilege, all its triggers become unavailable);

This patch changes the behaviour in the following way:
  - TRIGGER privilege on the subject table for trigger is required:
    - for the user at CREATE TRIGGER time to create a new trigger;
    - for the user at DROP TRIGGER time to drop the existing trigger;
    - for the definer at trigger activation time to execute the trigger
      (if the definer loses TRIGGER privilege on the subject table, all its
      triggers on this table become unavailable).
  - SUPER privilege is still required:
    - for the user at CREATE TRIGGER time to explicitly set the trigger
      definer to the user other than CURRENT_USER().

When the server works with database of the previous version (w/o TRIGGER
privilege), or if the database is being upgraded from the previous versions,
TRIGGER privilege is granted to whose users, who have CREATE privilege.


mysql-test/r/grant.result:
  Updated the result file after adding TRIGGER privilege.
mysql-test/r/information_schema.result:
  Updated the result file after adding TRIGGER privilege.
mysql-test/r/lowercase_table_grant.result:
  Updated the result file after adding TRIGGER privilege.
mysql-test/r/ps.result:
  Updated the result file after adding TRIGGER privilege.
mysql-test/r/sp.result:
  Updated the result file after adding TRIGGER privilege.
mysql-test/r/trigger-compat.result:
  Updated the result file after adding TRIGGER privilege.
mysql-test/r/trigger-grant.result:
  Updated the result file after adding TRIGGER privilege.
mysql-test/t/trigger-compat.test:
  Grant table-level TRIGGER privilege instead of global SUPER one.
mysql-test/t/trigger-grant.test:
  1. Grant table-level TRIGGER privilege instead of global SUPER one.
  2. Updated the test case to check that SUPER is required to specify
  the user other than the current as a definer.
scripts/mysql_create_system_tables.sh:
  Added TRIGGER privilege.
scripts/mysql_fix_privilege_tables.sql:
  Added TRIGGER privilege.
sql/sql_acl.cc:
  Added TRIGGER privilege.
sql/sql_acl.h:
  Added TRIGGER privilege.
sql/sql_show.cc:
  Added TRIGGER privilege.
sql/sql_trigger.cc:
  Check TRIGGER privilege instead of SUPER.
sql/sql_yacc.yy:
  Added TRIGGER privilege.
2006-02-01 13:28:45 +03:00
unknown
59fffa2ef6 Wrapped get/set_ndb_share_state with mutex lock 2006-02-01 10:21:48 +01:00
unknown
55c304a17b bug 16996 ndbd nodes crash at api heartbeat failure if event/replication is used 2006-02-01 10:13:27 +01:00
unknown
8585070fdd adjust test to give predictable output 2006-02-01 10:07:04 +01:00
unknown
b89ce88345 Merge mysql.com:/home/stewart/Documents/MySQL/5.1/new
into  mysql.com:/home/stewart/Documents/MySQL/5.1/wl1359


sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_show.cc:
  SCCS merged
2006-02-01 18:23:34 +11:00
unknown
fe98fef92c ensure repeatability of test case 2006-02-01 02:34:02 +01:00
unknown
d2767a25d6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-02-01 01:15:01 +01:00
unknown
d7d940ee04 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-02-01 01:13:21 +01:00
unknown
0a1351c1f8 wl2325, distribution of schema operations between mysql servers
mysql-test/r/ndb_binlog_ddl_multi.result:
  New BitKeeper file ``mysql-test/r/ndb_binlog_ddl_multi.result''
mysql-test/t/ndb_binlog_ddl_multi.test:
  New BitKeeper file ``mysql-test/t/ndb_binlog_ddl_multi.test''
2006-02-01 01:12:11 +01:00
unknown
21a946e36d Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/psergey/mysql-5.1-fix-assert
2006-02-01 02:20:04 +03:00
unknown
f02d3527a2 Change DBUG_ASSERT(1) to DBUG_ASSERT(0) 2006-02-01 02:19:14 +03:00
unknown
6387eb20bd Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16407
2006-01-31 23:30:36 +01:00
unknown
1e59303344 sql_mode should be after on_completion and before comment
partial fix for bug #16407
WL#1034 (Internal CRON)


scripts/mysql_fix_privilege_tables.sql:
  sql_mode should be after on_completion and before comment
2006-01-31 23:29:03 +01:00
unknown
41f7cb2a0a Added test case for creating index on disk stored table 2006-01-31 20:11:43 +01:00