bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4262)

[Magnus Blåudd]

#At file:///data0/magnus/mysql/7.0-dist-priv/ based on revid:magnus.blaudd@stripped10g

 4262 Magnus Blåudd	2011-03-23
      ndb dist priv
       - move the script which loads  utiltiy procedures into storage/ndb/tools
       - move the HOWTO_distribute_priviliges.txt file into storage/ndb/tools

    renamed:
      HOWTO_distribute_privileges.txt => storage/ndb/tools/HOWTO_distribute_privileges.txt
      scripts/mysql_load_distribute_privilege_procedures.sql => storage/ndb/tools/ndb_dist_priv.sql
    modified:
      scripts/Makefile.am
      storage/ndb/tools/Makefile.am
      storage/ndb/tools/HOWTO_distribute_privileges.txt
      storage/ndb/tools/ndb_dist_priv.sql
=== modified file 'scripts/Makefile.am'
--- a/scripts/Makefile.am	2011-03-19 13:19:44 +0000
+++ b/scripts/Makefile.am	2011-03-23 13:19:00 +0000
@@ -72,7 +72,6 @@ EXTRA_DIST =		$(EXTRA_SCRIPTS) \
 
 dist_pkgdata_DATA =	fill_help_tables.sql \
 			mysql_fix_privilege_tables.sql \
-                        mysql_load_distribute_privilege_procedures.sql \
 			mysql_system_tables.sql \
 			mysql_system_tables_data.sql \
 			mysql_test_data_timezone.sql

=== renamed file 'HOWTO_distribute_privileges.txt' => 'storage/ndb/tools/HOWTO_distribute_privileges.txt'
--- a/HOWTO_distribute_privileges.txt	2011-03-19 13:19:44 +0000
+++ b/storage/ndb/tools/HOWTO_distribute_privileges.txt	2011-03-23 13:19:00 +0000
@@ -12,8 +12,11 @@ The procedure is based on moving the pri
 storage (MyISAM) to distributed storage (ndbcluster). To
 simplify the procedure a number of store procedures have been
 defined to more or less automate the procedure.
-The procedures can be loaded by: 
-"mysql <connect-options> --user root < scripts/mysql_load_distribute_privilege_procedures.sql" 
+The procedures can be created by running the script ndb_dist_priv.sql
+(which you find in storage/ndb/tools/ or share/mysql/ depending
+on your distribution of the mysql files) through "mysql"
+Example:
+"mysql <connect-options> --user root < storage/ndb/tool/ndb_dist_priv.sql"
 
 IMPORTANT: Prior to performing the actual distribution it is recommended
 to backup the current privilege tables, using for example mysqldump:

=== modified file 'storage/ndb/tools/Makefile.am'
--- a/storage/ndb/tools/Makefile.am	2011-02-23 22:48:42 +0000
+++ b/storage/ndb/tools/Makefile.am	2011-03-23 13:19:00 +0000
@@ -19,7 +19,7 @@ BUILT_SOURCES = ndbinfo.sql
 
 noinst_PROGRAMS = 	ndbinfo_sql
 dist_bin_SCRIPTS =	ndb_size.pl ndb_error_reporter
-dist_pkgdata_DATA = ndbinfo.sql
+dist_pkgdata_DATA = ndbinfo.sql ndb_dist_priv.sql
 
 ndbtools_PROGRAMS = \
   ndb_test_platform \

=== renamed file 'scripts/mysql_load_distribute_privilege_procedures.sql' => 'storage/ndb/tools/ndb_dist_priv.sql'
--- a/scripts/mysql_load_distribute_privilege_procedures.sql	2011-03-23 12:06:50 +0000
+++ b/storage/ndb/tools/ndb_dist_priv.sql	2011-03-23 13:19:00 +0000
@@ -1,3 +1,18 @@
+-- Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+-- 
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+-- 
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+-- 
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
 delimiter |
 
 drop function if exists mysql.mysql_cluster_privileges_are_distributed|

Attachment: [text/bzr-bundle] bzr/[e-mail]