Skip to content

M
mariadb
Commit 2ee21c9c authored by unknown's avatar unknown
Browse files
Options

Cleanup after last merge 


client/mysqltest.c:
  Don't write error message to log if there is more than one possible error message
include/mysqld_error.h:
  Made error messages more general
libmysqld/Makefile.am:
  md5 is now in mysys
mysql-test/include/have_isam.inc:
  Update to new result format
mysql-test/include/not_embedded.inc:
  Update to new result format
mysql-test/mysql-test-run.sh:
  Update to new result format
mysql-test/r/auto_increment.result:
  Update to new result format
mysql-test/r/count_distinct2.result:
  Update to new result format
mysql-test/r/create.result:
  Update to new result format
mysql-test/r/func_system.result:
  Update to new result format
mysql-test/r/isam.result:
  Update to new result format
mysql-test/r/lock.result:
  Update to new result format
mysql-test/r/lock_multi.result:
  Update to new result format
mysql-test/r/rename.result:
  Update to new result format
mysql-test/r/rpl000001.result:
  Fix wrong test
mysql-test/r/tablelock.result:
  Update to new result format
mysql-test/t/rename.test:
  Update to new result format
sql/share/czech/errmsg.txt:
  Made error messages more general
sql/share/danish/errmsg.txt:
  Made error messages more general
sql/share/dutch/errmsg.txt:
  Made error messages more general
sql/share/english/errmsg.txt:
  Made error messages more general
sql/share/estonian/errmsg.txt:
  Made error messages more general
sql/share/french/errmsg.txt:
  Made error messages more general
sql/share/german/errmsg.txt:
  Made error messages more general
sql/share/greek/errmsg.txt:
  Made error messages more general
sql/share/hungarian/errmsg.txt:
  Made error messages more general
sql/share/italian/errmsg.txt:
  Made error messages more general
sql/share/japanese/errmsg.txt:
  Made error messages more general
sql/share/korean/errmsg.txt:
  Made error messages more general
sql/share/norwegian-ny/errmsg.txt:
  Made error messages more general
sql/share/norwegian/errmsg.txt:
  Made error messages more general
sql/share/polish/errmsg.txt:
  Made error messages more general
sql/share/portuguese/errmsg.txt:
  Made error messages more general
sql/share/romanian/errmsg.txt:
  Made error messages more general
sql/share/russian/errmsg.txt:
  Made error messages more general
sql/share/slovak/errmsg.txt:
  Made error messages more general
sql/share/spanish/errmsg.txt:
  Made error messages more general
sql/share/swedish/errmsg.txt:
  Made error messages more general
sql/share/ukrainian/errmsg.txt:
  Made error messages more general
sql/sql_lex.cc:
  We can't remove lex->thd because sql_yacc uses it.
sql/sql_lex.h:
  We can't remove lex->thd because sql_yacc uses it.
sql/sql_yacc.yy:
  Cleanup
support-files/mysql.spec.sh:
  Create MySQL-embedded rpm
tools/mysqlmanager.c:
  Fix bug in merge
parent 515c747d
Hide whitespace changes
Inline Side-by-side
Showing with 163 additions and 140 deletions
client/mysqltest.c
View file @ 2ee21c9c
......@@ -1718,7 +1718,7 @@ int parse_args(int argc, char **argv)
{
switch(c) {
case '#':
DBUG_PUSH(optarg ? optarg : "d:t:i:O,/tmp/mysqltest.trace");
DBUG_PUSH(optarg ? optarg : "d:t:S:i:O,/tmp/mysqltest.trace");
break;
case 'v':
verbose = 1;
......@@ -1952,8 +1952,14 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
{
if ((q->expected_errno[i] == mysql_errno(mysql)))
{
dynstr_append(ds,mysql_error(mysql));
dynstr_append_mem(ds,"\n",1);
if (i == 0 && q->expected_errno[1] == 0)
{
/* Only log error if there is one possible error */
dynstr_append(ds,mysql_error(mysql));
dynstr_append_mem(ds,"\n",1);
}
else
dynstr_append(ds,"Got one of the listed errors\n");
goto end; /* Ok */
}
}
......@@ -2153,8 +2159,6 @@ int main(int argc, char** argv)
struct st_query* q;
my_bool require_file=0, q_send_flag=0;
char save_file[FN_REFLEN];
mysql_server_init(sizeof(embedded_server_args) / sizeof(char *) - 1,
embedded_server_args, embedded_server_groups);
MY_INIT(argv[0]);
{
DBUG_ENTER("main");
......
include/mysqld_error.h
View file @ 2ee21c9c
......@@ -221,7 +221,5 @@
#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1218
#define ER_CANT_UPDATE_WITH_READLOCK 1219
#define ER_MIXING_NOT_ALLOWED 1220
#define ER_GRANT_DUPL_SUBJECT 1221
#define ER_GRANT_DUPL_ISSUER 1222
#define ER_GRANT_DUPL_CIPHER 1223
#define ER_ERROR_MESSAGES 224
#define ER_DUP_ARGUMENT 1221
#define ER_ERROR_MESSAGES 222
libmysqld/Makefile.am
View file @ 2ee21c9c
......@@ -43,7 +43,7 @@ sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \
hostname.cc init.cc \
item.cc item_buff.cc item_cmpfunc.cc item_create.cc \
item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \
item_uniq.cc key.cc lock.cc log.cc log_event.cc md5.c \
item_uniq.cc key.cc lock.cc log.cc log_event.cc \
mini_client.cc net_pkg.cc net_serv.cc opt_ft.cc opt_range.cc \
opt_sum.cc procedure.cc records.cc slave.cc sql_acl.cc \
sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \
......
mysql-test/include/have_isam.inc
View file @ 2ee21c9c
-- require r/have_isam.require
disable_query_log;
show variables like "have_isam";
enable_query_log;
mysql-test/include/not_embedded.inc
View file @ 2ee21c9c
-- require r/not_embedded.require
disable_query_log;
select version() like "%embedded%" as "have_embedded";
enable_query_log;
mysql-test/mysql-test-run.sh
View file @ 2ee21c9c
......@@ -124,7 +124,7 @@ MASTER_RUNNING=0
MASTER_MYPORT=9306
SLAVE_RUNNING=0
SLAVE_MYPORT=9307
MYSQL_MANAGER_PORT=23546
MYSQL_MANAGER_PORT=9308
MYSQL_MANAGER_PW_FILE=$MYSQL_TEST_DIR/var/tmp/manager.pwd
MYSQL_MANAGER_LOG=$MYSQL_TEST_DIR/var/log/manager.log
MYSQL_MANAGER_USER=root
......@@ -152,6 +152,7 @@ while test $# -gt 0; do
--tmpdir=*) MYSQL_TMP_DIR=`$ECHO "$1" | $SED -e "s;--tmpdir=;;"` ;;
--master_port=*) MASTER_MYPORT=`$ECHO "$1" | $SED -e "s;--master_port=;;"` ;;
--slave_port=*) SLAVE_MYPORT=`$ECHO "$1" | $SED -e "s;--slave_port=;;"` ;;
--manager-port=*) MYSQL_MANAGER_PORT=`$ECHO "$1" | $SED -e "s;--manager_port=;;"` ;;
--with-openssl)
EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT \
--ssl-ca=$BASEDIR/SSL/cacert.pem \
......
mysql-test/r/auto_increment.result
View file @ 2ee21c9c
drop table if exists t1;
create table t1 (a int not null auto_increment,b int, primary key (a)) type=myisam auto_increment=3;
insert into t1 values (1,1),(NULL,3),(NULL,4);
delete from t1 where a=4;
......
mysql-test/r/count_distinct2.result
View file @ 2ee21c9c
drop table if exists t1;
create table t1(n1 int, n2 int, s char(20), vs varchar(20), t text);
insert into t1 values (1,11, 'one','eleven', 'eleven'),
(1,11, 'one','eleven', 'eleven'),
......
mysql-test/r/create.result
View file @ 2ee21c9c
......@@ -27,21 +27,13 @@ create table t1 (a int not null,b text) type=heap;
The used table type doesn't support BLOB/TEXT columns
create table t1 (a int ,primary key(a)) type=heap;
All parts of a PRIMARY KEY must be NOT NULL; If you need NULL in a key, use UNIQUE instead
create table t1 (a int,b text, index(a)) type=isam;
Column 'a' is used with UNIQUE or INDEX but is not defined as NOT NULL
create table t1 (a int,b text, index(b)) type=isam;
BLOB column 'b' can't be used in key specification with the used table type
drop table if exists t1;
create table t1 (ordid int(8) not null auto_increment, ord varchar(50) not null, primary key (ord,ordid)) type=isam;
Incorrect table definition; There can only be one auto column and it must be defined as a key
create table t1 (ordid int(8) not null auto_increment, ord varchar(50) not null, primary key (ord,ordid)) type=heap;
The used table type doesn't support AUTO_INCREMENT columns
create table t1 (ordid int(8), primary key (ordid));
All parts of a PRIMARY KEY must be NOT NULL; If you need NULL in a key, use UNIQUE instead
create table t1 (ordid int(8), unique (ordid)) type=isam;
Column 'ordid' is used with UNIQUE or INDEX but is not defined as NOT NULL
create table not_existing_database.test (a int);
Can't create/write to file './not_existing_database/test.frm' (Errcode: 2)
Got one of the listed errors
create table `a/a` (a int);
Incorrect table name 'a/a'
create table `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa int);
......
mysql-test/r/func_system.result
View file @ 2ee21c9c
select database(),user() like "%@%";
database() user()
database() user() like "%@%"
test 1
select version()>="3.23.29";
version()>="3.23.29"
......
mysql-test/r/isam.result
View file @ 2ee21c9c
drop table if exists t1,t2;
create table t1 (a tinyint not null auto_increment, b blob not null, primary key (a));
check table t1;
Table Op Msg_type Msg_text
......@@ -15,42 +16,76 @@ test.t1 repair status OK
check table t1;
Table Op Msg_type Msg_text
test.t1 check status OK
drop table t1;
create table t1 (a int not null auto_increment,b int, primary key (a)) type=isam;
insert into t1 values (1,1),(NULL,2),(3,3),(NULL,4);
delete from t1 where a=4 or a=2;
insert into t1 values (NULL,4),(NULL,5),(6,6);
select * from t1;
a b
1 1
5 5
3 3
4 4
6 6
delete from t1 where a=6;
replace t1 values (3,1);
replace t1 values (3,3);
ALTER TABLE t1 add c int;
insert into t1 values (NULL,6,6);
select * from t1;
a b c
1 1 NULL
5 5 NULL
3 3 NULL
4 4 NULL
6 6 6
drop table t1;
create table t1 (a int,b text, index(a)) type=isam;
Column 'a' is used with UNIQUE or INDEX but is not defined as NOT NULL
create table t1 (a int,b text, index(b)) type=isam;
BLOB column 'b' can't be used in key specification with the used table type
create table t1 (ordid int(8) not null auto_increment, ord varchar(50) not null, primary key (ord,ordid)) type=isam;
Incorrect table definition; There can only be one auto column and it must be defined as a key
create table t1 (ordid int(8), unique (ordid)) type=isam;
Column 'ordid' is used with UNIQUE or INDEX but is not defined as NOT NULL
drop table if exists t1;
create table t1 (a int not null primary key, b int not null,c int not null, key(b,c));
insert into t1 values (1,2,2),(2,2,3),(3,2,4),(4,2,4);
create table t2 type=isam select * from t1;
optimize table t1;
Table Op Msg_type Msg_text
test.t1 optimize status OK
check table t1,t2;
Table Op Msg_type Msg_text
test.t1 check status OK
test.t2 check error The handler for the table doesn't support check/repair
repair table t1,t2;
Table Op Msg_type Msg_text
test.t1 repair status OK
test.t2 repair error The handler for the table doesn't support check/repair
check table t2,t1;
Table Op Msg_type Msg_text
test.t2 check error The handler for the table doesn't support check/repair
test.t1 check status OK
lock tables t1 write;
check table t2,t1;
Table Op Msg_type Msg_text
test.t2 check error Table 't2' was not locked with LOCK TABLES
test.t1 check status OK
show columns from t1;
Field Type Null Key Default Extra
a int(11) PRI 0
b int(11) MUL 0
c int(11) 0
show full columns from t1;
Field Type Null Key Default Extra Privileges
a int(11) PRI 0 select,insert,update,references
b int(11) MUL 0 select,insert,update,references
c int(11) 0 select,insert,update,references
show index from t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment
t1 0 PRIMARY 1 a A 4 NULL NULL
t1 1 b 1 b A 1 NULL NULL
t1 1 b 2 c A 4 NULL NULL
drop table t1;
drop table t1,t2;
mysql-test/r/lock.result
View file @ 2ee21c9c
......@@ -43,21 +43,3 @@ Table Op Msg_type Msg_text
test.t2 check error Table 't2' was not locked with LOCK TABLES
unlock tables;
drop table t1,t2;
create table t1(n int);
insert into t1 values (1);
lock tables t1 write;
update low_priority t1 set n = 4;
select n from t1;
unlock tables;
n
4
drop table t1;
create table t1(n int);
insert into t1 values (1);
lock tables t1 read;
update low_priority t1 set n = 4;
select n from t1;
unlock tables;
n
1
drop table t1;
mysql-test/r/lock_multi.result
View file @ 2ee21c9c
create table t1(n int);
insert into t1 values (1);
lock tables t1 write;
update low_priority t1 set n = 4;
select n from t1;
unlock tables;
n
4
drop table t1;
create table t1(n int);
insert into t1 values (1);
lock tables t1 read;
update low_priority t1 set n = 4;
select n from t1;
unlock tables;
n
1
drop table t1;
mysql-test/r/rename.result
View file @ 2ee21c9c
......@@ -13,20 +13,20 @@ select * from t1;
1 table 1
1 table 1
rename table t1 to t2;
Table './test/t2.frm' already exists
Got one of the listed errors
rename table t1 to t1;
Table './test/t1.frm' already exists
Got one of the listed errors
rename table t3 to t4, t2 to t3, t1 to t2, t4 to t2;
Table './test/t2.frm' already exists
Got one of the listed errors
show tables like "t_";
Tables_in_test (t_)
t1
t2
t3
rename table t3 to t1, t2 to t3, t1 to t2, t4 to t1;
Table './test/t1.frm' already exists
Got one of the listed errors
rename table t3 to t4, t5 to t3, t1 to t2, t4 to t1;
Can't find file: './test/t5.frm' (errno: 2)
Got one of the listed errors
select * from t1;
1 table 1
1 table 1
......
mysql-test/r/rpl000001.result
View file @ 2ee21c9c
......@@ -37,8 +37,8 @@ create table t1(n int);
create table t2(id int);
insert into t2 values(connection_id());
create temporary table t1_temp(n int);
insert into t1_temp select get_lock('crash_lock', 1) from t2;
update t1 set n = n + get_lock('crash_lock', 2);
insert into t1_temp select get_lock('crash_lock%20C', 1) from t2;
update t1 set n = n + get_lock('crash_lock%20C', 2);
select (@id := id) - id from t2;
(@id := id) - id
0
......
mysql-test/r/tablelock.result
View file @ 2ee21c9c
drop table if exists t1,t2;
create table t1 ( n int auto_increment primary key);
lock tables t1 write;
insert into t1 values(NULL);
......@@ -39,11 +40,9 @@ drop table t1;
CREATE TABLE t1 (a int);
CREATE TABLE t2 (a int);
lock tables t1 write,t1 as b write, t2 write, t2 as c read;
drop table t1;
drop table t2;
drop table t1,t2;
CREATE TABLE t1 (a int);
CREATE TABLE t2 (a int);
lock tables t1 write,t1 as b write, t2 write, t2 as c read;
drop table t2;
drop table t1;
drop table t2,t1;
unlock tables;
mysql-test/t/rename.test
View file @ 2ee21c9c
......@@ -12,13 +12,19 @@ select * from t1;
rename table t3 to t4, t2 to t3, t1 to t2, t4 to t1;
rename table t3 to t4, t2 to t3, t1 to t2, t4 to t1;
select * from t1;
# The following should give errors
!$1050 rename table t1 to t2;
!$1050 rename table t1 to t1;
!$1050 rename table t3 to t4, t2 to t3, t1 to t2, t4 to t2;
--error 1050,1050
rename table t1 to t2;
--error 1050,1050
rename table t1 to t1;
--error 1050,1050
rename table t3 to t4, t2 to t3, t1 to t2, t4 to t2;
show tables like "t_";
!$1050 rename table t3 to t1, t2 to t3, t1 to t2, t4 to t1;
!$1017 rename table t3 to t4, t5 to t3, t1 to t2, t4 to t1;
--error 1050,1050
rename table t3 to t1, t2 to t3, t1 to t2, t4 to t1;
--error 1017,1017
rename table t3 to t4, t5 to t3, t1 to t2, t4 to t1;
select * from t1;
select * from t2;
......
sql/share/czech/errmsg.txt
View file @ 2ee21c9c
......@@ -231,6 +231,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",
sql/share/danish/errmsg.txt
View file @ 2ee21c9c
......@@ -225,6 +225,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",
sql/share/dutch/errmsg.txt
View file @ 2ee21c9c
......@@ -228,6 +228,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",
sql/share/english/errmsg.txt
View file @ 2ee21c9c
......@@ -222,6 +222,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",
sql/share/estonian/errmsg.txt
View file @ 2ee21c9c
......@@ -226,6 +226,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",
sql/share/french/errmsg.txt
View file @ 2ee21c9c
......@@ -222,6 +222,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",
sql/share/german/errmsg.txt
View file @ 2ee21c9c
......@@ -225,6 +225,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",
sql/share/greek/errmsg.txt
View file @ 2ee21c9c
......@@ -222,6 +222,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",
sql/share/hungarian/errmsg.txt
View file @ 2ee21c9c
......@@ -224,6 +224,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",
sql/share/italian/errmsg.txt
View file @ 2ee21c9c
......@@ -222,6 +222,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",
sql/share/japanese/errmsg.txt
View file @ 2ee21c9c
......@@ -224,6 +224,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",
sql/share/korean/errmsg.txt
View file @ 2ee21c9c
......@@ -222,6 +222,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",
sql/share/norwegian-ny/errmsg.txt
View file @ 2ee21c9c
......@@ -224,6 +224,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",
sql/share/norwegian/errmsg.txt
View file @ 2ee21c9c
......@@ -224,6 +224,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",
sql/share/polish/errmsg.txt
View file @ 2ee21c9c
......@@ -226,6 +226,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",
sql/share/portuguese/errmsg.txt
View file @ 2ee21c9c
......@@ -222,6 +222,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",
sql/share/romanian/errmsg.txt
View file @ 2ee21c9c
......@@ -226,6 +226,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",
sql/share/russian/errmsg.txt
View file @ 2ee21c9c
......@@ -225,6 +225,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",
sql/share/slovak/errmsg.txt
View file @ 2ee21c9c
......@@ -230,6 +230,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",
sql/share/spanish/errmsg.txt
View file @ 2ee21c9c
......@@ -223,6 +223,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",
sql/share/swedish/errmsg.txt
View file @ 2ee21c9c
......@@ -222,6 +222,4 @@
"SELECT kommandona har olika antal kolumner"
"Kan inte utföra kommandot emedan du har ett READ lås",
"Blandning av transaktionella och icke-transaktionella tabeller är inaktiverat",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' användes två gånger",
sql/share/ukrainian/errmsg.txt
View file @ 2ee21c9c
......@@ -227,6 +227,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",
sql/sql_lex.cc
View file @ 2ee21c9c
......@@ -147,7 +147,7 @@ LEX *lex_start(THD *thd, uchar *buf,uint length)
lex->select->in_sum_expr=0;
lex->select->expr_list.empty();
lex->select->ftfunc_list.empty();
lex->convert_set=thd->convert_set;
lex->convert_set=(lex->thd=thd)->convert_set;
lex->yacc_yyss=lex->yacc_yyvs=0;
lex->ignore_space=test(thd->sql_mode & MODE_IGNORE_SPACE);
return lex;
......
sql/sql_lex.h
View file @ 2ee21c9c
......@@ -168,6 +168,7 @@ typedef struct st_lex {
CONVERT *convert_set;
LEX_USER *grant_user;
gptr yacc_yyss,yacc_yyvs;
THD *thd;
udf_func udf;
HA_CHECK_OPT check_opt; // check/repair options
HA_CREATE_INFO create_info;
......
sql/sql_yacc.yy
View file @ 2ee21c9c
......@@ -3150,8 +3150,8 @@ set_isolation:
}
| SESSION_SYM tx_isolation
{
LEX *lex=Lex;
lex->thd->session_tx_isolation= lex->tx_isolation= $2;
LEX *lex=Lex;
lex->thd->session_tx_isolation= lex->tx_isolation= $2;
}
| tx_isolation
{ Lex->tx_isolation= $1; }
......@@ -3315,27 +3315,33 @@ require_list: require_list_element AND require_list
require_list_element: SUBJECT_SYM TEXT_STRING
{
if (Lex->x509_subject) {
send_error(&Lex->thd->net,ER_GRANT_DUPL_SUBJECT);
LEX *lex=Lex;
if (lex->x509_subject)
{
net_printf(&lex->thd->net,ER_DUP_ARGUMENT, "SUBJECT");
YYABORT;
} else
Lex->x509_subject=$2.str;
}
lex->x509_subject=$2.str;
}
| ISSUER_SYM TEXT_STRING
{
if (Lex->x509_issuer) {
send_error(&Lex->thd->net,ER_GRANT_DUPL_ISSUER);
LEX *lex=Lex;
if (lex->x509_issuer)
{
net_printf(&lex->thd->net,ER_DUP_ARGUMENT, "ISSUER");
YYABORT;
} else
Lex->x509_issuer=$2.str;
}
lex->x509_issuer=$2.str;
}
| CIPHER_SYM TEXT_STRING
{
if (Lex->ssl_cipher) {
send_error(&Lex->thd->net,ER_GRANT_DUPL_CIPHER);
LEX *lex=lex;
if (lex->ssl_cipher)
{
net_printf(&lex->thd->net,ER_DUP_ARGUMENT, "CHIPER");
YYABORT;
} else
Lex->ssl_cipher=$2.str;
}
lex->ssl_cipher=$2.str;
}
opt_table:
......@@ -3491,7 +3497,7 @@ union_list:
if (lex->exchange)
{
/* Only the last SELECT can have INTO...... */
net_printf(&current_thd->net, ER_WRONG_USAGE,"UNION","INTO");
net_printf(&lex->thd->net, ER_WRONG_USAGE,"UNION","INTO");
YYABORT;
}
mysql_new_select(lex);
......
support-files/mysql.spec.sh
View file @ 2ee21c9c
%define mysql_version @VERSION@
%define shared_lib_version @SHARED_LIB_VERSION@
%define release 1
%define release 2
%define mysqld_user mysql
%define see_base For a description of MySQL see the base MySQL RPM or http://www.mysql.com
......@@ -139,6 +139,20 @@ Optional MySQL server binary that supports features
like transactional tables. To active this binary, just install this
package after the MySQL package.
%package embedded
Release: %{release}
Requires: devel
Summary: MySQL - embedded library
Group: Applications/Databases
Summary(pt_BR): MySQL - Medies de desempenho
Group(pt_BR): Aplicaes/Banco_de_Dados
Obsoletes: embedded
%description devel
This package contains the MySQL server as library.
%{see_base}
%prep
%setup -n mysql-%{mysql_version}
......@@ -172,6 +186,7 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-/bin:/usr/bin}\" \
--infodir=/usr/info \
--includedir=/usr/include \
--mandir=/usr/man \
--with-embedded-server \
--with-comment=\"Official MySQL RPM\";
# Add this for more debugging support
# --with-debug
......@@ -345,6 +360,7 @@ fi
%attr(755, root, root) /usr/bin/mysqlbug
%attr(755, root, root) /usr/bin/mysqltest
%attr(755, root, root) /usr/bin/mysqlhotcopy
%attr(755, root, root) /usr/bin/mysql_explain
%attr(755, root, root) /usr/bin/perror
%attr(755, root, root) /usr/bin/replace
%attr(755, root, root) /usr/bin/resolveip
......@@ -412,8 +428,15 @@ fi
%attr(755, root, root) /usr/sbin/mysqld-max
%attr(644, root, root) /usr/lib/mysql/mysqld-max.sym
%files embedded
%attr(755, root, root) /usr/lib/mysql/libmysqld.a
%changelog
* Mon Oct 8 2001 Monty
- Added embedded server as a separate RPM
* Fri Apr 13 2001 Monty
- Added mysqld-max to the distribution
......
tools/mysqlmanager.c
View file @ 2ee21c9c
......@@ -645,7 +645,7 @@ err:
return 1;
}
HANDLE_DECL(query)
HANDLE_DECL(handle_query)
{
const char* error=0;
struct manager_exec* e;
......
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