database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge for 5.0 to 5.1

Browse Source 
BitKeeper/triggers/post-commit:
  Merge for 5.0 -> 5.1
configure.in:
  Merge for 5.0 -> 5.1
mysql-test/r/grant.result:
  Merge for 5.0 -> 5.1
scripts/mysql_create_system_tables.sh:
  Merge for 5.0 -> 5.1
scripts/mysql_fix_privilege_tables.sql:
  Merge for 5.0 -> 5.1
sql/sql_acl.cc:
  Merge 5.0 -> 5.1
sql/sql_acl.h:
  Merge 5.0 -> 5.1
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
This commit is contained in:
unknown
2005-01-06 14:09:13 -08:00
parent ae7cfe9ee8 0c0d8b216a
commit 76cc62153b
6 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View File

@ -34,6 +34,7 @@ bk@mysql.r18.ru
brian@avenger.(none) brian@avenger.(none)
brian@brian-akers-computer.local brian@brian-akers-computer.local
brian@private-client-ip-101.oz.net brian@private-client-ip-101.oz.net
brian@zim.(none)
carsten@tsort.bitbybit.dk carsten@tsort.bitbybit.dk
cps@silver_beast.(none) cps@silver_beast.(none)
davida@isil.mysql.com davida@isil.mysql.com

2
BitKeeper/triggers/post-commit
View File

@ -5,7 +5,7 @@ FROM=$USER@mysql.com
INTERNALS=internals@lists.mysql.com INTERNALS=internals@lists.mysql.com
DOCS=docs-commit@mysql.com DOCS=docs-commit@mysql.com
LIMIT=10000 LIMIT=10000
VERSION="5.0" VERSION="5.1"
if [ "$REAL_EMAIL" = "" ] if [ "$REAL_EMAIL" = "" ]
then then

3
configure.in
View File

@ -5,8 +5,9 @@ AC_PREREQ(2.50)dnl Minimum Autoconf version required.
AC_INIT(sql/mysqld.cc) AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line!
# Don't forget to also update the NDB lines below. # Don't forget to also update the NDB lines below.
AM_INIT_AUTOMAKE(mysql, 5.0.3-alpha) AM_INIT_AUTOMAKE(mysql, 5.1.0-alpha)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10 PROTOCOL_VERSION=10

15
scripts/mysql_fix_privilege_tables.sql
View File

@ -114,7 +114,6 @@ UPDATE user SET Show_db_priv= Select_priv, Super_priv=Process_priv, Execute_priv
-- Add fields that can be used to limit number of questions and connections -- Add fields that can be used to limit number of questions and connections
-- for some users. -- for some users.
ALTER TABLE user ALTER TABLE user
ADD max_questions int(11) NOT NULL DEFAULT 0 AFTER x509_subject, ADD max_questions int(11) NOT NULL DEFAULT 0 AFTER x509_subject,
ADD max_updates int(11) unsigned NOT NULL DEFAULT 0 AFTER max_questions, ADD max_updates int(11) unsigned NOT NULL DEFAULT 0 AFTER max_questions,
@ -132,6 +131,20 @@ ALTER TABLE host
ADD Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL, ADD Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL,
ADD Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL; ADD Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL;
#
# Create VIEWs privrlages (v5.1)
#
ALTER TABLE db ADD Create_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Lock_tables_priv;
ALTER TABLE host ADD Create_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Lock_tables_priv;
ALTER TABLE user ADD Create_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Repl_client_priv;
#
# Show VIEWs privrlages (v5.1)
#
ALTER TABLE db ADD Show_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Create_view_priv;
ALTER TABLE host ADD Show_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Create_view_priv;
ALTER TABLE user ADD Show_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Create_view_priv;
alter table db change Db Db char(64) binary DEFAULT '' NOT NULL; alter table db change Db Db char(64) binary DEFAULT '' NOT NULL;
alter table host change Db Db char(64) binary DEFAULT '' NOT NULL; alter table host change Db Db char(64) binary DEFAULT '' NOT NULL;
alter table user change max_questions max_questions int(11) unsigned DEFAULT 0 NOT NULL; alter table user change max_questions max_questions int(11) unsigned DEFAULT 0 NOT NULL;

2
sql/sql_acl.cc
View File

@ -37,6 +37,8 @@
#ifndef NO_EMBEDDED_ACCESS_CHECKS #ifndef NO_EMBEDDED_ACCESS_CHECKS
#define FIRST_NON_YN_FIELD 26
class acl_entry :public hash_filo_element class acl_entry :public hash_filo_element
{ {
public: public:

1
sql/sql_acl.h
View File

@ -45,7 +45,6 @@
in sql_show.cc when adding new privileges! in sql_show.cc when adding new privileges!
*/ */
#define DB_ACLS \ #define DB_ACLS \
(UPDATE_ACL | SELECT_ACL | INSERT_ACL | DELETE_ACL | CREATE_ACL | DROP_ACL | \ (UPDATE_ACL | SELECT_ACL | INSERT_ACL | DELETE_ACL | CREATE_ACL | DROP_ACL | \
GRANT_ACL | REFERENCES_ACL | INDEX_ACL | ALTER_ACL | CREATE_TMP_ACL | \ GRANT_ACL | REFERENCES_ACL | INDEX_ACL | ALTER_ACL | CREATE_TMP_ACL | \