Skip to content

M
MariaDB
Commit 2aed7cf9 authored by unknown's avatar unknown
Browse files
Options

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


include/mysqld_error.h:
  fixed typo
mysql-test/r/order_by.result:
  updated result for merged test
sql/Makefile.am:
  put back sql_union.cc lost during merge
sql/mysql_priv.h:
  restored variables lost in the merge
sql/mysqld.cc:
  put back lost variable declarations
sql/share/czech/errmsg.txt:
  merge fix
sql/share/danish/errmsg.txt:
  merge fix
sql/share/dutch/errmsg.txt:
  merge fix
sql/share/english/errmsg.txt:
  merge fix
sql/share/estonian/errmsg.txt:
  merge fix
sql/share/french/errmsg.txt:
  merge fix
sql/share/german/errmsg.txt:
  merge fix
sql/share/greek/errmsg.txt:
  merge fix
sql/share/hungarian/errmsg.txt:
  merge fix
sql/share/italian/errmsg.txt:
  merge fix
sql/share/japanese/errmsg.txt:
  merge fix
sql/share/korean/errmsg.txt:
  merge fix
sql/share/norwegian-ny/errmsg.txt:
  merge fix
sql/share/norwegian/errmsg.txt:
  merge fix
sql/share/polish/errmsg.txt:
  merge fix
sql/share/portuguese/errmsg.txt:
  merge fix
sql/share/romanian/errmsg.txt:
  merge fix
sql/share/russian/errmsg.txt:
  merge fix
sql/share/slovak/errmsg.txt:
  merge fix
sql/share/spanish/errmsg.txt:
  merge fix
sql/share/swedish/errmsg.txt:
  merge fix
sql/sql_acl.cc:
  merge fix
parent c9dbb4b7
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 36 deletions
include/mysqld_error.h
View file @ 2aed7cf9
...@@ -216,5 +216,5 @@ ...@@ -216,5 +216,5 @@
#define ER_ERROR_WHEN_EXECUTING_COMMAND 1213 #define ER_ERROR_WHEN_EXECUTING_COMMAND 1213
#define ER_WRONG_USAGE 1214 #define ER_WRONG_USAGE 1214
#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1215 #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 #define ER_ERROR_MESSAGES 217
mysql-test/r/order_by.result
View file @ 2aed7cf9
...@@ -111,31 +111,6 @@ DateOfAction TransactionID ...@@ -111,31 +111,6 @@ DateOfAction TransactionID
member_id nickname voornaam member_id nickname voornaam
1 1
2 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 table type possible_keys key key_len ref rows Extra
t1 range a a 20 NULL 2 where used; Using index t1 range a a 20 NULL 2 where used; Using index
a b c a b c
...@@ -252,3 +227,34 @@ a b c ...@@ -252,3 +227,34 @@ a b c
1 1 1 1
1 0 b 1 0 b
1 0 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
sql/Makefile.am
View file @ 2aed7cf9
...@@ -80,9 +80,9 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \ ...@@ -80,9 +80,9 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \
sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \ 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_load.cc mf_iocache.cc field_conv.cc sql_show.cc \
sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.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 \ 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_SOURCES = gen_lex_hash.cc
gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS) gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS)
......
sql/mysql_priv.h
View file @ 2aed7cf9
...@@ -555,13 +555,14 @@ extern ulong keybuff_size,sortbuff_size,max_item_sort_length,table_cache_size, ...@@ -555,13 +555,14 @@ extern ulong keybuff_size,sortbuff_size,max_item_sort_length,table_cache_size,
max_insert_delayed_threads, max_user_connections, max_insert_delayed_threads, max_user_connections,
long_query_count,net_wait_timeout,net_interactive_timeout, long_query_count,net_wait_timeout,net_interactive_timeout,
net_read_timeout,net_write_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, max_tmp_tables,max_heap_table_size,query_buff_size,
lower_case_table_names,thread_stack,thread_stack_min, 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 ulong specialflag, current_pid;
extern bool low_priority_updates, using_update_log; 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 char language[LIBLEN],reg_ext[FN_EXTLEN],blob_newline;
extern const char **errmesg; /* Error messages */ extern const char **errmesg; /* Error messages */
extern const char *default_tx_isolation_name; extern const char *default_tx_isolation_name;
......
sql/mysqld.cc
View file @ 2aed7cf9
...@@ -223,7 +223,8 @@ static bool opt_log,opt_update_log,opt_bin_log,opt_slow_log,opt_noacl, ...@@ -223,7 +223,8 @@ static bool opt_log,opt_update_log,opt_bin_log,opt_slow_log,opt_noacl,
opt_myisam_log=0, opt_myisam_log=0,
opt_large_files=sizeof(my_off_t) > 4; opt_large_files=sizeof(my_off_t) > 4;
bool opt_sql_bin_update = 0, opt_log_slave_updates = 0, opt_safe_show_db=0, 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; FILE *bootstrap_file=0;
int segfaulted = 0; // ensure we do not enter SIGSEGV handler twice int segfaulted = 0; // ensure we do not enter SIGSEGV handler twice
extern MASTER_INFO glob_mi; extern MASTER_INFO glob_mi;
...@@ -271,7 +272,7 @@ ulong keybuff_size,sortbuff_size,max_item_sort_length,table_cache_size, ...@@ -271,7 +272,7 @@ ulong keybuff_size,sortbuff_size,max_item_sort_length,table_cache_size,
query_buff_size, lower_case_table_names, mysqld_net_retry_count, query_buff_size, lower_case_table_names, mysqld_net_retry_count,
net_interactive_timeout, slow_launch_time = 2L, net_interactive_timeout, slow_launch_time = 2L,
net_read_timeout,net_write_timeout,slave_open_temp_tables=0, 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 slave_net_timeout;
ulong thread_cache_size=0, binlog_cache_size=0, max_binlog_cache_size=0; ulong thread_cache_size=0, binlog_cache_size=0, max_binlog_cache_size=0;
volatile ulong cached_thread_count=0; volatile ulong cached_thread_count=0;
...@@ -2531,7 +2532,7 @@ enum options { ...@@ -2531,7 +2532,7 @@ enum options {
OPT_REPORT_USER, OPT_REPORT_PASSWORD, OPT_REPORT_PORT, OPT_REPORT_USER, OPT_REPORT_PASSWORD, OPT_REPORT_PORT,
OPT_MAX_BINLOG_DUMP_EVENTS, OPT_SPORADIC_BINLOG_DUMP_FAIL, OPT_MAX_BINLOG_DUMP_EVENTS, OPT_SPORADIC_BINLOG_DUMP_FAIL,
OPT_SHOW_SLAVE_AUTH_INFO, OPT_OLD_RPL_COMPAT, OPT_SHOW_SLAVE_AUTH_INFO, OPT_OLD_RPL_COMPAT,
OPT_SQL_MODE, OPT_SQL_MODE,OPT_SAFE_USER_CREATE,
OPT_SLAVE_LOAD_TMPDIR}; OPT_SLAVE_LOAD_TMPDIR};
static struct option long_options[] = { static struct option long_options[] = {
......
sql/share/czech/errmsg.txt
View file @ 2aed7cf9
...@@ -226,3 +226,4 @@ ...@@ -226,3 +226,4 @@
"Error when executing command %s: %-.128s", "Error when executing command %s: %-.128s",
"Wrong usage of %s and %s", "Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns", "The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",
sql/share/danish/errmsg.txt
View file @ 2aed7cf9
...@@ -220,3 +220,4 @@ ...@@ -220,3 +220,4 @@
"Error when executing command %s: %-.128s", "Error when executing command %s: %-.128s",
"Wrong usage of %s and %s", "Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns", "The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",
sql/share/dutch/errmsg.txt
View file @ 2aed7cf9
...@@ -217,3 +217,4 @@ ...@@ -217,3 +217,4 @@
"Error when executing command %s: %-.128s", "Error when executing command %s: %-.128s",
"Wrong usage of %s and %s", "Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns", "The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",
sql/share/english/errmsg.txt
View file @ 2aed7cf9
...@@ -217,3 +217,4 @@ ...@@ -217,3 +217,4 @@
"Error when executing command %s: %-.128s", "Error when executing command %s: %-.128s",
"Wrong usage of %s and %s", "Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns", "The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",
sql/share/estonian/errmsg.txt
View file @ 2aed7cf9
...@@ -221,3 +221,4 @@ ...@@ -221,3 +221,4 @@
"Error when executing command %s: %-.128s", "Error when executing command %s: %-.128s",
"Wrong usage of %s and %s", "Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns", "The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",
sql/share/french/errmsg.txt
View file @ 2aed7cf9
...@@ -217,3 +217,4 @@ ...@@ -217,3 +217,4 @@
"Error when executing command %s: %-.128s", "Error when executing command %s: %-.128s",
"Wrong usage of %s and %s", "Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns", "The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",
sql/share/german/errmsg.txt
View file @ 2aed7cf9
...@@ -220,3 +220,4 @@ ...@@ -220,3 +220,4 @@
"Error when executing command %s: %-.128s", "Error when executing command %s: %-.128s",
"Wrong usage of %s and %s", "Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns", "The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",
sql/share/greek/errmsg.txt
View file @ 2aed7cf9
...@@ -217,3 +217,4 @@ ...@@ -217,3 +217,4 @@
"Error when executing command %s: %-.128s", "Error when executing command %s: %-.128s",
"Wrong usage of %s and %s", "Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns", "The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",
sql/share/hungarian/errmsg.txt
View file @ 2aed7cf9
...@@ -219,3 +219,4 @@ ...@@ -219,3 +219,4 @@
"Error when executing command %s: %-.128s", "Error when executing command %s: %-.128s",
"Wrong usage of %s and %s", "Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns", "The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",
sql/share/italian/errmsg.txt
View file @ 2aed7cf9
...@@ -217,3 +217,4 @@ ...@@ -217,3 +217,4 @@
"Error when executing command %s: %-.128s", "Error when executing command %s: %-.128s",
"Wrong usage of %s and %s", "Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns", "The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",
sql/share/japanese/errmsg.txt
View file @ 2aed7cf9
...@@ -219,3 +219,4 @@ ...@@ -219,3 +219,4 @@
"Error when executing command %s: %-.128s", "Error when executing command %s: %-.128s",
"Wrong usage of %s and %s", "Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns", "The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",
sql/share/korean/errmsg.txt
View file @ 2aed7cf9
...@@ -217,3 +217,4 @@ ...@@ -217,3 +217,4 @@
"Error when executing command %s: %-.128s", "Error when executing command %s: %-.128s",
"Wrong usage of %s and %s", "Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns", "The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",
sql/share/norwegian-ny/errmsg.txt
View file @ 2aed7cf9
...@@ -219,3 +219,4 @@ ...@@ -219,3 +219,4 @@
"Error when executing command %s: %-.128s", "Error when executing command %s: %-.128s",
"Wrong usage of %s and %s", "Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns", "The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",
sql/share/norwegian/errmsg.txt
View file @ 2aed7cf9
...@@ -219,3 +219,4 @@ ...@@ -219,3 +219,4 @@
"Error when executing command %s: %-.128s", "Error when executing command %s: %-.128s",
"Wrong usage of %s and %s", "Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns", "The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",
sql/share/polish/errmsg.txt
View file @ 2aed7cf9
...@@ -221,3 +221,4 @@ ...@@ -221,3 +221,4 @@
"Error when executing command %s: %-.128s", "Error when executing command %s: %-.128s",
"Wrong usage of %s and %s", "Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns", "The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",
sql/share/portuguese/errmsg.txt
View file @ 2aed7cf9
...@@ -217,3 +217,4 @@ ...@@ -217,3 +217,4 @@
"Error when executing command %s: %-.128s", "Error when executing command %s: %-.128s",
"Wrong usage of %s and %s", "Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns", "The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",
sql/share/romanian/errmsg.txt
View file @ 2aed7cf9
...@@ -221,3 +221,4 @@ ...@@ -221,3 +221,4 @@
"Error when executing command %s: %-.128s", "Error when executing command %s: %-.128s",
"Wrong usage of %s and %s", "Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns", "The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",
sql/share/russian/errmsg.txt
View file @ 2aed7cf9
...@@ -220,3 +220,4 @@ ...@@ -220,3 +220,4 @@
"Error when executing command %s: %-.128s", "Error when executing command %s: %-.128s",
"Wrong usage of %s and %s", "Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns", "The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",
sql/share/slovak/errmsg.txt
View file @ 2aed7cf9
...@@ -225,3 +225,4 @@ ...@@ -225,3 +225,4 @@
"Error when executing command %s: %-.128s", "Error when executing command %s: %-.128s",
"Wrong usage of %s and %s", "Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns", "The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",
sql/share/spanish/errmsg.txt
View file @ 2aed7cf9
...@@ -218,3 +218,4 @@ ...@@ -218,3 +218,4 @@
"Error de %s: %-128%", "Error de %s: %-128%",
"Wrong usage of %s and %s", "Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns", "The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",
sql/share/swedish/errmsg.txt
View file @ 2aed7cf9
...@@ -217,3 +217,4 @@ ...@@ -217,3 +217,4 @@
"Fick fel vid utförande av %s: %-.128s", "Fick fel vid utförande av %s: %-.128s",
"Felaktig använding av %s and %s", "Felaktig använding av %s and %s",
"SELECT kommandona har olika antal kolumner" "SELECT kommandona har olika antal kolumner"
"%-.32s@%-.64s is not allowed to create new users",
sql/sql_acl.cc
View file @ 2aed7cf9
...@@ -1003,8 +1003,8 @@ static int replace_user_table(TABLE *table, const LEX_USER &combo, ...@@ -1003,8 +1003,8 @@ static int replace_user_table(TABLE *table, const LEX_USER &combo,
my_printf_error(ER_NONEXISTING_GRANT,ER(ER_NONEXISTING_GRANT), my_printf_error(ER_NONEXISTING_GRANT,ER(ER_NONEXISTING_GRANT),
MYF(0),combo.user.str,combo.host.str); MYF(0),combo.user.str,combo.host.str);
else else
my_printf_error(ER_NO_PERMISSON_TO_CREATE_USER, my_printf_error(ER_NO_PERMISSION_TO_CREATE_USER,
ER(ER_NO_PERMISSON_TO_CREATE_USER), ER(ER_NO_PERMISSION_TO_CREATE_USER),
MYF(0),thd->user, MYF(0),thd->user,
thd->host ? thd->host : thd->ip ? thd->ip: ""); thd->host ? thd->host : thd->ip ? thd->ip: "");
error= -1; error= -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7