Commit graph

29976 commits

Author SHA1 Message Date
unknown
f31f66433e build fix for solaris 10 sparc -max
sql/ha_ndbcluster.cc:
  ndbcluster_fill_files_table should return int
2006-02-02 16:14:31 +11:00
unknown
921ceda34c build fix when building with example storage engine.
storage/example/ha_example.cc:
  add handlerton call for fill files table
2006-02-02 11:02:09 +11:00
unknown
a440d2268f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/dlenev/src/mysql-5.1-merges
2006-02-02 00:05:23 +03:00
unknown
b00ae812b3 Disabled ndb_blob 2006-02-01 21:49:15 +01:00
unknown
5cb5af25de Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892


storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
2006-02-01 21:29:21 +01:00
unknown
76369a5fe6 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/dlenev/src/mysql-5.1-merges
2006-02-01 22:19:18 +03:00
unknown
36f4f78b26 Merge mysql.com:/home/dlenev/src/mysql-5.1-bfix
into  mysql.com:/home/dlenev/src/mysql-5.1-merges


sql/ha_berkeley.cc:
  Auto merged
2006-02-01 21:49:11 +03:00
unknown
2a95622b9f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-01 21:41:33 +03: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
0a0bc35f53 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-02-01 18:20:40 +01:00
unknown
9dc361c4f9 ndb - wl#2972 fix some mem leaks
storage/ndb/src/ndbapi/NdbBlob.cpp:
  fix some mem leaks (event ops however are never dtor-ed yet)
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  fix some mem leaks (event ops however are never dtor-ed yet)
storage/ndb/test/ndbapi/test_event_merge.cpp:
  fix some mem leaks (event ops however are never dtor-ed yet)
2006-02-01 18:09:38 +01:00
unknown
e7a0eac86f Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge2
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
2006-02-01 18:56:29 +03:00
unknown
f271c77320 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-01 18:43:53 +03:00
unknown
4f9ba9fe38 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892


sql/ha_ndbcluster_binlog.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
2006-02-01 14:58:15 +01:00
unknown
1939dacd14 Fixes to BLOB replication code for changes to event(now stores own copy of table) 2006-02-01 14:55:56 +01: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
e13a3037c5 Merge mysql.com:/data0/mysqldev/my/mysql-5.1-release
into  mysql.com:/data0/mysqldev/my/mysql-5.1-new


configure.in:
  Null merge.
2006-02-01 13:34:28 +01:00
unknown
41849b9c3e Change 5.1.6 from alpha to beta release 2006-02-01 13:30:56 +01:00
unknown
3c5cc827f7 5.1.6 cloneoff tag and version bump to 5.1.7 2006-02-01 13:28:57 +01:00
unknown
1f649766a3 Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge1
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


sql/ha_berkeley.cc:
  Use local: manual merge
2006-02-01 15:24:02 +03: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
211ae3ee9b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892


sql/ha_ndbcluster_binlog.cc:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
2006-02-01 11:57:17 +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
53f1a42df4 Merge with new handling of tables in events 2006-02-01 11:55:26 +01:00
unknown
31d2a97e5a Added check for stale table 2006-02-01 11:53:07 +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
ab9b866257 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892


storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbEventOperation.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbEventOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Merge
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  Merge
2006-01-31 23:35:23 +01: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
667c0e93a4 Propagating DictTabInfo in signal SubTableData for event TE_ALTER 2006-01-31 23:20:48 +01:00
unknown
41f7cb2a0a Added test case for creating index on disk stored table 2006-01-31 20:11:43 +01:00
unknown
6609e38aa5 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/marty/MySQL/mysql-5.1-new
2006-01-31 20:11:42 +01:00
unknown
e886b89207 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  big_geek.:C:/Work/mysql/mysql-5.1
2006-01-31 13:11:41 -06:00