List:Internals« Previous MessageNext Message »
From:sasha Date:September 20 2001 1:45am
Subject:bk commit into 4.0 tree
View as plain text  
Below is the list of changes that have just been committed into a
4.0 repository of sasha. When sasha does a push, they will be propogated to 
the main repository and within 24 hours after the push to the public repository. 
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2001-09-19 19:45:13-06:00, sasha@stripped
  GRANT ... REQUIRE ( for SSL).

  client/mysqlmanagerc.c
    1.2 01/09/19 19:45:12 sasha@stripped +1 -1
    fix to make it compile after merge

  sql/lex.h
    1.52 01/09/19 19:45:12 sasha@stripped +4 -0
    fixes for GRANT ... REQUIRE

  sql/sql_lex.h
    1.48 01/09/19 19:45:12 sasha@stripped +1 -0
    GRANT ... REQUIRE

  sql/sql_yacc.yy
    1.111 01/09/19 19:45:12 sasha@stripped +33 -3
    GRANT ... REQUIRE

  tools/mysqlmanager.c
    1.9 01/09/19 19:45:12 sasha@stripped +1 -1
    fix to make compile after merge

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sasha
# Host:	mysql.sashanet.com
# Root:	/home/sasha/src/bk/mysql-4.0

--- 1.51/sql/lex.h	Sun Sep  2 08:32:58 2001
+++ 1.52/sql/lex.h	Wed Sep 19 19:45:12 2001
@@ -83,6 +83,7 @@
   { "CHANGED",		SYM(CHANGED),0,0},
   { "CHECK",		SYM(CHECK_SYM),0,0},
   { "CHECKSUM",		SYM(CHECKSUM_SYM),0,0},
+  { "CHIPHER",		SYM(CHIPHER_SYM),0,0},
   { "CLOSE",		SYM(CLOSE_SYM),0,0},
   { "COLUMN",		SYM(COLUMN_SYM),0,0},
   { "COLUMNS",		SYM(COLUMNS),0,0},
@@ -190,6 +191,7 @@
   { "IS",		SYM(IS),0,0},
   { "ISOLATION",	SYM(ISOLATION),0,0},
   { "ISAM",		SYM(ISAM_SYM),0,0},
+  { "ISSUER",		SYM(ISSUER_SYM),0,0},
   { "JOIN",		SYM(JOIN_SYM),0,0},
   { "KEY",		SYM(KEY_SYM),0,0},
   { "KEYS",		SYM(KEYS),0,0},
@@ -277,6 +279,7 @@
   { "REPAIR",		SYM(REPAIR),0,0},
   { "REPLACE",		SYM(REPLACE),0,0},
   { "REPEATABLE",	SYM(REPEATABLE_SYM),0,0},
+  { "REQUIRE",	        SYM(REQUIRE_SYM),0,0},
   { "RESET",		SYM(RESET_SYM),0,0},
   { "RESTORE",		SYM(RESTORE_SYM),0,0},
   { "RESTRICT",		SYM(RESTRICT),0,0},
@@ -322,6 +325,7 @@
   { "STRING",		SYM(STRING_SYM),0,0},
   { "STOP",		SYM(STOP_SYM),0,0},
   { "STRIPED",		SYM(RAID_STRIPED_SYM),0,0},
+  { "SUBJECT",		SYM(SUBJECT_SYM),0,0},
   { "TABLE",		SYM(TABLE_SYM),0,0},
   { "TABLES",		SYM(TABLES),0,0},
   { "TEMPORARY",	SYM(TEMPORARY),0,0},

--- 1.47/sql/sql_lex.h	Tue Aug 14 11:33:48 2001
+++ 1.48/sql/sql_lex.h	Wed Sep 19 19:45:12 2001
@@ -145,6 +145,7 @@
   char *length,*dec,*change,*name;
   char *backup_dir;				/* For RESTORE/BACKUP */
   char* to_log;                                 /* For PURGE MASTER LOGS TO */
+  char* ssl_subject,*ssl_issuer,*ssl_chipher;
   String *wild;
   sql_exchange *exchange;
 

--- 1.110/sql/sql_yacc.yy	Sat Sep 15 07:22:34 2001
+++ 1.111/sql/sql_yacc.yy	Wed Sep 19 19:45:12 2001
@@ -98,7 +98,7 @@
 %token	MIN_SYM
 %token	SUM_SYM
 %token	STD_SYM
-
+%token  ABORT_SYM
 %token	ADD
 %token	ALTER
 %token	AFTER_SYM
@@ -134,7 +134,6 @@
 %token  BINLOG_SYM
 %token  EVENTS_SYM
 
-%token	ABORT_SYM
 %token	ACTION
 %token	AGGREGATE_SYM
 %token	ALL
@@ -450,6 +449,10 @@
 %token  SQL_QUOTE_SHOW_CREATE
 %token  SQL_SLAVE_SKIP_COUNTER
 
+%token  ISSUER_SYM
+%token  SUBJECT_SYM
+%token  CHIPHER_SYM
+
 %left   SET_VAR
 %left	OR_OR_CONCAT OR
 %left	AND
@@ -2819,6 +2822,7 @@
 	| CHANGED		{}
 	| CHECKSUM_SYM		{}
 	| CHECK_SYM		{}
+	| CHIPHER_SYM		{}
 	| CLOSE_SYM		{}
 	| COMMENT_SYM		{}
 	| COMMIT_SYM		{}
@@ -2856,6 +2860,7 @@
 	| INDEXES		{}
 	| ISOLATION		{}
 	| ISAM_SYM		{}
+	| ISSUER_SYM		{}
 	| INNOBASE_SYM		{}
 	| LAST_SYM		{}
 	| LEVEL_SYM		{}
@@ -2882,6 +2887,7 @@
 	| NATIONAL_SYM		{}
 	| NCHAR_SYM		{}
 	| NEXT_SYM		{}
+	| NEW_SYM		{}
 	| NO_SYM		{}
 	| OPEN_SYM		{}
 	| PACK_KEYS_SYM		{}
@@ -2909,10 +2915,12 @@
 	| SESSION_SYM		{}
 	| SHARE_SYM		{}
 	| SHUTDOWN		{}
+        | SLAVE		        {}
 	| START_SYM		{}
 	| STATUS_SYM		{}
 	| STOP_SYM		{}
 	| STRING_SYM		{}
+	| SUBJECT_SYM		{}
 	| TEMPORARY		{}
 	| TEXT_SYM		{}
 	| TRANSACTION_SYM	{}
@@ -3251,9 +3259,10 @@
 	  lex->columns.empty();
 	  lex->grant= lex->grant_tot_col=0;
 	  lex->select->db=0;
+	  lex->ssl_chipher=lex->ssl_subject=lex->ssl_issuer=0;
 	}
 	grant_privileges ON opt_table TO_SYM user_list
-	grant_option
+	grant_option require_clause
 
 grant_privileges:
 	grant_privilege_list {}
@@ -3287,6 +3296,27 @@
 	| FILE_SYM	{ Lex->grant |= FILE_ACL;}
 	| GRANT OPTION  { Lex->grant |= GRANT_ACL;}
 
+require_clause: /* empty */
+ | REQUIRE_SYM require_list
+
+
+require_list: require_list_element AND require_list
+| require_list_element 
+
+
+require_list_element: SUBJECT_SYM TEXT_STRING
+ {
+   Lex->ssl_subject=$2.str;
+ }
+ | ISSUER_SYM TEXT_STRING
+ {
+   Lex->ssl_issuer=$2.str;
+ }
+ | CHIPHER_SYM TEXT_STRING
+ {
+   Lex->ssl_chipher=$2.str;
+ }
+ 
 opt_table:
 	'*'
 	  {

--- 1.1/client/mysqlmanagerc.c	Wed Sep 19 14:30:42 2001
+++ 1.2/client/mysqlmanagerc.c	Wed Sep 19 19:45:12 2001
@@ -16,7 +16,7 @@
 
 #define MANAGER_CLIENT_VERSION "1.0"
 
-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include <mysql.h>

--- 1.8/tools/mysqlmanager.c	Wed Sep 19 14:39:11 2001
+++ 1.9/tools/mysqlmanager.c	Wed Sep 19 19:45:12 2001
@@ -20,7 +20,7 @@
  *   Sasha Pachev <sasha@stripped>
  **/
 
-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include <mysql.h>
Thread
bk commit into 4.0 treesasha20 Sep