Commit 999b0638 authored by unknown's avatar unknown

Merge deer.(none):/home/hf/work/mysql-4.1.clean

into deer.(none):/home/hf/work/mysql-4.1.11083


mysql-test/t/myisam.test:
  Auto merged
parents b863330d 36a2a092
...@@ -151,7 +151,7 @@ SOURCE="..\strings\ctype-czech.c" ...@@ -151,7 +151,7 @@ SOURCE="..\strings\ctype-czech.c"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE="..\strings\ctype-cp963.c" SOURCE="..\strings\ctype-cp932.c"
# End Source File # End Source File
# Begin Source File # Begin Source File
......
...@@ -283,6 +283,7 @@ inline double ulonglong2double(ulonglong value) ...@@ -283,6 +283,7 @@ inline double ulonglong2double(ulonglong value)
#define doublestore(T,V) { *((long *) T) = *((long*) &V); \ #define doublestore(T,V) { *((long *) T) = *((long*) &V); \
*(((long *) T)+1) = *(((long*) &V)+1); } *(((long *) T)+1) = *(((long*) &V)+1); }
#define float4get(V,M) { *((long *) &(V)) = *((long*) (M)); } #define float4get(V,M) { *((long *) &(V)) = *((long*) (M)); }
#define floatget(V,M) memcpy((byte*) &V,(byte*) (M),sizeof(float))
#define floatstore(T,V) memcpy((byte*)(T), (byte*)(&V), sizeof(float)) #define floatstore(T,V) memcpy((byte*)(T), (byte*)(&V), sizeof(float))
#define float8get(V,M) doubleget((V),(M)) #define float8get(V,M) doubleget((V),(M))
#define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float)) #define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float))
......
...@@ -188,6 +188,13 @@ void STDCALL mysql_server_end() ...@@ -188,6 +188,13 @@ void STDCALL mysql_server_end()
mysql_thread_end(); mysql_thread_end();
free_charsets(); free_charsets();
mysql_client_init= org_my_init_done= 0; mysql_client_init= org_my_init_done= 0;
#ifdef EMBEDDED_SERVER
if (stderror_file)
{
fclose(stderror_file);
stderror_file= 0;
}
#endif
} }
static MYSQL_PARAMETERS mysql_internal_parameters= static MYSQL_PARAMETERS mysql_internal_parameters=
......
...@@ -587,11 +587,13 @@ int thr_write_keys(MI_SORT_PARAM *sort_param) ...@@ -587,11 +587,13 @@ int thr_write_keys(MI_SORT_PARAM *sort_param)
while (!got_error && while (!got_error &&
!my_b_read(&sinfo->tempfile_for_exceptions,(byte*)&key_length, !my_b_read(&sinfo->tempfile_for_exceptions,(byte*)&key_length,
sizeof(key_length)) && sizeof(key_length)))
!my_b_read(&sinfo->tempfile_for_exceptions,(byte*)mergebuf,
(uint) key_length))
{ {
if (_mi_ck_write(info,sinfo->key,(uchar*) mergebuf, byte ft_buf[HA_FT_MAXBYTELEN + HA_FT_WLEN + 10];
if (key_length > sizeof(ft_buf) ||
my_b_read(&sinfo->tempfile_for_exceptions, (byte*)ft_buf,
(uint)key_length) ||
_mi_ck_write(info, sinfo->key, (uchar*)ft_buf,
key_length - info->s->rec_reflength)) key_length - info->s->rec_reflength))
got_error=1; got_error=1;
} }
......
...@@ -128,3 +128,9 @@ SELECT * FROM t1; ...@@ -128,3 +128,9 @@ SELECT * FROM t1;
a a
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 (a CHAR(50) CHARACTER SET big5 NOT NULL, FULLTEXT(a));
INSERT INTO t1 VALUES(0xA741ADCCA66EB6DC20A7DAADCCABDCA66E);
SELECT HEX(a) FROM t1 WHERE MATCH(a) AGAINST (0xA741ADCCA66EB6DC IN BOOLEAN MODE);
HEX(a)
A741ADCCA66EB6DC20A7DAADCCABDCA66E
DROP TABLE t1;
...@@ -421,3 +421,11 @@ SELECT COUNT(*) FROM t1 WHERE MATCH(t) AGAINST ('"osnabr ...@@ -421,3 +421,11 @@ SELECT COUNT(*) FROM t1 WHERE MATCH(t) AGAINST ('"osnabr
COUNT(*) COUNT(*)
1 1
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 (a VARCHAR(30), FULLTEXT(a));
INSERT INTO t1 VALUES('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
SET myisam_repair_threads=2;
REPAIR TABLE t1;
Table Op Msg_type Msg_text
test.t1 repair status OK
SET myisam_repair_threads=@@global.myisam_repair_threads;
DROP TABLE t1;
...@@ -517,3 +517,34 @@ a group_concat(distinct b order by b) ...@@ -517,3 +517,34 @@ a group_concat(distinct b order by b)
2 3,7 2 3,7
NULL 1,2,3,4,7 NULL 1,2,3,4,7
drop table t1; drop table t1;
CREATE TABLE t1 (
aID smallint(5) unsigned NOT NULL auto_increment,
sometitle varchar(255) NOT NULL default '',
bID smallint(5) unsigned NOT NULL,
PRIMARY KEY (aID),
UNIQUE KEY sometitle (sometitle)
);
INSERT INTO t1 SET sometitle = 'title1', bID = 1;
INSERT INTO t1 SET sometitle = 'title2', bID = 1;
CREATE TABLE t2 (
bID smallint(5) unsigned NOT NULL auto_increment,
somename varchar(255) NOT NULL default '',
PRIMARY KEY (bID),
UNIQUE KEY somename (somename)
);
INSERT INTO t2 SET somename = 'test';
SELECT COUNT(*), GROUP_CONCAT(DISTINCT t2.somename SEPARATOR ' |')
FROM t1 JOIN t2 ON t1.bID = t2.bID;
COUNT(*) GROUP_CONCAT(DISTINCT t2.somename SEPARATOR ' |')
2 test
INSERT INTO t2 SET somename = 'test2';
SELECT COUNT(*), GROUP_CONCAT(DISTINCT t2.somename SEPARATOR ' |')
FROM t1 JOIN t2 ON t1.bID = t2.bID;
COUNT(*) GROUP_CONCAT(DISTINCT t2.somename SEPARATOR ' |')
2 test
DELETE FROM t2 WHERE somename = 'test2';
SELECT COUNT(*), GROUP_CONCAT(DISTINCT t2.somename SEPARATOR ' |')
FROM t1 JOIN t2 ON t1.bID = t2.bID;
COUNT(*) GROUP_CONCAT(DISTINCT t2.somename SEPARATOR ' |')
2 test
DROP TABLE t1,t2;
...@@ -137,3 +137,6 @@ select * from t1; ...@@ -137,3 +137,6 @@ select * from t1;
round(1, 6) round(1, 6)
1.000000 1.000000
drop table t1; drop table t1;
select abs(-2) * -2;
abs(-2) * -2
-4
...@@ -23,13 +23,13 @@ SELECT @@global.default.key_buffer_size; ...@@ -23,13 +23,13 @@ SELECT @@global.default.key_buffer_size;
@@global.default.key_buffer_size @@global.default.key_buffer_size
16777216 16777216
SELECT @@global.default.`key_buffer_size`; SELECT @@global.default.`key_buffer_size`;
@@global.default.key_buffer_size @@global.default.`key_buffer_size`
16777216 16777216
SELECT @@global.`default`.`key_buffer_size`; SELECT @@global.`default`.`key_buffer_size`;
@@global.default.key_buffer_size @@global.`default`.`key_buffer_size`
16777216 16777216
SELECT @@`default`.key_buffer_size; SELECT @@`default`.key_buffer_size;
@@default.key_buffer_size @@`default`.key_buffer_size
16777216 16777216
SELECT @@small.key_buffer_size; SELECT @@small.key_buffer_size;
@@small.key_buffer_size @@small.key_buffer_size
......
...@@ -364,3 +364,63 @@ select * from t1; ...@@ -364,3 +364,63 @@ select * from t1;
id id2 id id2
1 1 1 1
drop table t1; drop table t1;
CREATE TABLE t1 (a int);
CREATE TABLE t2 (a int, b int, INDEX idx(a));
CREATE TABLE t3 (b int, INDEX idx(b));
CREATE TABLE t4 (b int, INDEX idx(b));
INSERT INTO t1 VALUES (1), (2), (3), (4);
INSERT INTO t2 VALUES (1, 1), (3, 1);
INSERT INTO t3 VALUES
(NULL), (NULL), (NULL), (NULL), (NULL),
(NULL), (NULL), (NULL), (NULL), (NULL);
INSERT INTO t4 SELECT * FROM t3;
INSERT INTO t3 SELECT * FROM t4;
INSERT INTO t4 SELECT * FROM t3;
INSERT INTO t3 SELECT * FROM t4;
INSERT INTO t4 SELECT * FROM t3;
INSERT INTO t3 SELECT * FROM t4;
INSERT INTO t4 SELECT * FROM t3;
INSERT INTO t3 SELECT * FROM t4;
INSERT INTO t4 SELECT * FROM t3;
INSERT INTO t3 SELECT * FROM t4;
INSERT INTO t4 SELECT * FROM t3;
INSERT INTO t3 SELECT * FROM t4;
INSERT INTO t4 SELECT * FROM t3;
INSERT INTO t3 SELECT * FROM t4;
INSERT INTO t4 SELECT * FROM t3;
INSERT INTO t3 SELECT * FROM t4;
INSERT INTO t3 VALUES (2), (3);
ANALYZE table t1, t2, t3;
Table Op Msg_type Msg_text
test.t1 analyze status OK
test.t2 analyze status OK
test.t3 analyze status OK
SELECT COUNT(*) FROM t3;
COUNT(*)
15972
EXPLAIN SELECT SQL_CALC_FOUND_ROWS * FROM t1 LEFT JOIN t2 ON t1.a=t2.a
LEFT JOIN t3 ON t2.b=t3.b;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 4
1 SIMPLE t2 ref idx idx 5 test.t1.a 1
1 SIMPLE t3 ref idx idx 5 test.t2.b 1 Using index
FLUSH STATUS ;
SELECT SQL_CALC_FOUND_ROWS * FROM t1 LEFT JOIN t2 ON t1.a=t2.a
LEFT JOIN t3 ON t2.b=t3.b;
a a b b
1 1 1 NULL
2 NULL NULL NULL
3 3 1 NULL
4 NULL NULL NULL
SELECT FOUND_ROWS();
FOUND_ROWS()
4
SHOW STATUS LIKE "handler_read%";
Variable_name Value
Handler_read_first 0
Handler_read_key 6
Handler_read_next 2
Handler_read_prev 0
Handler_read_rnd 0
Handler_read_rnd_next 5
DROP TABLE t1,t2,t3,t4;
...@@ -332,7 +332,7 @@ execute stmt1 ; ...@@ -332,7 +332,7 @@ execute stmt1 ;
ERROR 42S02: Unknown table 't5' ERROR 42S02: Unknown table 't5'
prepare stmt1 from ' SELECT @@version ' ; prepare stmt1 from ' SELECT @@version ' ;
execute stmt1 ; execute stmt1 ;
@@VERSION @@version
<version> <version>
prepare stmt_do from ' do @var:= (1 in (select a from t1)) ' ; prepare stmt_do from ' do @var:= (1 in (select a from t1)) ' ;
prepare stmt_set from ' set @var= (1 in (select a from t1)) ' ; prepare stmt_set from ' set @var= (1 in (select a from t1)) ' ;
......
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
grant replication slave on *.* to rpl@127.0.0.1 identified by 'rpl';
stop slave;
change master to master_user='rpl',master_password='rpl';
start slave;
drop table if exists t1;
create table t1 (n int);
insert into t1 values (1);
select * from t1;
n
1
delete from mysql.user where user='rpl';
flush privileges;
stop slave;
start slave;
show slave status;
Slave_IO_State Connecting to master
Master_Host 127.0.0.1
Master_User rpl
Master_Port MASTER_MYPORT
Connect_Retry 1
Master_Log_File master-bin.000001
Read_Master_Log_Pos 357
Relay_Log_File slave-relay-bin.000001
Relay_Log_Pos 401
Relay_Master_Log_File master-bin.000001
Slave_IO_Running No
Slave_SQL_Running Yes
Replicate_Do_DB
Replicate_Ignore_DB
Replicate_Do_Table
Replicate_Ignore_Table
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos 357
Relay_Log_Space 401
Until_Condition None
Until_Log_File
Until_Log_Pos 0
Master_SSL_Allowed No
Master_SSL_CA_File
Master_SSL_CA_Path
Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master NULL
...@@ -179,3 +179,27 @@ set session @honk=99; ...@@ -179,3 +179,27 @@ set session @honk=99;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@honk=99' at line 1 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@honk=99' at line 1
set one_shot @honk=99; set one_shot @honk=99;
ERROR HY000: The SET ONE_SHOT syntax is reserved for purposes internal to the MySQL server ERROR HY000: The SET ONE_SHOT syntax is reserved for purposes internal to the MySQL server
select @@local.max_allowed_packet;
@@local.max_allowed_packet
#
select @@session.max_allowed_packet;
@@session.max_allowed_packet
#
select @@global.max_allowed_packet;
@@global.max_allowed_packet
#
select @@max_allowed_packet;
@@max_allowed_packet
#
select @@Max_Allowed_Packet;
@@Max_Allowed_Packet
#
select @@version;
@@version
#
select @@global.version;
@@global.version
#
select @@session.VERSION;
@@session.VERSION
#
...@@ -70,7 +70,7 @@ Variable_name Value ...@@ -70,7 +70,7 @@ Variable_name Value
max_join_size HA_POS_ERROR max_join_size HA_POS_ERROR
set @@max_join_size=1000, @@global.max_join_size=2000; set @@max_join_size=1000, @@global.max_join_size=2000;
select @@local.max_join_size, @@global.max_join_size; select @@local.max_join_size, @@global.max_join_size;
@@session.max_join_size @@global.max_join_size @@local.max_join_size @@global.max_join_size
1000 2000 1000 2000
select @@identity, length(@@version)>0; select @@identity, length(@@version)>0;
@@identity length(@@version)>0 @@identity length(@@version)>0
...@@ -407,23 +407,23 @@ Variable_name Value ...@@ -407,23 +407,23 @@ Variable_name Value
myisam_max_sort_file_size MAX_FILE_SIZE myisam_max_sort_file_size MAX_FILE_SIZE
set global myisam_max_sort_file_size=default; set global myisam_max_sort_file_size=default;
select @@global.max_user_connections,@@local.max_join_size; select @@global.max_user_connections,@@local.max_join_size;
@@global.max_user_connections @@session.max_join_size @@global.max_user_connections @@local.max_join_size
100 200 100 200
set @svc=@@global.max_user_connections, @svj=@@local.max_join_size; set @svc=@@global.max_user_connections, @svj=@@local.max_join_size;
select @@global.max_user_connections,@@local.max_join_size; select @@global.max_user_connections,@@local.max_join_size;
@@global.max_user_connections @@session.max_join_size @@global.max_user_connections @@local.max_join_size
100 200 100 200
set @@global.max_user_connections=111,@@local.max_join_size=222; set @@global.max_user_connections=111,@@local.max_join_size=222;
select @@global.max_user_connections,@@local.max_join_size; select @@global.max_user_connections,@@local.max_join_size;
@@global.max_user_connections @@session.max_join_size @@global.max_user_connections @@local.max_join_size
111 222 111 222
set @@global.max_user_connections=@@local.max_join_size,@@local.max_join_size=@@global.max_user_connections; set @@global.max_user_connections=@@local.max_join_size,@@local.max_join_size=@@global.max_user_connections;
select @@global.max_user_connections,@@local.max_join_size; select @@global.max_user_connections,@@local.max_join_size;
@@global.max_user_connections @@session.max_join_size @@global.max_user_connections @@local.max_join_size
222 111 222 111
set @@global.max_user_connections=@svc, @@local.max_join_size=@svj; set @@global.max_user_connections=@svc, @@local.max_join_size=@svj;
select @@global.max_user_connections,@@local.max_join_size; select @@global.max_user_connections,@@local.max_join_size;
@@global.max_user_connections @@session.max_join_size @@global.max_user_connections @@local.max_join_size
100 200 100 200
set @a=1, @b=2; set @a=1, @b=2;
set @a=@b, @b=@a; set @a=@b, @b=@a;
......
...@@ -85,3 +85,5 @@ UPDATE t1 SET t1.xstatus_vor = Greatest(t1.xstatus_vor,1) WHERE t1.aufnr = ...@@ -85,3 +85,5 @@ UPDATE t1 SET t1.xstatus_vor = Greatest(t1.xstatus_vor,1) WHERE t1.aufnr =
ASC LIMIT 1; ASC LIMIT 1;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -360,3 +360,5 @@ create table t1 ( a timestamp ); ...@@ -360,3 +360,5 @@ create table t1 ( a timestamp );
--error 1089 --error 1089
alter table t1 add unique ( a(1) ); alter table t1 add unique ( a(1) );
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -47,3 +47,5 @@ create table t1 (v varchar(128)); ...@@ -47,3 +47,5 @@ create table t1 (v varchar(128));
insert into t1 values ('abc'),('abc\'def\\hij\"klm\0opq'),('\''),('\"'),('\\'),('a\0'),('b\''),('c\"'),('d\\'),('\'b'),('\"c'),('\\d'),('a\0\0\0b'),('a\'\'\'\'b'),('a\"\"\"\"b'),('a\\\\\\\\b'),('\'\0\\\"'),('\'\''),('\"\"'),('\\\\'),('The\ZEnd'); insert into t1 values ('abc'),('abc\'def\\hij\"klm\0opq'),('\''),('\"'),('\\'),('a\0'),('b\''),('c\"'),('d\\'),('\'b'),('\"c'),('\\d'),('a\0\0\0b'),('a\'\'\'\'b'),('a\"\"\"\"b'),('a\\\\\\\\b'),('\'\0\\\"'),('\'\''),('\"\"'),('\\\\'),('The\ZEnd');
select * from t1 procedure analyse(); select * from t1 procedure analyse();
drop table t1; drop table t1;
# End of 4.1 tests
# #
# Bug #10901 Analyze Table on new table destroys table # Bug #10901 Analyze Table on new table destroys table
# This is minimal test case to get error # This is minimal test case to get error
# The problem was that analyze table wrote the shared state to the file and this # The problem was that analyze table wrote the shared state to the
# didn't include the inserts while locked. A check was needed to ensure that # file and this didn't include the inserts while locked. A check was
# state information was not updated when executing analyze table for a locked table. # needed to ensure that state information was not updated when
# The analyze table had to be within locks and check table had to be after unlocking # executing analyze table for a locked table. The analyze table had
# since then it brings the wrong state from disk rather than from the currently # to be within locks and check table had to be after unlocking since
# correct internal state. The insert is needed since it changes the file state, # then it brings the wrong state from disk rather than from the
# number of records. # currently correct internal state. The insert is needed since it
# The fix is to synchronise the state of the shared state and the current state before # changes the file state, number of records. The fix is to
# calling mi_state_info_write # synchronise the state of the shared state and the current state
# before calling mi_state_info_write
# #
create table t1 (a bigint); create table t1 (a bigint);
lock tables t1 write; lock tables t1 write;
insert into t1 values(0); insert into t1 values(0);
...@@ -37,3 +39,4 @@ check table t1; ...@@ -37,3 +39,4 @@ check table t1;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -25,3 +25,5 @@ SELECT id FROM t1 GROUP BY id2; ...@@ -25,3 +25,5 @@ SELECT id FROM t1 GROUP BY id2;
drop table t1; drop table t1;
SET @@SQL_MODE=""; SET @@SQL_MODE="";
# End of 4.1 tests
...@@ -1311,3 +1311,5 @@ select * from t4 where fld3='bonfire'; ...@@ -1311,3 +1311,5 @@ select * from t4 where fld3='bonfire';
select count(*) from t4; select count(*) from t4;
drop table t1, t2, t4; drop table t1, t2, t4;
# End of 4.1 tests
...@@ -218,3 +218,5 @@ CHECK TABLE t1; ...@@ -218,3 +218,5 @@ CHECK TABLE t1;
INSERT INTO t1 (b) VALUES ('bbbb'); INSERT INTO t1 (b) VALUES ('bbbb');
CHECK TABLE t1; CHECK TABLE t1;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
# End of 4.1 tests
...@@ -51,3 +51,5 @@ unlock tables; ...@@ -51,3 +51,5 @@ unlock tables;
connection con1; connection con1;
reap; reap;
drop table t5; drop table t5;
# End of 4.1 tests
...@@ -14,3 +14,5 @@ select * from t1; ...@@ -14,3 +14,5 @@ select * from t1;
alter table t1 drop column test; alter table t1 drop column test;
# Now we do a reboot and continue with the next test # Now we do a reboot and continue with the next test
# End of 4.1 tests
...@@ -6,3 +6,5 @@ ...@@ -6,3 +6,5 @@
-- source include/have_bdb.inc -- source include/have_bdb.inc
select * from t1; select * from t1;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -47,3 +47,5 @@ set autocommit=0; ...@@ -47,3 +47,5 @@ set autocommit=0;
insert into t1 values(1); insert into t1 values(1);
analyze table t1; analyze table t1;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -55,3 +55,5 @@ select * from t2; ...@@ -55,3 +55,5 @@ select * from t2;
commit; commit;
drop table t1,t2; drop table t1,t2;
# End of 4.1 tests
...@@ -55,3 +55,5 @@ select * from t2; ...@@ -55,3 +55,5 @@ select * from t2;
commit; commit;
drop table t1,t2; drop table t1,t2;
# End of 4.1 tests
...@@ -929,3 +929,5 @@ SELECT id FROM t1 WHERE (list_id = 1) AND (term = "letterb"); ...@@ -929,3 +929,5 @@ SELECT id FROM t1 WHERE (list_id = 1) AND (term = "letterb");
SELECT id FROM t1 WHERE (list_id = 1) AND (term = "lettera"); SELECT id FROM t1 WHERE (list_id = 1) AND (term = "lettera");
SELECT id FROM t1 WHERE (list_id = 1) AND (term = "letterd"); SELECT id FROM t1 WHERE (list_id = 1) AND (term = "letterd");
DROP TABLE t1; DROP TABLE t1;
# End of 4.1 tests
...@@ -49,3 +49,5 @@ show status like "Qcache_hits"; ...@@ -49,3 +49,5 @@ show status like "Qcache_hits";
commit; commit;
show status like "Qcache_queries_in_cache"; show status like "Qcache_queries_in_cache";
drop table if exists t1, t2, t3; drop table if exists t1, t2, t3;
# End of 4.1 tests
...@@ -18,3 +18,5 @@ enable_query_log; ...@@ -18,3 +18,5 @@ enable_query_log;
select count(distinct n) from t1; select count(distinct n) from t1;
explain extended select count(distinct n) from t1; explain extended select count(distinct n) from t1;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -104,3 +104,4 @@ t2.value64=t1.value64; ...@@ -104,3 +104,4 @@ t2.value64=t1.value64;
drop table t1, t2; drop table t1, t2;
# End of 4.1 tests
...@@ -87,3 +87,5 @@ drop table t1; ...@@ -87,3 +87,5 @@ drop table t1;
create table t1 (a binary); create table t1 (a binary);
show create table t1; show create table t1;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -125,3 +125,5 @@ let $VERSION=`select version()`; ...@@ -125,3 +125,5 @@ let $VERSION=`select version()`;
show binlog events; show binlog events;
drop table t1,t2,t3; drop table t1,t2,t3;
# End of 4.1 tests
...@@ -48,3 +48,5 @@ select ifnull(A, 'N') as A, ifnull(B, 'N') as B, ifnull(not A, 'N') as nA, ifnul ...@@ -48,3 +48,5 @@ select ifnull(A, 'N') as A, ifnull(B, 'N') as B, ifnull(not A, 'N') as nA, ifnul
select ifnull(A=1, 'N') as A, ifnull(B=1, 'N') as B, ifnull(not (A=1), 'N') as nA, ifnull(not (B=1), 'N') as nB, ifnull((A=1) and (B=1), 'N') as AB, ifnull(not ((A=1) and (B=1)), 'N') as `n(AB)`, ifnull((not (A=1) or not (B=1)), 'N') as nAonB, ifnull((A=1) or (B=1), 'N') as AoB, ifnull(not((A=1) or (B=1)), 'N') as `n(AoB)`, ifnull(not (A=1) and not (B=1), 'N') as nAnB from t1; select ifnull(A=1, 'N') as A, ifnull(B=1, 'N') as B, ifnull(not (A=1), 'N') as nA, ifnull(not (B=1), 'N') as nB, ifnull((A=1) and (B=1), 'N') as AB, ifnull(not ((A=1) and (B=1)), 'N') as `n(AB)`, ifnull((not (A=1) or not (B=1)), 'N') as nAonB, ifnull((A=1) or (B=1), 'N') as AoB, ifnull(not((A=1) or (B=1)), 'N') as `n(AoB)`, ifnull(not (A=1) and not (B=1), 'N') as nAnB from t1;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -11,3 +11,4 @@ select * from t1; ...@@ -11,3 +11,4 @@ select * from t1;
check table t1; check table t1;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -118,3 +118,5 @@ SELECT CASE LOWER('1') WHEN LOWER('2') THEN 'BUG' ELSE 'nobug' END; ...@@ -118,3 +118,5 @@ SELECT CASE LOWER('1') WHEN LOWER('2') THEN 'BUG' ELSE 'nobug' END;
SELECT 'case+union+test' SELECT 'case+union+test'
UNION UNION
SELECT CASE '1' WHEN '2' THEN 'BUG' ELSE 'nobug' END; SELECT CASE '1' WHEN '2' THEN 'BUG' ELSE 'nobug' END;
# End of 4.1 tests
...@@ -142,3 +142,5 @@ select cast(concat('184467440','73709551615') as signed); ...@@ -142,3 +142,5 @@ select cast(concat('184467440','73709551615') as signed);
select cast(repeat('1',20) as unsigned); select cast(repeat('1',20) as unsigned);
select cast(repeat('1',20) as signed); select cast(repeat('1',20) as signed);
# End of 4.1 tests
...@@ -22,3 +22,4 @@ connection con1; ...@@ -22,3 +22,4 @@ connection con1;
reap; reap;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -17,3 +17,5 @@ select 1 --2 ...@@ -17,3 +17,5 @@ select 1 --2
select 1 # The rest of the row will be ignored select 1 # The rest of the row will be ignored
; ;
/* line with only comment */; /* line with only comment */;
# End of 4.1 tests
...@@ -35,3 +35,5 @@ DROP TABLE t1; ...@@ -35,3 +35,5 @@ DROP TABLE t1;
SELECT CHAR(31) = '', '' = CHAR(31); SELECT CHAR(31) = '', '' = CHAR(31);
# Extra test # Extra test
SELECT CHAR(30) = '', '' = CHAR(30); SELECT CHAR(30) = '', '' = CHAR(30);
# End of 4.1 tests
...@@ -76,3 +76,5 @@ show tables; ...@@ -76,3 +76,5 @@ show tables;
delete from mysql.user where user=_binary"test"; delete from mysql.user where user=_binary"test";
flush privileges; flush privileges;
# End of 4.1 tests
...@@ -39,3 +39,5 @@ select * from t1; # if consistent snapshot was not set, as expected, we ...@@ -39,3 +39,5 @@ select * from t1; # if consistent snapshot was not set, as expected, we
commit; commit;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -27,3 +27,5 @@ alter table t1 add constraint unique key_1(a); ...@@ -27,3 +27,5 @@ alter table t1 add constraint unique key_1(a);
alter table t1 add constraint constraint_2 unique key_2(a); alter table t1 add constraint constraint_2 unique key_2(a);
show create table t1; show create table t1;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -55,3 +55,4 @@ create table t1 (f int); ...@@ -55,3 +55,4 @@ create table t1 (f int);
select count(distinct f) from t1; select count(distinct f) from t1;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -79,3 +79,4 @@ select count(distinct s) from t1; ...@@ -79,3 +79,4 @@ select count(distinct s) from t1;
show status like 'Created_tmp_disk_tables'; show status like 'Created_tmp_disk_tables';
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -56,3 +56,5 @@ SELECT COUNT(DISTINCT id) FROM t1 GROUP BY grp; ...@@ -56,3 +56,5 @@ SELECT COUNT(DISTINCT id) FROM t1 GROUP BY grp;
DROP TABLE t1; DROP TABLE t1;
set @@read_buffer_size=default; set @@read_buffer_size=default;
# End of 4.1 tests
...@@ -503,3 +503,5 @@ create table test.t1 like x; ...@@ -503,3 +503,5 @@ create table test.t1 like x;
--disable_warnings --disable_warnings
drop table if exists test.t1; drop table if exists test.t1;
--enable_warnings --enable_warnings
# End of 4.1 tests
...@@ -27,3 +27,5 @@ select * from t2; ...@@ -27,3 +27,5 @@ select * from t2;
CREATE TEMPORARY TABLE t2 ( PRIMARY KEY (a) ) ENGINE=MYISAM SELECT a FROM t1; CREATE TEMPORARY TABLE t2 ( PRIMARY KEY (a) ) ENGINE=MYISAM SELECT a FROM t1;
--error 1146; --error 1146;
select * from t2; select * from t2;
# End of 4.1 tests
...@@ -1313,3 +1313,5 @@ INSERT INTO t1 VALUES (9410,9412); ...@@ -1313,3 +1313,5 @@ INSERT INTO t1 VALUES (9410,9412);
select period from t1; select period from t1;
drop table if exists t1,t2,t3,t4; drop table if exists t1,t2,t3,t4;
# End of 4.1 tests
...@@ -27,3 +27,13 @@ CREATE TABLE t1 (a text) character set big5; ...@@ -27,3 +27,13 @@ CREATE TABLE t1 (a text) character set big5;
INSERT INTO t1 VALUES (''); INSERT INTO t1 VALUES ('');
SELECT * FROM t1; SELECT * FROM t1;
DROP TABLE t1; DROP TABLE t1;
#
# BUG#12075 - FULLTEXT non-functional for big5 strings
#
CREATE TABLE t1 (a CHAR(50) CHARACTER SET big5 NOT NULL, FULLTEXT(a));
INSERT INTO t1 VALUES(0xA741ADCCA66EB6DC20A7DAADCCABDCA66E);
SELECT HEX(a) FROM t1 WHERE MATCH(a) AGAINST (0xA741ADCCA66EB6DC IN BOOLEAN MODE);
DROP TABLE t1;
# End of 4.1 tests
...@@ -206,3 +206,5 @@ EXPLAIN SELECT * FROM t1 WHERE s1 LIKE 'a' COLLATE latin1_german1_ci; ...@@ -206,3 +206,5 @@ EXPLAIN SELECT * FROM t1 WHERE s1 LIKE 'a' COLLATE latin1_german1_ci;
EXPLAIN SELECT * FROM t1 WHERE s2 LIKE 'a' COLLATE latin1_german1_ci; EXPLAIN SELECT * FROM t1 WHERE s2 LIKE 'a' COLLATE latin1_german1_ci;
DROP TABLE t1; DROP TABLE t1;
# End of 4.1 tests
...@@ -22,3 +22,5 @@ INSERT INTO t1 VALUES ('2005-01-1'); ...@@ -22,3 +22,5 @@ INSERT INTO t1 VALUES ('2005-01-1');
SELECT * FROM t1 WHERE popisek = '2005-01-1'; SELECT * FROM t1 WHERE popisek = '2005-01-1';
SELECT * FROM t1 WHERE popisek LIKE '2005-01-1'; SELECT * FROM t1 WHERE popisek LIKE '2005-01-1';
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -46,3 +46,5 @@ insert into t1 (a) values ('air'), ...@@ -46,3 +46,5 @@ insert into t1 (a) values ('air'),
select * from t1 where a like 'we_%'; select * from t1 where a like 'we_%';
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -408,3 +408,5 @@ SET collation_connection='cp932_japanese_ci'; ...@@ -408,3 +408,5 @@ SET collation_connection='cp932_japanese_ci';
SET collation_connection='cp932_bin'; SET collation_connection='cp932_bin';
-- source include/ctype_filesort.inc -- source include/ctype_filesort.inc
-- source include/ctype_innodb_like.inc -- source include/ctype_innodb_like.inc
# End of 4.1 tests
...@@ -98,3 +98,5 @@ show create database mysqltest2; ...@@ -98,3 +98,5 @@ show create database mysqltest2;
drop database mysqltest2; drop database mysqltest2;
--error 1046 --error 1046
ALTER DATABASE DEFAULT CHARACTER SET latin2; ALTER DATABASE DEFAULT CHARACTER SET latin2;
# End of 4.1 tests
...@@ -28,3 +28,5 @@ CREATE TABLE t1 (a text) character set gbk; ...@@ -28,3 +28,5 @@ CREATE TABLE t1 (a text) character set gbk;
INSERT INTO t1 VALUES (0xA3A0),(0xA1A1); INSERT INTO t1 VALUES (0xA3A0),(0xA1A1);
SELECT hex(a) FROM t1 ORDER BY a; SELECT hex(a) FROM t1 ORDER BY a;
DROP TABLE t1; DROP TABLE t1;
# End of 4.1 tests
...@@ -75,3 +75,5 @@ SET collation_connection='latin1_bin'; ...@@ -75,3 +75,5 @@ SET collation_connection='latin1_bin';
--error 1064 --error 1064
CREATE TABLE a (a int); CREATE TABLE a (a int);
SELECT 'a' as str; SELECT 'a' as str;
# End of 4.1 tests
...@@ -132,3 +132,5 @@ INSERT INTO t1 VALUES (' ...@@ -132,3 +132,5 @@ INSERT INTO t1 VALUES ('
ALTER TABLE t1 ADD KEY ifword(col1); ALTER TABLE t1 ADD KEY ifword(col1);
SELECT * FROM t1 WHERE col1='' ORDER BY col1, BINARY col1; SELECT * FROM t1 WHERE col1='' ORDER BY col1, BINARY col1;
DROP TABLE t1; DROP TABLE t1;
# End of 4.1 tests
...@@ -48,3 +48,5 @@ a, lower(a) l, upper(a) u from t1 order by ha; ...@@ -48,3 +48,5 @@ a, lower(a) l, upper(a) u from t1 order by ha;
# #
SELECT group_concat(a collate latin2_croatian_ci order by binary a) from t1 group by a collate latin2_croatian_ci; SELECT group_concat(a collate latin2_croatian_ci order by binary a) from t1 group by a collate latin2_croatian_ci;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -209,3 +209,5 @@ SET CHARACTER SET 'binary'; ...@@ -209,3 +209,5 @@ SET CHARACTER SET 'binary';
SELECT * FROM t1; SELECT * FROM t1;
SELECT min(comment),count(*) FROM t1 GROUP BY ucs2_f; SELECT min(comment),count(*) FROM t1 GROUP BY ucs2_f;
DROP TABLE t1; DROP TABLE t1;
# End of 4.1 tests
...@@ -24,3 +24,5 @@ ALTER TABLE t1 CHANGE a a CHAR(4) CHARACTER SET utf8; ...@@ -24,3 +24,5 @@ ALTER TABLE t1 CHANGE a a CHAR(4) CHARACTER SET utf8;
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
SHOW KEYS FROM t1; SHOW KEYS FROM t1;
DROP TABLE t1; DROP TABLE t1;
# End of 4.1 tests
...@@ -179,3 +179,5 @@ select rpad(c1,3,' ...@@ -179,3 +179,5 @@ select rpad(c1,3,'
# TODO # TODO
#select case c1 when '' then '' when '' then '' else 'c' end from t1; #select case c1 when '' then '' when '' then '' else 'c' end from t1;
#select export_set(5,c1,''), export_set(5,'',c1) from t1; #select export_set(5,c1,''), export_set(5,'',c1) from t1;
# End of 4.1 tests
...@@ -77,3 +77,5 @@ SET collation_connection='sjis_bin'; ...@@ -77,3 +77,5 @@ SET collation_connection='sjis_bin';
--character_set sjis --character_set sjis
SET NAMES sjis; SET NAMES sjis;
SELECT HEX('@\\') FROM DUAL; SELECT HEX('@\\') FROM DUAL;
# End of 4.1 tests
...@@ -157,3 +157,5 @@ SET collation_connection='tis620_thai_ci'; ...@@ -157,3 +157,5 @@ SET collation_connection='tis620_thai_ci';
-- source include/ctype_filesort.inc -- source include/ctype_filesort.inc
SET collation_connection='tis620_bin'; SET collation_connection='tis620_bin';
-- source include/ctype_filesort.inc -- source include/ctype_filesort.inc
# End of 4.1 tests
...@@ -455,3 +455,5 @@ drop table t1; ...@@ -455,3 +455,5 @@ drop table t1;
SET collation_connection='utf8_unicode_ci'; SET collation_connection='utf8_unicode_ci';
-- source include/ctype_filesort.inc -- source include/ctype_filesort.inc
# End of 4.1 tests
...@@ -416,3 +416,5 @@ insert into t1 values (0x803d); ...@@ -416,3 +416,5 @@ insert into t1 values (0x803d);
insert into t1 values (0x005b); insert into t1 values (0x005b);
select hex(a) from t1; select hex(a) from t1;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -17,4 +17,4 @@ show binlog events from 79; ...@@ -17,4 +17,4 @@ show binlog events from 79;
--exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001 --exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001
drop table t2; drop table t2;
# End of 4.1 tests
...@@ -1149,3 +1149,5 @@ SET collation_connection='ujis_japanese_ci'; ...@@ -1149,3 +1149,5 @@ SET collation_connection='ujis_japanese_ci';
SET collation_connection='ujis_bin'; SET collation_connection='ujis_bin';
-- source include/ctype_filesort.inc -- source include/ctype_filesort.inc
-- source include/ctype_innodb_like.inc -- source include/ctype_innodb_like.inc
# End of 4.1 tests
...@@ -842,3 +842,5 @@ insert into t1 values (_utf8 0xe880bd); ...@@ -842,3 +842,5 @@ insert into t1 values (_utf8 0xe880bd);
insert into t1 values (_utf8 0x5b); insert into t1 values (_utf8 0x5b);
select hex(a) from t1; select hex(a) from t1;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -259,3 +259,5 @@ select str_to_date("2003-01-02 10:11:12.0012ABCD", "%Y-%m-%d %H:%i:%S.%f") as f1 ...@@ -259,3 +259,5 @@ select str_to_date("2003-01-02 10:11:12.0012ABCD", "%Y-%m-%d %H:%i:%S.%f") as f1
select str_to_date("2003-04-05 g", "%Y-%m-%d") as f1, select str_to_date("2003-04-05 g", "%Y-%m-%d") as f1,
str_to_date("2003-04-05 10:11:12.101010234567", "%Y-%m-%d %H:%i:%S.%f") as f2; str_to_date("2003-04-05 10:11:12.101010234567", "%Y-%m-%d %H:%i:%S.%f") as f2;
--enable_ps_protocol --enable_ps_protocol
# End of 4.1 tests
...@@ -34,3 +34,5 @@ insert delayed into t1 values (3,"this will give an","error"); ...@@ -34,3 +34,5 @@ insert delayed into t1 values (3,"this will give an","error");
--sleep 2 --sleep 2
select * from t1; select * from t1;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -152,3 +152,5 @@ INSERT INTO t1 VALUES (0),(1),(2); ...@@ -152,3 +152,5 @@ INSERT INTO t1 VALUES (0),(1),(2);
DELETE FROM t1 WHERE t1.a > 0 ORDER BY t1.a LIMIT 1; DELETE FROM t1 WHERE t1.a > 0 ORDER BY t1.a LIMIT 1;
SELECT * FROM t1; SELECT * FROM t1;
DROP TABLE t1; DROP TABLE t1;
# End of 4.1 tests
...@@ -236,3 +236,5 @@ insert into t3 values(3),(3); ...@@ -236,3 +236,5 @@ insert into t3 values(3),(3);
select * from t1 union distinct select * from t2 union all select * from t3; select * from t1 union distinct select * from t2 union all select * from t3;
select * from (select * from t1 union distinct select * from t2 union all select * from t3) X; select * from (select * from t1 union distinct select * from t2 union all select * from t3) X;
drop table t1, t2, t3; drop table t1, t2, t3;
# End of 4.1 tests
...@@ -12,3 +12,5 @@ create table t1 (n int); ...@@ -12,3 +12,5 @@ create table t1 (n int);
insert into t1 values (1),(2),(3); insert into t1 values (1),(2),(3);
select * from t1; select * from t1;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -332,3 +332,5 @@ CREATE TABLE t1 ( ...@@ -332,3 +332,5 @@ CREATE TABLE t1 (
INSERT INTO t1 VALUES ('1',1,0); INSERT INTO t1 VALUES ('1',1,0);
SELECT DISTINCT html,SUM(out)/(SUM(rin)+1) as 'prod' FROM t1 GROUP BY rin; SELECT DISTINCT html,SUM(out)/(SUM(rin)+1) as 'prod' FROM t1 GROUP BY rin;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -79,3 +79,5 @@ unlock tables; ...@@ -79,3 +79,5 @@ unlock tables;
create table t1(n int); create table t1(n int);
show tables; show tables;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -23,3 +23,5 @@ let $VERSION=`select version()`; ...@@ -23,3 +23,5 @@ let $VERSION=`select version()`;
--replace_column 2 # 5 # --replace_column 2 # 5 #
show binlog events; show binlog events;
drop database `drop-temp+table-test`; drop database `drop-temp+table-test`;
# End of 4.1 tests
...@@ -11,3 +11,5 @@ select count(*) from t1; ...@@ -11,3 +11,5 @@ select count(*) from t1;
select * from t1; select * from t1;
select * from t1 limit 0; select * from t1 limit 0;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -94,3 +94,5 @@ select text1, length(text1) from t1 where text1='teststring' or text1 like 'test ...@@ -94,3 +94,5 @@ select text1, length(text1) from t1 where text1='teststring' or text1 like 'test
select text1, length(text1) from t1 where text1='teststring' or text1 >= 'teststring\t'; select text1, length(text1) from t1 where text1='teststring' or text1 >= 'teststring\t';
select concat('|', text1, '|') from t1 order by text1; select concat('|', text1, '|') from t1 order by text1;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -29,3 +29,5 @@ select 1 from t1 order by t1.b; ...@@ -29,3 +29,5 @@ select 1 from t1 order by t1.b;
--error 1054 --error 1054
select count(*),b from t1; select count(*),b from t1;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -14,3 +14,5 @@ CREATE TABLE t1 ( ...@@ -14,3 +14,5 @@ CREATE TABLE t1 (
) ENGINE=example; ) ENGINE=example;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -41,3 +41,5 @@ insert into ...@@ -41,3 +41,5 @@ insert into
explain select 0 from where 0=1; explain select 0 from where 0=1;
drop table ; drop table ;
set names latin1; set names latin1;
# End of 4.1 tests
...@@ -69,3 +69,5 @@ connection con2; ...@@ -69,3 +69,5 @@ connection con2;
insert into t1 values (345); insert into t1 values (345);
select * from t1; select * from t1;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -76,3 +76,5 @@ select * from t1; ...@@ -76,3 +76,5 @@ select * from t1;
show create database test; show create database test;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -72,3 +72,5 @@ handler t1 read next limit 1; ...@@ -72,3 +72,5 @@ handler t1 read next limit 1;
handler t1 read next limit 1; handler t1 read next limit 1;
handler t1 close; handler t1 close;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -21,3 +21,5 @@ create table t1 ( ...@@ -21,3 +21,5 @@ create table t1 (
create index a on t1 (a); create index a on t1 (a);
create unique index b on t1 (a,b); create unique index b on t1 (a,b);
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -338,3 +338,16 @@ SET NAMES latin1; ...@@ -338,3 +338,16 @@ SET NAMES latin1;
INSERT INTO t1 VALUES('Mit freundlichem Gr aus Osnabrck'); INSERT INTO t1 VALUES('Mit freundlichem Gr aus Osnabrck');
SELECT COUNT(*) FROM t1 WHERE MATCH(t) AGAINST ('"osnabrck"' IN BOOLEAN MODE); SELECT COUNT(*) FROM t1 WHERE MATCH(t) AGAINST ('"osnabrck"' IN BOOLEAN MODE);
DROP TABLE t1; DROP TABLE t1;
#
# BUG#11684 - repair crashes mysql when table has fulltext index
#
CREATE TABLE t1 (a VARCHAR(30), FULLTEXT(a));
INSERT INTO t1 VALUES('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
SET myisam_repair_threads=2;
REPAIR TABLE t1;
SET myisam_repair_threads=@@global.myisam_repair_threads;
DROP TABLE t1;
# End of 4.1 tests
...@@ -182,3 +182,4 @@ select count(*) from t1 where match a against ('aaazzz' in boolean mode); ...@@ -182,3 +182,4 @@ select count(*) from t1 where match a against ('aaazzz' in boolean mode);
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -42,3 +42,5 @@ SELECT t1.q, t2.item, t2.id, MATCH t2.item AGAINST ('sushi' IN BOOLEAN MODE) ...@@ -42,3 +42,5 @@ SELECT t1.q, t2.item, t2.id, MATCH t2.item AGAINST ('sushi' IN BOOLEAN MODE)
as x FROM t2, t1 WHERE (t2.id2 = t1.id) ORDER BY x DESC,t2.id; as x FROM t2, t1 WHERE (t2.id2 = t1.id) ORDER BY x DESC,t2.id;
drop table t1, t2; drop table t1, t2;
# End of 4.1 tests
...@@ -42,3 +42,5 @@ WHERE MATCH (t1.value) AGAINST ('baz333' IN BOOLEAN MODE) ...@@ -42,3 +42,5 @@ WHERE MATCH (t1.value) AGAINST ('baz333' IN BOOLEAN MODE)
AND t1.id = t2.id_t1; AND t1.id = t2.id_t1;
DROP TABLE t1, t2; DROP TABLE t1, t2;
# End of 4.1 tests
...@@ -45,3 +45,4 @@ select * from t1 left join t2 on (venue_id = entity_id and match(name) against(' ...@@ -45,3 +45,4 @@ select * from t1 left join t2 on (venue_id = entity_id and match(name) against('
select * from t1 left join t2 on (venue_id = entity_id and match(name) against('aberdeen')) where dt = '2003-05-23 19:30:00'; select * from t1 left join t2 on (venue_id = entity_id and match(name) against('aberdeen')) where dt = '2003-05-23 19:30:00';
drop table t1,t2; drop table t1,t2;
# End of 4.1 tests
...@@ -21,3 +21,5 @@ SELECT a, round(MATCH b AGAINST ('lala lkjh'),5) FROM t1; ...@@ -21,3 +21,5 @@ SELECT a, round(MATCH b AGAINST ('lala lkjh'),5) FROM t1;
SELECT a, round(MATCH c AGAINST ('lala lkjh'),5) FROM t1; SELECT a, round(MATCH c AGAINST ('lala lkjh'),5) FROM t1;
SELECT a, round(MATCH b,c AGAINST ('lala lkjh'),5) FROM t1; SELECT a, round(MATCH b,c AGAINST ('lala lkjh'),5) FROM t1;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -135,3 +135,4 @@ order by ...@@ -135,3 +135,4 @@ order by
drop table t1,t2,t3; drop table t1,t2,t3;
# End of 4.1 tests
...@@ -25,3 +25,5 @@ update test set url='test', shortdesc='ggg', longdesc='mmm', ...@@ -25,3 +25,5 @@ update test set url='test', shortdesc='ggg', longdesc='mmm',
description='ddd', name='nam' where gnr=2; description='ddd', name='nam' where gnr=2;
check table test; check table test;
drop table test; drop table test;
# End of 4.1 tests
...@@ -25,3 +25,4 @@ set global ft_boolean_syntax='@ -><()~*:""@|'; ...@@ -25,3 +25,4 @@ set global ft_boolean_syntax='@ -><()~*:""@|';
set global ft_boolean_syntax='+ -><()~*:""@!|'; set global ft_boolean_syntax='+ -><()~*:""@!|';
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -45,3 +45,4 @@ set @@max_allowed_packet=1048576*100; ...@@ -45,3 +45,4 @@ set @@max_allowed_packet=1048576*100;
--replace_result "''" XXX "'1'" XXX --replace_result "''" XXX "'1'" XXX
eval select compress(repeat('aaaaaaaaaa', IF('$LOW_MEMORY', 10, 10000000))) is null; eval select compress(repeat('aaaaaaaaaa', IF('$LOW_MEMORY', 10, 10000000))) is null;
# End of 4.1 tests
...@@ -50,3 +50,4 @@ select 'a' union select concat('a', -0); ...@@ -50,3 +50,4 @@ select 'a' union select concat('a', -0);
--replace_result 'a-0.0' good 'a0.0' good --replace_result 'a-0.0' good 'a0.0' good
select 'a' union select concat('a', -0.0); select 'a' union select concat('a', -0.0);
# End of 4.1 tests
...@@ -48,3 +48,5 @@ select old_password('idkfa'); ...@@ -48,3 +48,5 @@ select old_password('idkfa');
select old_password(' i d k f a '); select old_password(' i d k f a ');
explain extended select password('idkfa '), old_password('idkfa'); explain extended select password('idkfa '), old_password('idkfa');
# End of 4.1 tests
...@@ -40,3 +40,5 @@ having mts < DATE_SUB(NOW(),INTERVAL 3 MONTH); ...@@ -40,3 +40,5 @@ having mts < DATE_SUB(NOW(),INTERVAL 3 MONTH);
select visitor_id,max(ts) as mts from t1 group by visitor_id select visitor_id,max(ts) as mts from t1 group by visitor_id
having DATE_ADD(mts,INTERVAL 3 MONTH) < NOW(); having DATE_ADD(mts,INTERVAL 3 MONTH) < NOW();
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -17,3 +17,5 @@ explain select * from t1 where str <> default(str); ...@@ -17,3 +17,5 @@ explain select * from t1 where str <> default(str);
#insert into t2 select select default(str), default(strnull), default(intg), default(rel) from t1; #insert into t2 select select default(str), default(strnull), default(intg), default(rel) from t1;
drop table t1; drop table t1;
# End of 4.1 tests
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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