Skip to content

M
MariaDB
Commit 9f22d166 authored by unknown's avatar unknown
Browse files
Options

Give warning if MySQL doesn't honor given storage engine 

Allow syntax CREATE TABLE t1 (LIKE t2)


BUILD/compile-pentium-debug-max:
  Disable isam
BUILD/compile-pentium-valgrind-max:
  Disable isam
include/mysqld_error.h:
  New error
mysql-test/r/bdb.result:
  new error message
mysql-test/r/innodb.result:
  new error message
mysql-test/r/subselect.result:
  New test
mysql-test/r/variables.result:
  New test
mysql-test/r/warnings.result:
  Test of warning if MySQL creates table with another handler than specified
mysql-test/t/innodb.test:
  Added test case for derivied tables
mysql-test/t/subselect.test:
  New test
mysql-test/t/variables-master.opt:
  Fixed wrong parameter
mysql-test/t/warnings.test:
  Test if creating handler of not existing table type
sql/ha_isam.cc:
  Added option --skip-isam
sql/ha_isam.h:
  Added option --skip-isam
sql/handler.cc:
  Added option --skip-isam
sql/item.cc:
  Deleted probably wrong bug fix
sql/mysqld.cc:
  Added option --skip-isam
sql/share/czech/errmsg.txt:
  Added missing ','
sql/share/danish/errmsg.txt:
  Added missing ','
sql/share/dutch/errmsg.txt:
  Added missing ','
sql/share/english/errmsg.txt:
  Added missing ','
  changed table handler -> storage engine
sql/share/estonian/errmsg.txt:
  Added missing ','
sql/share/french/errmsg.txt:
  Added missing ','
sql/share/german/errmsg.txt:
  Added missing ','
sql/share/greek/errmsg.txt:
  Added missing ','
sql/share/hungarian/errmsg.txt:
  Added missing ','
sql/share/italian/errmsg.txt:
  Added missing ','
sql/share/japanese/errmsg.txt:
  Added missing ','
sql/share/korean/errmsg.txt:
  Added missing ','
sql/share/norwegian-ny/errmsg.txt:
  Added missing ','
sql/share/norwegian/errmsg.txt:
  Added missing ','
sql/share/polish/errmsg.txt:
  Added missing ','
sql/share/portuguese/errmsg.txt:
  Added missing ','
sql/share/romanian/errmsg.txt:
  Added missing ','
sql/share/russian/errmsg.txt:
  Added missing ','
sql/share/serbian/errmsg.txt:
  Added missing ','
sql/share/slovak/errmsg.txt:
  Added missing ','
sql/share/spanish/errmsg.txt:
  Added missing ','
sql/share/swedish/errmsg.txt:
  Added missing ','
sql/share/ukrainian/errmsg.txt:
  Added missing ','
sql/sql_acl.cc:
  Fix bug in access checking of derived tables
sql/sql_base.cc:
  Indentation change
sql/sql_parse.cc:
  Fix bug in access checking of derived tables
sql/sql_select.cc:
  Fixed bug in new sub select optimization
sql/sql_table.cc:
  Give warning if MySQL doesn't honor given storage engine
sql/sql_yacc.yy:
  Allow syntax CREATE TABLE t1 (LIKE t2).
parent 1785df1e
Hide whitespace changes
Inline Side-by-side
Showing with 462 additions and 304 deletions
BUILD/compile-pentium-debug-max
View file @ 9f22d166
...@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings" ...@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_warnings $debug_extra_warnings" cxx_warnings="$cxx_warnings $debug_extra_warnings"
extra_configs="$pentium_configs $debug_configs" extra_configs="$pentium_configs $debug_configs"
extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-embedded-server --with-openssl" extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-embedded-server --with-openssl"
. "$path/FINISH.sh" . "$path/FINISH.sh"
BUILD/compile-pentium-valgrind-max
View file @ 9f22d166
...@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings" ...@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_warnings $debug_extra_warnings" cxx_warnings="$cxx_warnings $debug_extra_warnings"
extra_configs="$pentium_configs $debug_configs" extra_configs="$pentium_configs $debug_configs"
extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-embedded-server --with-openssl" extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-embedded-server --with-openssl"
. "$path/FINISH.sh" . "$path/FINISH.sh"
include/mysqld_error.h
View file @ 9f22d166
...@@ -275,5 +275,5 @@ ...@@ -275,5 +275,5 @@
#define ER_ZLIB_Z_BUF_ERROR 1256 #define ER_ZLIB_Z_BUF_ERROR 1256
#define ER_ZLIB_Z_DATA_ERROR 1257 #define ER_ZLIB_Z_DATA_ERROR 1257
#define ER_CUT_VALUE_GROUP_CONCAT 1258 #define ER_CUT_VALUE_GROUP_CONCAT 1258
#define ER_WARN_USING_OTHER_HANDLER 1259
#define ER_ERROR_MESSAGES 259 #define ER_ERROR_MESSAGES 259
mysql-test/r/bdb.result
View file @ 9f22d166
...@@ -203,7 +203,7 @@ a ...@@ -203,7 +203,7 @@ a
2 2
check table t1; check table t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 check error The handler for the table doesn't support check test.t1 check error The storage enginge for the table doesn't support check
drop table t1; drop table t1;
create table t1 (a int,b varchar(20)) type=bdb; create table t1 (a int,b varchar(20)) type=bdb;
insert into t1 values (1,""), (2,"testing"); insert into t1 values (1,""), (2,"testing");
......
mysql-test/r/innodb.result
View file @ 9f22d166
...@@ -165,7 +165,7 @@ level id parent_id ...@@ -165,7 +165,7 @@ level id parent_id
1 1007 101 1 1007 101
optimize table t1; optimize table t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 optimize error The handler for the table doesn't support optimize test.t1 optimize error The storage enginge for the table doesn't support optimize
show keys from t1; show keys from t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t1 0 PRIMARY 1 id A # NULL NULL BTREE t1 0 PRIMARY 1 id A # NULL NULL BTREE
...@@ -189,7 +189,7 @@ create table t1 (a int) type=innodb; ...@@ -189,7 +189,7 @@ create table t1 (a int) type=innodb;
insert into t1 values (1), (2); insert into t1 values (1), (2);
optimize table t1; optimize table t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 optimize error The handler for the table doesn't support optimize test.t1 optimize error The storage enginge for the table doesn't support optimize
delete from t1 where a = 1; delete from t1 where a = 1;
select * from t1; select * from t1;
a a
...@@ -208,7 +208,7 @@ create index skr on t1 (a); ...@@ -208,7 +208,7 @@ create index skr on t1 (a);
insert into t1 values (3,""), (4,"testing"); insert into t1 values (3,""), (4,"testing");
analyze table t1; analyze table t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 analyze error The handler for the table doesn't support analyze test.t1 analyze error The storage enginge for the table doesn't support analyze
show keys from t1; show keys from t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t1 1 skr 1 a A 3 NULL NULL YES BTREE t1 1 skr 1 a A 3 NULL NULL YES BTREE
...@@ -724,7 +724,7 @@ world 2 ...@@ -724,7 +724,7 @@ world 2
hello 1 hello 1
optimize table t1; optimize table t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 optimize error The handler for the table doesn't support optimize test.t1 optimize error The storage enginge for the table doesn't support optimize
show keys from t1; show keys from t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t1 0 PRIMARY 1 a A 2 NULL NULL BTREE t1 0 PRIMARY 1 a A 2 NULL NULL BTREE
...@@ -800,7 +800,7 @@ id id3 ...@@ -800,7 +800,7 @@ id id3
UNLOCK TABLES; UNLOCK TABLES;
DROP TABLE t1; DROP TABLE t1;
create table t1 (a char(20), unique (a(5))) type=innodb; create table t1 (a char(20), unique (a(5))) type=innodb;
Incorrect sub part key. The used key part isn't a string, the used length is longer than the key part or the table handler doesn't support unique sub keys Incorrect sub part key. The used key part isn't a string, the used length is longer than the key part or the store engine doesn't support unique sub keys
create table t1 (a char(20), index (a(5))) type=innodb; create table t1 (a char(20), index (a(5))) type=innodb;
show create table t1; show create table t1;
Table Create Table Table Create Table
...@@ -1215,3 +1215,32 @@ col1 ...@@ -1215,3 +1215,32 @@ col1
2 2
3 3
drop table t1,t2; drop table t1,t2;
CREATE TABLE t1 (
`id` int(10) unsigned NOT NULL auto_increment,
`id_object` int(10) unsigned default '0',
`id_version` int(10) unsigned NOT NULL default '1',
label varchar(100) NOT NULL default '',
`description` text,
PRIMARY KEY (`id`),
KEY `id_object` (`id_object`),
KEY `id_version` (`id_version`)
) TYPE=InnoDB;
INSERT INTO t1 VALUES("6", "3382", "9", "Test", NULL), ("7", "102", "5", "Le Pekin (Test)", NULL),("584", "1794", "4", "Test de resto", NULL),("837", "1822", "6", "Test 3", NULL),("1119", "3524", "1", "Societe Test", NULL),("1122", "3525", "1", "Fournisseur Test", NULL);
CREATE TABLE t2 (
`id` int(10) unsigned NOT NULL auto_increment,
`id_version` int(10) unsigned NOT NULL default '1',
PRIMARY KEY (`id`),
KEY `id_version` (`id_version`)
) TYPE=InnoDB;
INSERT INTO t2 VALUES("3524", "1"),("3525", "1"),("1794", "4"),("102", "5"),("1822", "6"),("3382", "9");
SELECT t2.id, t1.label FROM t2 INNER JOIN
(SELECT t1.id_object as id_object FROM t1 WHERE t1.label LIKE '%test%') AS lbl
ON (t2.id = lbl.id_object) INNER JOIN t1 ON (t2.id = t1.id_object);
id label
3382 Fournisseur Test
102 Fournisseur Test
1794 Fournisseur Test
1822 Fournisseur Test
3524 Fournisseur Test
3525 Fournisseur Test
drop table t1,t2;
mysql-test/r/subselect.result
View file @ 9f22d166
...@@ -1093,6 +1093,8 @@ UPDATE t1 SET i=i+(SELECT MAX(i) FROM (SELECT 1) t) WHERE i=(SELECT MAX(i)); ...@@ -1093,6 +1093,8 @@ UPDATE t1 SET i=i+(SELECT MAX(i) FROM (SELECT 1) t) WHERE i=(SELECT MAX(i));
Invalid use of group function Invalid use of group function
UPDATE t1 SET i=i+1 WHERE i=(SELECT MAX(i)); UPDATE t1 SET i=i+1 WHERE i=(SELECT MAX(i));
Invalid use of group function Invalid use of group function
UPDATE t1 SET t.i=i+(SELECT MAX(i) FROM (SELECT 1) t);
Unknown table 't' in field list
drop table t1; drop table t1;
CREATE TABLE t1 ( CREATE TABLE t1 (
id int(11) default NULL id int(11) default NULL
......
mysql-test/r/variables.result
View file @ 9f22d166
...@@ -50,7 +50,7 @@ Variable_name Value ...@@ -50,7 +50,7 @@ Variable_name Value
max_join_size 100 max_join_size 100
show global variables like 'max_join_size'; show global variables like 'max_join_size';
Variable_name Value Variable_name Value
max_join_size HA_POS_ERROR max_join_size 10
set GLOBAL max_join_size=2000; set GLOBAL max_join_size=2000;
show global variables like 'max_join_size'; show global variables like 'max_join_size';
Variable_name Value Variable_name Value
......
mysql-test/r/warnings.result
View file @ 9f22d166
...@@ -30,3 +30,11 @@ create table if not exists t1(id int); ...@@ -30,3 +30,11 @@ create table if not exists t1(id int);
select @@warning_count; select @@warning_count;
@@warning_count @@warning_count
0 0
drop table t1;
create table t1 (id int) type=isam;
Warnings:
Warning 1259 Using storage engine MYISAM for table 't1'
alter table t1 type=isam;
Warnings:
Warning 1259 Using storage engine MYISAM for table 't1'
drop table t1;
mysql-test/t/innodb.test
View file @ 9f22d166
...@@ -813,3 +813,34 @@ insert into t2 values (1, 20020204130000),(2, 20020204130000),(4,20020204310000 ...@@ -813,3 +813,34 @@ insert into t2 values (1, 20020204130000),(2, 20020204130000),(4,20020204310000
SELECT col1 FROM t1 UNION SELECT col1 FROM t2 WHERE stamp < SELECT col1 FROM t1 UNION SELECT col1 FROM t2 WHERE stamp <
'20020204120000' GROUP BY col1; '20020204120000' GROUP BY col1;
drop table t1,t2; drop table t1,t2;
#
# Test by Francois MASUREL
#
CREATE TABLE t1 (
`id` int(10) unsigned NOT NULL auto_increment,
`id_object` int(10) unsigned default '0',
`id_version` int(10) unsigned NOT NULL default '1',
label varchar(100) NOT NULL default '',
`description` text,
PRIMARY KEY (`id`),
KEY `id_object` (`id_object`),
KEY `id_version` (`id_version`)
) TYPE=InnoDB;
INSERT INTO t1 VALUES("6", "3382", "9", "Test", NULL), ("7", "102", "5", "Le Pekin (Test)", NULL),("584", "1794", "4", "Test de resto", NULL),("837", "1822", "6", "Test 3", NULL),("1119", "3524", "1", "Societe Test", NULL),("1122", "3525", "1", "Fournisseur Test", NULL);
CREATE TABLE t2 (
`id` int(10) unsigned NOT NULL auto_increment,
`id_version` int(10) unsigned NOT NULL default '1',
PRIMARY KEY (`id`),
KEY `id_version` (`id_version`)
) TYPE=InnoDB;
INSERT INTO t2 VALUES("3524", "1"),("3525", "1"),("1794", "4"),("102", "5"),("1822", "6"),("3382", "9");
SELECT t2.id, t1.label FROM t2 INNER JOIN
(SELECT t1.id_object as id_object FROM t1 WHERE t1.label LIKE '%test%') AS lbl
ON (t2.id = lbl.id_object) INNER JOIN t1 ON (t2.id = t1.id_object);
drop table t1,t2;
mysql-test/t/subselect.test
View file @ 9f22d166
...@@ -678,6 +678,8 @@ INSERT INTO t1 VALUES (1); ...@@ -678,6 +678,8 @@ INSERT INTO t1 VALUES (1);
UPDATE t1 SET i=i+(SELECT MAX(i) FROM (SELECT 1) t) WHERE i=(SELECT MAX(i)); UPDATE t1 SET i=i+(SELECT MAX(i) FROM (SELECT 1) t) WHERE i=(SELECT MAX(i));
-- error 1111 -- error 1111
UPDATE t1 SET i=i+1 WHERE i=(SELECT MAX(i)); UPDATE t1 SET i=i+1 WHERE i=(SELECT MAX(i));
--error 1109
UPDATE t1 SET t.i=i+(SELECT MAX(i) FROM (SELECT 1) t);
drop table t1; drop table t1;
# #
......
mysql-test/t/warnings.test
View file @ 9f22d166
...@@ -26,3 +26,8 @@ show count(*) warnings; ...@@ -26,3 +26,8 @@ show count(*) warnings;
create table t1(id int); create table t1(id int);
create table if not exists t1(id int); create table if not exists t1(id int);
select @@warning_count; select @@warning_count;
drop table t1;
create table t1 (id int) type=isam;
alter table t1 type=isam;
drop table t1;
sql/ha_isam.cc
View file @ 9f22d166
...@@ -34,10 +34,11 @@ ...@@ -34,10 +34,11 @@
** isam tables ** isam tables
*****************************************************************************/ *****************************************************************************/
bool isam_skip;
const char **ha_isam::bas_ext() const const char **ha_isam::bas_ext() const
{ static const char *ext[]= { ".ISM",".ISD", NullS }; return ext; } { static const char *ext[]= { ".ISM",".ISD", NullS }; return ext; }
int ha_isam::open(const char *name, int mode, uint test_if_locked) int ha_isam::open(const char *name, int mode, uint test_if_locked)
{ {
char name_buff[FN_REFLEN]; char name_buff[FN_REFLEN];
......
sql/ha_isam.h
View file @ 9f22d166
...@@ -81,3 +81,5 @@ class ha_isam: public handler ...@@ -81,3 +81,5 @@ class ha_isam: public handler
THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to, THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
enum thr_lock_type lock_type); enum thr_lock_type lock_type);
}; };
extern bool isam_skip;
sql/handler.cc
View file @ 9f22d166
...@@ -88,7 +88,12 @@ enum db_type ha_checktype(enum db_type database_type) ...@@ -88,7 +88,12 @@ enum db_type ha_checktype(enum db_type database_type)
#endif #endif
#ifdef HAVE_ISAM #ifdef HAVE_ISAM
case DB_TYPE_ISAM: case DB_TYPE_ISAM:
return (isam_skip ? DB_TYPE_MYISAM : database_type);
case DB_TYPE_MRG_ISAM: case DB_TYPE_MRG_ISAM:
return (isam_skip ? DB_TYPE_MRG_MYISAM : database_type);
#else
case DB_TYPE_MRG_ISAM:
return (DB_TYPE_MRG_MYISAM);
#endif #endif
case DB_TYPE_HEAP: case DB_TYPE_HEAP:
case DB_TYPE_MYISAM: case DB_TYPE_MYISAM:
...@@ -112,6 +117,9 @@ handler *get_new_handler(TABLE *table, enum db_type db_type) ...@@ -112,6 +117,9 @@ handler *get_new_handler(TABLE *table, enum db_type db_type)
return new ha_isammrg(table); return new ha_isammrg(table);
case DB_TYPE_ISAM: case DB_TYPE_ISAM:
return new ha_isam(table); return new ha_isam(table);
#else
case DB_TYPE_MRG_ISAM:
return new ha_myisammrg(table);
#endif #endif
#ifdef HAVE_BERKELEY_DB #ifdef HAVE_BERKELEY_DB
case DB_TYPE_BERKELEY_DB: case DB_TYPE_BERKELEY_DB:
......
sql/item.cc
View file @ 9f22d166
...@@ -772,10 +772,9 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) ...@@ -772,10 +772,9 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
(last= sl)->get_table_list(), &where, (last= sl)->get_table_list(), &where,
0)) != not_found_field) 0)) != not_found_field)
break; break;
if (sl->item_list.elements && if ((refer= find_item_in_list(this, sl->item_list, &counter,
((refer= find_item_in_list(this, sl->item_list, &counter,
REPORT_EXCEPT_NOT_FOUND)) != REPORT_EXCEPT_NOT_FOUND)) !=
(Item **)not_found_item)) (Item **) not_found_item)
break; break;
if (sl->master_unit()->first_select()->linkage == if (sl->master_unit()->first_select()->linkage ==
DERIVED_TABLE_TYPE) DERIVED_TABLE_TYPE)
......
sql/mysqld.cc
View file @ 9f22d166
...@@ -314,7 +314,7 @@ my_bool opt_safe_user_create = 0, opt_no_mix_types = 0; ...@@ -314,7 +314,7 @@ my_bool opt_safe_user_create = 0, opt_no_mix_types = 0;
my_bool lower_case_table_names, opt_old_rpl_compat; my_bool lower_case_table_names, opt_old_rpl_compat;
my_bool opt_show_slave_auth_info, opt_sql_bin_update = 0; my_bool opt_show_slave_auth_info, opt_sql_bin_update = 0;
my_bool opt_log_slave_updates= 0, opt_old_passwords=0, use_old_passwords=0; my_bool opt_log_slave_updates= 0, opt_old_passwords=0, use_old_passwords=0;
my_bool opt_console= 0, opt_bdb, opt_innodb; my_bool opt_console= 0, opt_bdb, opt_innodb, opt_isam;
volatile bool mqh_used = 0; volatile bool mqh_used = 0;
FILE *bootstrap_file=0; FILE *bootstrap_file=0;
...@@ -3431,7 +3431,7 @@ enum options ...@@ -3431,7 +3431,7 @@ enum options
OPT_INNODB_FLUSH_METHOD, OPT_INNODB_FLUSH_METHOD,
OPT_INNODB_FAST_SHUTDOWN, OPT_INNODB_FAST_SHUTDOWN,
OPT_SAFE_SHOW_DB, OPT_SAFE_SHOW_DB,
OPT_INNODB, OPT_SKIP_SAFEMALLOC, OPT_INNODB, OPT_ISAM, OPT_SKIP_SAFEMALLOC,
OPT_TEMP_POOL, OPT_TX_ISOLATION, OPT_TEMP_POOL, OPT_TX_ISOLATION,
OPT_SKIP_STACK_TRACE, OPT_SKIP_SYMLINKS, OPT_SKIP_STACK_TRACE, OPT_SKIP_SYMLINKS,
OPT_MAX_BINLOG_DUMP_EVENTS, OPT_SPORADIC_BINLOG_DUMP_FAIL, OPT_MAX_BINLOG_DUMP_EVENTS, OPT_SPORADIC_BINLOG_DUMP_FAIL,
...@@ -3892,6 +3892,10 @@ Disable with --skip-bdb (will save memory)", ...@@ -3892,6 +3892,10 @@ Disable with --skip-bdb (will save memory)",
Disable with --skip-innodb (will save memory)", Disable with --skip-innodb (will save memory)",
(gptr*) &opt_innodb, (gptr*) &opt_innodb, 0, GET_BOOL, NO_ARG, 1, 0, 0, (gptr*) &opt_innodb, (gptr*) &opt_innodb, 0, GET_BOOL, NO_ARG, 1, 0, 0,
0, 0, 0}, 0, 0, 0},
{"isam", OPT_ISAM, "Enable isam (if this version of MySQL supports it). \
Disable with --skip-isam",
(gptr*) &opt_isam, (gptr*) &opt_isam, 0, GET_BOOL, NO_ARG, 1, 0, 0,
0, 0, 0},
{"skip-locking", OPT_SKIP_LOCK, {"skip-locking", OPT_SKIP_LOCK,
"Deprecated option, use --skip-external-locking instead", "Deprecated option, use --skip-external-locking instead",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
...@@ -5043,6 +5047,20 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), ...@@ -5043,6 +5047,20 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
berkeley_skip=1; berkeley_skip=1;
have_berkeley_db=SHOW_OPTION_DISABLED; have_berkeley_db=SHOW_OPTION_DISABLED;
} }
#endif
break;
case OPT_ISAM:
#ifdef HAVE_ISAM
if (opt_isam)
{
isam_skip=0;
isam_innodb=SHOW_OPTION_YES;
}
else
{
isam_skip=1;
isam_innodb=SHOW_OPTION_DISABLED;
}
#endif #endif
break; break;
case OPT_INNODB: case OPT_INNODB:
......
sql/share/czech/errmsg.txt
View file @ 9f22d166
...@@ -256,16 +256,17 @@ v/* ...@@ -256,16 +256,17 @@ v/*
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s", "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)", "Reference '%-.64s' not supported (%s)",
"Every derived table must have it's own alias" "Every derived table must have it's own alias",
"Select %u was reduced during optimisation", "Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s" "Table '%-.64s' from one of SELECT's can not be used in %-.32s",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" "Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL" "All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'" "COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running" "The slave was already running",
"The slave was already stopped" "The slave was already stopped",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()" "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'",
sql/share/danish/errmsg.txt
View file @ 9f22d166
...@@ -250,16 +250,17 @@ ...@@ -250,16 +250,17 @@
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s", "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)", "Reference '%-.64s' not supported (%s)",
"Every derived table must have it's own alias" "Every derived table must have it's own alias",
"Select %u was reduced during optimisation", "Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s" "Table '%-.64s' from one of SELECT's can not be used in %-.32s",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" "Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL" "All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'" "COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running" "The slave was already running",
"The slave was already stopped" "The slave was already stopped",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()" "%d line(s) was(were) cut by group_concat()",
\ No newline at end of file "Using storage engine %s for table '%s'",
sql/share/dutch/errmsg.txt
View file @ 9f22d166
...@@ -258,16 +258,17 @@ ...@@ -258,16 +258,17 @@
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s", "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)", "Reference '%-.64s' not supported (%s)",
"Every derived table must have it's own alias" "Every derived table must have it's own alias",
"Select %u was reduced during optimisation", "Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s" "Table '%-.64s' from one of SELECT's can not be used in %-.32s",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" "Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL" "All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'" "COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running" "The slave was already running",
"The slave was already stopped" "The slave was already stopped",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()" "%d line(s) was(were) cut by group_concat()",
\ No newline at end of file "Using storage engine %s for table '%s'",
sql/share/english/errmsg.txt
View file @ 9f22d166
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
"'%-.64s' is locked against change", "'%-.64s' is locked against change",
"Sort aborted", "Sort aborted",
"View '%-.64s' doesn't exist for '%-.64s'", "View '%-.64s' doesn't exist for '%-.64s'",
"Got error %d from table handler", "Got error %d from storage engine",
"Table handler for '%-.64s' doesn't have this option", "Table storage engine for '%-.64s' doesn't have this option",
"Can't find record in '%-.64s'", "Can't find record in '%-.64s'",
"Incorrect information in file: '%-.64s'", "Incorrect information in file: '%-.64s'",
"Incorrect key file for table: '%-.64s'. Try to repair it", "Incorrect key file for table: '%-.64s'. Try to repair it",
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
"File '%-.80s' already exists", "File '%-.80s' already exists",
"Records: %ld Deleted: %ld Skipped: %ld Warnings: %ld", "Records: %ld Deleted: %ld Skipped: %ld Warnings: %ld",
"Records: %ld Duplicates: %ld", "Records: %ld Duplicates: %ld",
"Incorrect sub part key. The used key part isn't a string, the used length is longer than the key part or the table handler doesn't support unique sub keys", "Incorrect sub part key. The used key part isn't a string, the used length is longer than the key part or the store engine doesn't support unique sub keys",
"You can't delete all columns with ALTER TABLE. Use DROP TABLE instead", "You can't delete all columns with ALTER TABLE. Use DROP TABLE instead",
"Can't DROP '%-.64s'. Check that column/key exists", "Can't DROP '%-.64s'. Check that column/key exists",
"Records: %ld Duplicates: %ld Warnings: %ld", "Records: %ld Duplicates: %ld Warnings: %ld",
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
"The used table type doesn't support AUTO_INCREMENT columns", "The used table type doesn't support AUTO_INCREMENT columns",
"INSERT DELAYED can't be used with table '%-.64s' because it is locked with LOCK TABLES", "INSERT DELAYED can't be used with table '%-.64s' because it is locked with LOCK TABLES",
"Incorrect column name '%-.100s'", "Incorrect column name '%-.100s'",
"The used table handler can't index column '%-.64s'", "The used storage engine can't index column '%-.64s'",
"All tables in the MERGE table are not identically defined", "All tables in the MERGE table are not identically defined",
"Can't write, because of unique constraint, to table '%-.64s'", "Can't write, because of unique constraint, to table '%-.64s'",
"BLOB column '%-.64s' used in key specification without a key length", "BLOB column '%-.64s' used in key specification without a key length",
...@@ -179,14 +179,14 @@ ...@@ -179,14 +179,14 @@
"You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column", "You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column",
"Key '%-.64s' doesn't exist in table '%-.64s'", "Key '%-.64s' doesn't exist in table '%-.64s'",
"Can't open table", "Can't open table",
"The handler for the table doesn't support %s", "The storage enginge for the table doesn't support %s",
"You are not allowed to execute this command in a transaction", "You are not allowed to execute this command in a transaction",
"Got error %d during COMMIT", "Got error %d during COMMIT",
"Got error %d during ROLLBACK", "Got error %d during ROLLBACK",
"Got error %d during FLUSH_LOGS", "Got error %d during FLUSH_LOGS",
"Got error %d during CHECKPOINT", "Got error %d during CHECKPOINT",
"Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s)", "Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s)",
"The handler for the table does not support binary table dump", "The store engine for the table does not support binary table dump",
"Binlog closed, cannot RESET MASTER", "Binlog closed, cannot RESET MASTER",
"Failed rebuilding the index of dumped table '%-.64s'", "Failed rebuilding the index of dumped table '%-.64s'",
"Error from master: '%-.64s'", "Error from master: '%-.64s'",
...@@ -249,14 +249,15 @@ ...@@ -249,14 +249,15 @@
"Reference '%-.64s' not supported (%s)", "Reference '%-.64s' not supported (%s)",
"Every derived table must have it's own alias", "Every derived table must have it's own alias",
"Select %u was reduced during optimisation", "Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s" "Table '%-.64s' from one of SELECT's can not be used in %-.32s",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" "Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL" "All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'" "COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running" "The slave was already running",
"The slave was already stopped" "The slave was already stopped",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()" "%d line(s) was(were) cut by group_concat()",
\ No newline at end of file "Using storage engine %s for table '%s'",
sql/share/estonian/errmsg.txt
View file @ 9f22d166
...@@ -252,16 +252,17 @@ ...@@ -252,16 +252,17 @@
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s", "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)", "Reference '%-.64s' not supported (%s)",
"Every derived table must have it's own alias" "Every derived table must have it's own alias",
"Select %u was reduced during optimisation", "Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s" "Table '%-.64s' from one of SELECT's can not be used in %-.32s",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" "Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL" "All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'" "COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running" "The slave was already running",
"The slave was already stopped" "The slave was already stopped",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()" "%d line(s) was(were) cut by group_concat()",
\ No newline at end of file "Using storage engine %s for table '%s'",
sql/share/french/errmsg.txt
View file @ 9f22d166
...@@ -247,16 +247,17 @@ ...@@ -247,16 +247,17 @@
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s", "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)", "Reference '%-.64s' not supported (%s)",
"Every derived table must have it's own alias" "Every derived table must have it's own alias",
"Select %u was reduced during optimisation", "Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s" "Table '%-.64s' from one of SELECT's can not be used in %-.32s",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" "Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL" "All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'" "COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running" "The slave was already running",
"The slave was already stopped" "The slave was already stopped",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()" "%d line(s) was(were) cut by group_concat()",
\ No newline at end of file "Using storage engine %s for table '%s'",
sql/share/german/errmsg.txt
View file @ 9f22d166
...@@ -260,12 +260,13 @@ ...@@ -260,12 +260,13 @@
"Select %u wurde während der Optimierung reduziert.", "Select %u wurde während der Optimierung reduziert.",
"Tabelle '%-.64s', die in einem der SELECT-Befehle verwendet wurde kann nicht in %-.32s verwendet werden", "Tabelle '%-.64s', die in einem der SELECT-Befehle verwendet wurde kann nicht in %-.32s verwendet werden",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client", "Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL" "All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'" "COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running" "The slave was already running",
"The slave was already stopped" "The slave was already stopped",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()" "%d line(s) was(were) cut by group_concat()",
\ No newline at end of file "Using storage engine %s for table '%s'",
sql/share/greek/errmsg.txt
View file @ 9f22d166
...@@ -247,16 +247,17 @@ ...@@ -247,16 +247,17 @@
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s", "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)", "Reference '%-.64s' not supported (%s)",
"Every derived table must have it's own alias" "Every derived table must have it's own alias",
"Select %u was reduced during optimisation", "Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s" "Table '%-.64s' from one of SELECT's can not be used in %-.32s",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" "Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL" "All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'" "COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running" "The slave was already running",
"The slave was already stopped" "The slave was already stopped",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()" "%d line(s) was(were) cut by group_concat()",
\ No newline at end of file "Using storage engine %s for table '%s'",
sql/share/hungarian/errmsg.txt
View file @ 9f22d166
...@@ -249,16 +249,17 @@ ...@@ -249,16 +249,17 @@
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s", "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)", "Reference '%-.64s' not supported (%s)",
"Every derived table must have it's own alias" "Every derived table must have it's own alias",
"Select %u was reduced during optimisation", "Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s" "Table '%-.64s' from one of SELECT's can not be used in %-.32s",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" "Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL" "All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'" "COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running" "The slave was already running",
"The slave was already stopped" "The slave was already stopped",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()" "%d line(s) was(were) cut by group_concat()",
\ No newline at end of file "Using storage engine %s for table '%s'",
sql/share/italian/errmsg.txt
View file @ 9f22d166
...@@ -247,16 +247,17 @@ ...@@ -247,16 +247,17 @@
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s", "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)", "Reference '%-.64s' not supported (%s)",
"Every derived table must have it's own alias" "Every derived table must have it's own alias",
"Select %u was reduced during optimisation", "Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s" "Table '%-.64s' from one of SELECT's can not be used in %-.32s",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" "Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL" "All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'" "COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running" "The slave was already running",
"The slave was already stopped" "The slave was already stopped",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()" "%d line(s) was(were) cut by group_concat()",
\ No newline at end of file "Using storage engine %s for table '%s'",
sql/share/japanese/errmsg.txt
View file @ 9f22d166
...@@ -249,16 +249,17 @@ ...@@ -249,16 +249,17 @@
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s", "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)", "Reference '%-.64s' not supported (%s)",
"Every derived table must have it's own alias" "Every derived table must have it's own alias",
"Select %u was reduced during optimisation", "Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s" "Table '%-.64s' from one of SELECT's can not be used in %-.32s",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" "Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL" "All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'" "COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running" "The slave was already running",
"The slave was already stopped" "The slave was already stopped",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()" "%d line(s) was(were) cut by group_concat()",
\ No newline at end of file "Using storage engine %s for table '%s'",
sql/share/korean/errmsg.txt
View file @ 9f22d166
...@@ -247,16 +247,17 @@ ...@@ -247,16 +247,17 @@
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s", "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)", "Reference '%-.64s' not supported (%s)",
"Every derived table must have it's own alias" "Every derived table must have it's own alias",
"Select %u was reduced during optimisation", "Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s" "Table '%-.64s' from one of SELECT's can not be used in %-.32s",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" "Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL" "All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'" "COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running" "The slave was already running",
"The slave was already stopped" "The slave was already stopped",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()" "%d line(s) was(were) cut by group_concat()",
\ No newline at end of file "Using storage engine %s for table '%s'",
sql/share/norwegian-ny/errmsg.txt
View file @ 9f22d166
...@@ -249,16 +249,17 @@ ...@@ -249,16 +249,17 @@
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s", "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)", "Reference '%-.64s' not supported (%s)",
"Every derived table must have it's own alias" "Every derived table must have it's own alias",
"Select %u was reduced during optimisation", "Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s" "Table '%-.64s' from one of SELECT's can not be used in %-.32s",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" "Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL" "All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'" "COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running" "The slave was already running",
"The slave was already stopped" "The slave was already stopped",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()" "%d line(s) was(were) cut by group_concat()",
\ No newline at end of file "Using storage engine %s for table '%s'",
sql/share/norwegian/errmsg.txt
View file @ 9f22d166
...@@ -249,16 +249,17 @@ ...@@ -249,16 +249,17 @@
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s", "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)", "Reference '%-.64s' not supported (%s)",
"Every derived table must have it's own alias" "Every derived table must have it's own alias",
"Select %u was reduced during optimisation", "Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s" "Table '%-.64s' from one of SELECT's can not be used in %-.32s",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" "Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL" "All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'" "COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running" "The slave was already running",
"The slave was already stopped" "The slave was already stopped",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()" "%d line(s) was(were) cut by group_concat()",
\ No newline at end of file "Using storage engine %s for table '%s'",
sql/share/polish/errmsg.txt
View file @ 9f22d166
...@@ -251,16 +251,17 @@ ...@@ -251,16 +251,17 @@
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s", "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)", "Reference '%-.64s' not supported (%s)",
"Every derived table must have it's own alias" "Every derived table must have it's own alias",
"Select %u was reduced during optimisation", "Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s" "Table '%-.64s' from one of SELECT's can not be used in %-.32s",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" "Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL" "All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'" "COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running" "The slave was already running",
"The slave was already stopped" "The slave was already stopped",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()" "%d line(s) was(were) cut by group_concat()",
\ No newline at end of file "Using storage engine %s for table '%s'",
sql/share/portuguese/errmsg.txt
View file @ 9f22d166
...@@ -247,16 +247,17 @@ ...@@ -247,16 +247,17 @@
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s", "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)", "Reference '%-.64s' not supported (%s)",
"Every derived table must have it's own alias" "Every derived table must have it's own alias",
"Select %u was reduced during optimisation", "Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s" "Table '%-.64s' from one of SELECT's can not be used in %-.32s",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" "Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL" "All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'" "COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running" "The slave was already running",
"The slave was already stopped" "The slave was already stopped",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()" "%d line(s) was(were) cut by group_concat()",
\ No newline at end of file "Using storage engine %s for table '%s'",
sql/share/romanian/errmsg.txt
View file @ 9f22d166
...@@ -251,16 +251,17 @@ ...@@ -251,16 +251,17 @@
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s" "Converting column '%s' from %s to %s"
"Reference '%-.64s' not supported (%s)", "Reference '%-.64s' not supported (%s)",
"Every derived table must have it's own alias" "Every derived table must have it's own alias",
"Select %u was reduced during optimisation", "Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s" "Table '%-.64s' from one of SELECT's can not be used in %-.32s",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" "Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL" "All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'" "COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running" "The slave was already running",
"The slave was already stopped" "The slave was already stopped",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()" "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'",
sql/share/russian/errmsg.txt
View file @ 9f22d166
...@@ -249,16 +249,17 @@ ...@@ -249,16 +249,17 @@
" ", " ",
" '%s' %s %s", " '%s' %s %s",
" '%-.64s' (%s)", " '%-.64s' (%s)",
"Every derived table must have it's own alias" "Every derived table must have it's own alias",
"Select %u ", "Select %u ",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s" "Table '%-.64s' from one of SELECT's can not be used in %-.32s",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" "Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL" "All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'" "COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running" "The slave was already running",
"The slave was already stopped" "The slave was already stopped",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()" "%d line(s) was(were) cut by group_concat()",
\ No newline at end of file "Using storage engine %s for table '%s'",
sql/share/serbian/errmsg.txt
View file @ 9f22d166
...@@ -243,16 +243,17 @@ ...@@ -243,16 +243,17 @@
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s", "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)", "Reference '%-.64s' not supported (%s)",
"Every derived table must have it's own alias" "Every derived table must have it's own alias",
"Select %u was reduced during optimisation", "Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s" "Table '%-.64s' from one of SELECT's can not be used in %-.32s",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" "Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL" "All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'" "COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running" "The slave was already running",
"The slave was already stopped" "The slave was already stopped",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()" "%d line(s) was(were) cut by group_concat()",
\ No newline at end of file "Using storage engine %s for table '%s'",
sql/share/slovak/errmsg.txt
View file @ 9f22d166
...@@ -255,16 +255,17 @@ ...@@ -255,16 +255,17 @@
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s", "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)", "Reference '%-.64s' not supported (%s)",
"Every derived table must have it's own alias" "Every derived table must have it's own alias",
"Select %u was reduced during optimisation", "Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s" "Table '%-.64s' from one of SELECT's can not be used in %-.32s",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" "Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL" "All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'" "COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running" "The slave was already running",
"The slave was already stopped" "The slave was already stopped",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()" "%d line(s) was(were) cut by group_concat()",
\ No newline at end of file "Using storage engine %s for table '%s'",
sql/share/spanish/errmsg.txt
View file @ 9f22d166
...@@ -248,16 +248,17 @@ ...@@ -248,16 +248,17 @@
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s", "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)", "Reference '%-.64s' not supported (%s)",
"Every derived table must have it's own alias" "Every derived table must have it's own alias",
"Select %u was reduced during optimisation", "Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s" "Table '%-.64s' from one of SELECT's can not be used in %-.32s",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" "Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL" "All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'" "COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running" "The slave was already running",
"The slave was already stopped" "The slave was already stopped",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()" "%d line(s) was(were) cut by group_concat()",
\ No newline at end of file "Using storage engine %s for table '%s'",
sql/share/swedish/errmsg.txt
View file @ 9f22d166
...@@ -249,14 +249,15 @@ ...@@ -249,14 +249,15 @@
"Referens '%-.64s' stöds inte (%s)", "Referens '%-.64s' stöds inte (%s)",
"Varje 'derived table' måste ha sitt eget alias", "Varje 'derived table' måste ha sitt eget alias",
"Select %u reducerades vid optimiering", "Select %u reducerades vid optimiering",
"Tabell '%-.64s' från en SELECT kan inte användas i %-.32s" "Tabell '%-.64s' från en SELECT kan inte användas i %-.32s",
"Klienten stöder inte autentiseringsprotokollet som begärts av servern. Överväg uppgradering av klientprogrammet." "Klienten stöder inte autentiseringsprotokollet som begärts av servern. Överväg uppgradering av klientprogrammet.",
"Alla delar av en SPATIAL KEY måste vara NOT NULL" "Alla delar av en SPATIAL KEY måste vara NOT NULL",
"COLLATION '%s' är inte tillåtet för CHARACTER SET '%s'" "COLLATION '%s' är inte tillåtet för CHARACTER SET '%s'",
"Slaven har redan startat" "Slaven har redan startat",
"Slaven har redan stoppat" "Slaven har redan stoppat",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d rad(er) kapades av group_concat()" "%d rad(er) kapades av group_concat()",
\ No newline at end of file "Använder handler %s för tabell '%s'",
sql/share/ukrainian/errmsg.txt
View file @ 9f22d166
...@@ -252,16 +252,17 @@ ...@@ -252,16 +252,17 @@
"̦ Ц", "̦ Ц",
" '%s' %s %s", " '%s' %s %s",
" '%-.64s' i (%s)", " '%-.64s' i (%s)",
"Every derived table must have it's own alias" "Every derived table must have it's own alias",
"Select %u was iii", "Select %u was iii",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s" "Table '%-.64s' from one of SELECT's can not be used in %-.32s",
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" "Client does not support authentication protocol requested by server. Consider upgrading MySQL client",
"All parts of a SPATIAL KEY must be NOT NULL" "All parts of a SPATIAL KEY must be NOT NULL",
"COLLATION '%s' is not valid for CHARACTER SET '%s'" "COLLATION '%s' is not valid for CHARACTER SET '%s'",
"The slave was already running" "The slave was already running",
"The slave was already stopped" "The slave was already stopped",
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)" "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
"Z_BUF_ERROR: Not enough memory available for zlib" "Z_BUF_ERROR: Not enough memory available for zlib",
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)" "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
"Z_DATA_ERROR: Input data was corrupted for zlib" "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()" "%d line(s) was(were) cut by group_concat()",
\ No newline at end of file "Using storage engine %s for table '%s'",
sql/sql_acl.cc
View file @ 9f22d166
...@@ -2516,7 +2516,7 @@ bool check_grant(THD *thd, ulong want_access, TABLE_LIST *tables, ...@@ -2516,7 +2516,7 @@ bool check_grant(THD *thd, ulong want_access, TABLE_LIST *tables,
rw_rdlock(&LOCK_grant); rw_rdlock(&LOCK_grant);
for (table=tables; table ;table=table->next) for (table=tables; table ;table=table->next)
{ {
if (!(~table->grant.privilege & want_access)) if (!(~table->grant.privilege & want_access) || table->derived)
{ {
table->grant.want_privilege=0; table->grant.want_privilege=0;
continue; // Already checked continue; // Already checked
......
sql/sql_base.cc
View file @ 9f22d166
...@@ -1906,9 +1906,9 @@ find_item_in_list(Item *find, List<Item> &items, uint *counter, ...@@ -1906,9 +1906,9 @@ find_item_in_list(Item *find, List<Item> &items, uint *counter,
} }
} }
else if (!table_name && (item->eq(find,0) || else if (!table_name && (item->eq(find,0) ||
find->name && find->name &&
!my_strcasecmp(system_charset_info, !my_strcasecmp(system_charset_info,
item->name,find->name))) item->name,find->name)))
{ {
found= li.ref(); found= li.ref();
*counter= i; *counter= i;
......
sql/sql_parse.cc
View file @ 9f22d166
...@@ -2217,7 +2217,9 @@ mysql_execute_command(THD *thd) ...@@ -2217,7 +2217,9 @@ mysql_execute_command(THD *thd)
goto error; goto error;
for (table=tables ; table ; table=table->next) for (table=tables ; table ; table=table->next)
{ {
if (check_access(thd,UPDATE_ACL,table->db,&table->grant.privilege)) if (table->derived)
table->grant.privilege= SELECT_ACL;
else if (check_access(thd,UPDATE_ACL,table->db,&table->grant.privilege))
goto error; goto error;
} }
if (grant_option && check_grant(thd,UPDATE_ACL,tables)) if (grant_option && check_grant(thd,UPDATE_ACL,tables))
......
sql/sql_select.cc
View file @ 9f22d166
...@@ -3436,7 +3436,8 @@ static void update_depend_map(JOIN *join) ...@@ -3436,7 +3436,8 @@ static void update_depend_map(JOIN *join)
uint i; uint i;
for (i=0 ; i < ref->key_parts ; i++,item++) for (i=0 ; i < ref->key_parts ; i++,item++)
depend_map|=(*item)->used_tables(); depend_map|=(*item)->used_tables();
ref->depend_map=depend_map; ref->depend_map=depend_map & OUTER_REF_TABLE_BIT;
depend_map&= ~OUTER_REF_TABLE_BIT;
for (JOIN_TAB **tab=join->map2table; for (JOIN_TAB **tab=join->map2table;
depend_map ; depend_map ;
tab++,depend_map>>=1 ) tab++,depend_map>>=1 )
......
sql/sql_table.cc
View file @ 9f22d166
...@@ -382,6 +382,7 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name, ...@@ -382,6 +382,7 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
int auto_increment=0; int auto_increment=0;
handler *file; handler *file;
int field_no,dup_no; int field_no,dup_no;
enum db_type new_db_type;
DBUG_ENTER("mysql_create_table"); DBUG_ENTER("mysql_create_table");
/* /*
...@@ -396,6 +397,16 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name, ...@@ -396,6 +397,16 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
List_iterator<create_field> it(fields),it2(fields); List_iterator<create_field> it(fields),it2(fields);
int select_field_pos=fields.elements - select_field_count; int select_field_pos=fields.elements - select_field_count;
null_fields=blob_columns=0; null_fields=blob_columns=0;
if ((new_db_type= ha_checktype(create_info->db_type)) !=
create_info->db_type)
{
create_info->db_type= new_db_type;
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_WARN_USING_OTHER_HANDLER,
ER(ER_WARN_USING_OTHER_HANDLER),
ha_table_typelib.type_names[new_db_type],
table_name);
}
db_options=create_info->table_options; db_options=create_info->table_options;
if (create_info->row_type == ROW_TYPE_DYNAMIC) if (create_info->row_type == ROW_TYPE_DYNAMIC)
db_options|=HA_OPTION_PACK_RECORD; db_options|=HA_OPTION_PACK_RECORD;
...@@ -488,8 +499,8 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name, ...@@ -488,8 +499,8 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
case FIELD_TYPE_GEOMETRY: case FIELD_TYPE_GEOMETRY:
if (!(file->table_flags() & HA_HAS_GEOMETRY)) if (!(file->table_flags() & HA_HAS_GEOMETRY))
{ {
my_printf_error(ER_WRONG_USAGE,ER(ER_WRONG_USAGE),MYF(0), my_printf_error(ER_CHECK_NOT_IMPLEMENTED, ER(ER_CHECK_NOT_IMPLEMENTED),
"GEOMETRY FIELD TYPE","not supported by this storage engine "); MYF(0), "GEOMETRY");
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
sql_field->pack_flag=FIELDFLAG_GEOM | sql_field->pack_flag=FIELDFLAG_GEOM |
...@@ -1702,7 +1713,16 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, ...@@ -1702,7 +1713,16 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
old_db_type=table->db_type; old_db_type=table->db_type;
if (create_info->db_type == DB_TYPE_DEFAULT) if (create_info->db_type == DB_TYPE_DEFAULT)
create_info->db_type=old_db_type; create_info->db_type=old_db_type;
new_db_type=create_info->db_type= ha_checktype(create_info->db_type); if ((new_db_type= ha_checktype(create_info->db_type)) !=
create_info->db_type)
{
create_info->db_type= new_db_type;
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_WARN_USING_OTHER_HANDLER,
ER(ER_WARN_USING_OTHER_HANDLER),
ha_table_typelib.type_names[new_db_type],
new_name);
}
if (create_info->row_type == ROW_TYPE_NOT_USED) if (create_info->row_type == ROW_TYPE_NOT_USED)
create_info->row_type=table->row_type; create_info->row_type=table->row_type;
......
sql/sql_yacc.yy
View file @ 9f22d166
...@@ -909,7 +909,13 @@ create2: ...@@ -909,7 +909,13 @@ create2:
if (!(lex->name= (char *)$2)) if (!(lex->name= (char *)$2))
YYABORT; YYABORT;
} }
; | '(' LIKE table_ident ')'
{
LEX *lex=Lex;
if (!(lex->name= (char *)$3))
YYABORT;
}
;
create3: create3:
/* empty */ {} /* empty */ {}
......
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