List:Internals« Previous MessageNext Message »
From:sasha Date:August 12 2001 1:54am
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-08-11 19:54:31-06:00, sasha@stripped
  post-merge fixes to make it compile. It still fails the fulltext test,
   (wrong error code) but I'll push it so that Sergei could clean up
   my merge

  sql/share/slovak/errmsg.txt
    1.33 01/08/11 19:54:31 sasha@stripped +1 -0
    merge fix

  sql/share/spanish/errmsg.txt
    1.34 01/08/11 19:54:31 sasha@stripped +1 -0
    merge fix

  sql/share/swedish/errmsg.txt
    1.33 01/08/11 19:54:31 sasha@stripped +1 -0
    merge fix

  sql/sql_acl.cc
    1.28 01/08/11 19:54:31 sasha@stripped +2 -2
    merge fix

  include/mysqld_error.h
    1.34 01/08/11 19:54:30 sasha@stripped +1 -1
    fixed typo

  mysql-test/r/order_by.result
    1.7 01/08/11 19:54:30 sasha@stripped +31 -25
    updated result for merged test

  sql/Makefile.am
    1.55 01/08/11 19:54:30 sasha@stripped +2 -2
    put back sql_union.cc lost during merge

  sql/mysql_priv.h
    1.114 01/08/11 19:54:30 sasha@stripped +4 -3
    restored variables lost in the merge

  sql/mysqld.cc
    1.198 01/08/11 19:54:30 sasha@stripped +4 -3
    put back lost variable declarations

  sql/share/czech/errmsg.txt
    1.33 01/08/11 19:54:30 sasha@stripped +1 -0
    merge fix

  sql/share/danish/errmsg.txt
    1.32 01/08/11 19:54:30 sasha@stripped +1 -0
    merge fix

  sql/share/dutch/errmsg.txt
    1.33 01/08/11 19:54:30 sasha@stripped +1 -0
    merge fix

  sql/share/english/errmsg.txt
    1.37 01/08/11 19:54:30 sasha@stripped +1 -0
    merge fix

  sql/share/estonian/errmsg.txt
    1.34 01/08/11 19:54:30 sasha@stripped +1 -0
    merge fix

  sql/share/french/errmsg.txt
    1.32 01/08/11 19:54:30 sasha@stripped +1 -0
    merge fix

  sql/share/german/errmsg.txt
    1.34 01/08/11 19:54:30 sasha@stripped +1 -0
    merge fix

  sql/share/greek/errmsg.txt
    1.33 01/08/11 19:54:30 sasha@stripped +1 -0
    merge fix

  sql/share/hungarian/errmsg.txt
    1.34 01/08/11 19:54:30 sasha@stripped +1 -0
    merge fix

  sql/share/italian/errmsg.txt
    1.38 01/08/11 19:54:30 sasha@stripped +1 -0
    merge fix

  sql/share/japanese/errmsg.txt
    1.32 01/08/11 19:54:30 sasha@stripped +1 -0
    merge fix

  sql/share/korean/errmsg.txt
    1.32 01/08/11 19:54:30 sasha@stripped +1 -0
    merge fix

  sql/share/norwegian-ny/errmsg.txt
    1.32 01/08/11 19:54:30 sasha@stripped +1 -0
    merge fix

  sql/share/norwegian/errmsg.txt
    1.32 01/08/11 19:54:30 sasha@stripped +1 -0
    merge fix

  sql/share/polish/errmsg.txt
    1.32 01/08/11 19:54:30 sasha@stripped +1 -0
    merge fix

  sql/share/portuguese/errmsg.txt
    1.34 01/08/11 19:54:30 sasha@stripped +1 -0
    merge fix

  sql/share/romanian/errmsg.txt
    1.31 01/08/11 19:54:30 sasha@stripped +1 -0
    merge fix

  sql/share/russian/errmsg.txt
    1.33 01/08/11 19:54:30 sasha@stripped +1 -0
    merge fix

# 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.33/include/mysqld_error.h	Sat Aug 11 17:28:40 2001
+++ 1.34/include/mysqld_error.h	Sat Aug 11 19:54:30 2001
@@ -216,5 +216,5 @@
 #define ER_ERROR_WHEN_EXECUTING_COMMAND 1213
 #define ER_WRONG_USAGE 1214
 #define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1215
-#define ER_NO_PERSMISSION_TO_CREATE_USER 1216
+#define ER_NO_PERMISSION_TO_CREATE_USER 1216
 #define ER_ERROR_MESSAGES 217

--- 1.54/sql/Makefile.am	Thu Aug  9 19:16:13 2001
+++ 1.55/sql/Makefile.am	Sat Aug 11 19:54:30 2001
@@ -80,9 +80,9 @@
 			sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \
 			sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \
 			sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \
-			slave.cc sql_repl.cc \
+			slave.cc sql_repl.cc sql_union.cc \
 			mini_client.cc mini_client_errors.c \
-			md5.c stacktrace.c
+			md5.c stacktrace.c 
 gen_lex_hash_SOURCES =	gen_lex_hash.cc
 gen_lex_hash_LDADD =	$(LDADD) $(CXXLDFLAGS)
 

--- 1.113/sql/mysql_priv.h	Sat Aug 11 17:28:40 2001
+++ 1.114/sql/mysql_priv.h	Sat Aug 11 19:54:30 2001
@@ -555,13 +555,14 @@
 	     max_insert_delayed_threads, max_user_connections,
 	     long_query_count,net_wait_timeout,net_interactive_timeout,
 	     net_read_timeout,net_write_timeout,
-	     what_to_log,flush_time,
+	     what_to_log,flush_time,opt_sql_mode,
 	     max_tmp_tables,max_heap_table_size,query_buff_size,
 	     lower_case_table_names,thread_stack,thread_stack_min,
-	     binlog_cache_size, max_binlog_cache_size;
+	     binlog_cache_size, max_binlog_cache_size,record_rnd_cache_size;
 extern ulong specialflag, current_pid;
 extern bool low_priority_updates, using_update_log;
-extern bool opt_sql_bin_update, opt_safe_show_db, opt_warnings;
+extern bool opt_sql_bin_update, opt_safe_show_db, opt_warnings,
+					     opt_safe_user_create;
 extern char language[LIBLEN],reg_ext[FN_EXTLEN],blob_newline;
 extern const char **errmesg;			/* Error messages */
 extern const char *default_tx_isolation_name;

--- 1.197/sql/mysqld.cc	Sat Aug 11 17:28:40 2001
+++ 1.198/sql/mysqld.cc	Sat Aug 11 19:54:30 2001
@@ -223,7 +223,8 @@
 	    opt_myisam_log=0,
             opt_large_files=sizeof(my_off_t) > 4;
 bool opt_sql_bin_update = 0, opt_log_slave_updates = 0, opt_safe_show_db=0,
-  opt_show_slave_auth_info = 0, opt_old_rpl_compat = 0;
+  opt_show_slave_auth_info = 0, opt_old_rpl_compat = 0,
+  opt_safe_user_create = 0;
 FILE *bootstrap_file=0;
 int segfaulted = 0; // ensure we do not enter SIGSEGV handler twice
 extern MASTER_INFO glob_mi;
@@ -271,7 +272,7 @@
       query_buff_size, lower_case_table_names, mysqld_net_retry_count,
       net_interactive_timeout, slow_launch_time = 2L,
       net_read_timeout,net_write_timeout,slave_open_temp_tables=0,
-      open_files_limit=0, max_binlog_size;
+      open_files_limit=0, max_binlog_size, record_rnd_cache_size;
 ulong slave_net_timeout;
 ulong thread_cache_size=0, binlog_cache_size=0, max_binlog_cache_size=0;
 volatile ulong cached_thread_count=0;
@@ -2531,7 +2532,7 @@
 	       OPT_REPORT_USER, OPT_REPORT_PASSWORD, OPT_REPORT_PORT,
                OPT_MAX_BINLOG_DUMP_EVENTS, OPT_SPORADIC_BINLOG_DUMP_FAIL,
                OPT_SHOW_SLAVE_AUTH_INFO, OPT_OLD_RPL_COMPAT,
-               OPT_SQL_MODE,
+               OPT_SQL_MODE,OPT_SAFE_USER_CREATE,
                OPT_SLAVE_LOAD_TMPDIR};
 
 static struct option long_options[] = {

--- 1.32/sql/share/czech/errmsg.txt	Sat Aug 11 17:28:40 2001
+++ 1.33/sql/share/czech/errmsg.txt	Sat Aug 11 19:54:30 2001
@@ -226,3 +226,4 @@
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
+"%-.32s@%-.64s is not allowed to create new users",

--- 1.31/sql/share/danish/errmsg.txt	Sat Aug 11 17:28:40 2001
+++ 1.32/sql/share/danish/errmsg.txt	Sat Aug 11 19:54:30 2001
@@ -220,3 +220,4 @@
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
+"%-.32s@%-.64s is not allowed to create new users",

--- 1.32/sql/share/dutch/errmsg.txt	Sat Aug 11 17:28:40 2001
+++ 1.33/sql/share/dutch/errmsg.txt	Sat Aug 11 19:54:30 2001
@@ -217,3 +217,4 @@
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
+"%-.32s@%-.64s is not allowed to create new users",

--- 1.36/sql/share/english/errmsg.txt	Sat Aug 11 17:28:40 2001
+++ 1.37/sql/share/english/errmsg.txt	Sat Aug 11 19:54:30 2001
@@ -217,3 +217,4 @@
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
+"%-.32s@%-.64s is not allowed to create new users",

--- 1.33/sql/share/estonian/errmsg.txt	Sat Aug 11 17:28:40 2001
+++ 1.34/sql/share/estonian/errmsg.txt	Sat Aug 11 19:54:30 2001
@@ -221,3 +221,4 @@
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
+"%-.32s@%-.64s is not allowed to create new users",

--- 1.31/sql/share/french/errmsg.txt	Sat Aug 11 17:28:40 2001
+++ 1.32/sql/share/french/errmsg.txt	Sat Aug 11 19:54:30 2001
@@ -217,3 +217,4 @@
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
+"%-.32s@%-.64s is not allowed to create new users",

--- 1.33/sql/share/german/errmsg.txt	Sat Aug 11 17:28:40 2001
+++ 1.34/sql/share/german/errmsg.txt	Sat Aug 11 19:54:30 2001
@@ -220,3 +220,4 @@
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
+"%-.32s@%-.64s is not allowed to create new users",

--- 1.32/sql/share/greek/errmsg.txt	Sat Aug 11 17:28:40 2001
+++ 1.33/sql/share/greek/errmsg.txt	Sat Aug 11 19:54:30 2001
@@ -217,3 +217,4 @@
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
+"%-.32s@%-.64s is not allowed to create new users",

--- 1.33/sql/share/hungarian/errmsg.txt	Sat Aug 11 17:28:40 2001
+++ 1.34/sql/share/hungarian/errmsg.txt	Sat Aug 11 19:54:30 2001
@@ -219,3 +219,4 @@
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
+"%-.32s@%-.64s is not allowed to create new users",

--- 1.37/sql/share/italian/errmsg.txt	Sat Aug 11 17:28:40 2001
+++ 1.38/sql/share/italian/errmsg.txt	Sat Aug 11 19:54:30 2001
@@ -217,3 +217,4 @@
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
+"%-.32s@%-.64s is not allowed to create new users",

--- 1.31/sql/share/japanese/errmsg.txt	Sat Aug 11 17:28:40 2001
+++ 1.32/sql/share/japanese/errmsg.txt	Sat Aug 11 19:54:30 2001
@@ -219,3 +219,4 @@
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
+"%-.32s@%-.64s is not allowed to create new users",

--- 1.31/sql/share/korean/errmsg.txt	Sat Aug 11 17:28:40 2001
+++ 1.32/sql/share/korean/errmsg.txt	Sat Aug 11 19:54:30 2001
@@ -217,3 +217,4 @@
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
+"%-.32s@%-.64s is not allowed to create new users",

--- 1.31/sql/share/norwegian-ny/errmsg.txt	Sat Aug 11 17:28:40 2001
+++ 1.32/sql/share/norwegian-ny/errmsg.txt	Sat Aug 11 19:54:30 2001
@@ -219,3 +219,4 @@
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
+"%-.32s@%-.64s is not allowed to create new users",

--- 1.31/sql/share/norwegian/errmsg.txt	Sat Aug 11 17:28:40 2001
+++ 1.32/sql/share/norwegian/errmsg.txt	Sat Aug 11 19:54:30 2001
@@ -219,3 +219,4 @@
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
+"%-.32s@%-.64s is not allowed to create new users",

--- 1.31/sql/share/polish/errmsg.txt	Sat Aug 11 17:28:40 2001
+++ 1.32/sql/share/polish/errmsg.txt	Sat Aug 11 19:54:30 2001
@@ -221,3 +221,4 @@
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
+"%-.32s@%-.64s is not allowed to create new users",

--- 1.33/sql/share/portuguese/errmsg.txt	Sat Aug 11 17:28:40 2001
+++ 1.34/sql/share/portuguese/errmsg.txt	Sat Aug 11 19:54:30 2001
@@ -217,3 +217,4 @@
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
+"%-.32s@%-.64s is not allowed to create new users",

--- 1.30/sql/share/romanian/errmsg.txt	Sat Aug 11 17:28:41 2001
+++ 1.31/sql/share/romanian/errmsg.txt	Sat Aug 11 19:54:30 2001
@@ -221,3 +221,4 @@
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
+"%-.32s@%-.64s is not allowed to create new users",

--- 1.32/sql/share/russian/errmsg.txt	Sat Aug 11 17:28:41 2001
+++ 1.33/sql/share/russian/errmsg.txt	Sat Aug 11 19:54:30 2001
@@ -220,3 +220,4 @@
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
+"%-.32s@%-.64s is not allowed to create new users",

--- 1.32/sql/share/slovak/errmsg.txt	Sat Aug 11 17:28:41 2001
+++ 1.33/sql/share/slovak/errmsg.txt	Sat Aug 11 19:54:31 2001
@@ -225,3 +225,4 @@
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
+"%-.32s@%-.64s is not allowed to create new users",

--- 1.33/sql/share/spanish/errmsg.txt	Sat Aug 11 17:28:41 2001
+++ 1.34/sql/share/spanish/errmsg.txt	Sat Aug 11 19:54:31 2001
@@ -218,3 +218,4 @@
 "Error de %s: %-128%",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
+"%-.32s@%-.64s is not allowed to create new users",

--- 1.32/sql/share/swedish/errmsg.txt	Sat Aug 11 17:28:41 2001
+++ 1.33/sql/share/swedish/errmsg.txt	Sat Aug 11 19:54:31 2001
@@ -217,3 +217,4 @@
 "SELECT kommandona har olika antal kolumner"
+"%-.32s@%-.64s is not allowed to create new users",

--- 1.27/sql/sql_acl.cc	Fri Aug 10 08:37:36 2001
+++ 1.28/sql/sql_acl.cc	Sat Aug 11 19:54:31 2001
@@ -1003,8 +1003,8 @@
 	my_printf_error(ER_NONEXISTING_GRANT,ER(ER_NONEXISTING_GRANT),
 			MYF(0),combo.user.str,combo.host.str);
       else
-	my_printf_error(ER_NO_PERMISSON_TO_CREATE_USER,
-			ER(ER_NO_PERMISSON_TO_CREATE_USER),
+	my_printf_error(ER_NO_PERMISSION_TO_CREATE_USER,
+			ER(ER_NO_PERMISSION_TO_CREATE_USER),
 			MYF(0),thd->user,
 			thd->host ? thd->host : thd->ip ? thd->ip: "");
       error= -1;

--- 1.6/mysql-test/r/order_by.result	Thu Aug  9 19:16:13 2001
+++ 1.7/mysql-test/r/order_by.result	Sat Aug 11 19:54:30 2001
@@ -111,31 +111,6 @@
 member_id	nickname	voornaam
 1		
 2		
-gid	sid	uid
-104620	5	15
-103867	5	27
-103962	5	27
-104619	5	75
-104505	5	117
-103853	5	250
-gid	sid	uid
-104620	5	15
-103867	5	27
-103962	5	27
-104619	5	75
-104505	5	117
-103853	5	250
-table	type	possible_keys	key	key_len	ref	rows	Extra
-t1	index	PRIMARY	PRIMARY	4	NULL	6	Using index
-t2	eq_ref	PRIMARY,uid	PRIMARY	4	t1.gid	1	
-t3	eq_ref	PRIMARY	PRIMARY	2	t2.uid	1	where used; Using index
-table	type	possible_keys	key	key_len	ref	rows	Extra
-t1	index	PRIMARY	PRIMARY	4	NULL	6	Using index
-t3	eq_ref	PRIMARY	PRIMARY	2	t1.gid	1	where used
-table	type	possible_keys	key	key_len	ref	rows	Extra
-t1	index	PRIMARY	PRIMARY	4	NULL	6	Using index; Using temporary; Using filesort
-t2	eq_ref	PRIMARY,uid	PRIMARY	4	t1.gid	1	
-t3	eq_ref	PRIMARY	PRIMARY	2	t2.uid	1	where used; Using index
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	range	a	a	20	NULL	2	where used; Using index
 a	b	c
@@ -252,3 +227,34 @@
 1	1	
 1	0	b
 1	0	
+gid	sid	uid
+104620	5	15
+103867	5	27
+103962	5	27
+104619	5	75
+104505	5	117
+103853	5	250
+gid	sid	uid
+104620	5	15
+103867	5	27
+103962	5	27
+104619	5	75
+104505	5	117
+103853	5	250
+table	type	possible_keys	key	key_len	ref	rows	Extra
+t1	index	PRIMARY	PRIMARY	4	NULL	6	Using index
+t2	eq_ref	PRIMARY,uid	PRIMARY	4	t1.gid	1	
+t3	eq_ref	PRIMARY	PRIMARY	2	t2.uid	1	where used; Using index
+table	type	possible_keys	key	key_len	ref	rows	Extra
+t1	index	PRIMARY	PRIMARY	4	NULL	6	Using index
+t3	eq_ref	PRIMARY	PRIMARY	2	t1.gid	1	where used
+table	type	possible_keys	key	key_len	ref	rows	Extra
+t1	index	PRIMARY	PRIMARY	4	NULL	6	Using index; Using temporary; Using filesort
+t2	eq_ref	PRIMARY,uid	PRIMARY	4	t1.gid	1	
+t3	eq_ref	PRIMARY	PRIMARY	2	t2.uid	1	where used; Using index
+table	type	possible_keys	key	key_len	ref	rows	Extra
+t1	index	PRIMARY	PRIMARY	4	NULL	6	Using index; Using temporary; Using filesort
+t3	eq_ref	PRIMARY	PRIMARY	2	t1.gid	1	where used
+table	type	possible_keys	key	key_len	ref	rows	Extra
+t1	ALL	NULL	NULL	NULL	NULL	6	Using temporary; Using filesort
+t3	eq_ref	PRIMARY	PRIMARY	2	t1.skr	1	where used
Thread
bk commit into 4.0 treesasha12 Aug