Commit 36b6bf2e authored by unknown's avatar unknown

Merge mysql.com:/home/my/mysql-4.1

into  mysql.com:/home/my/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
BitKeeper/deleted/.del-isam.test~834fb0ee8196c445:
  Auto merged
include/thr_lock.h:
  Auto merged
mysql-test/t/alias.test:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/archive.test:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/bool.test:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
mysql-test/t/count_distinct2.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/ctype_many.test:
  Auto merged
mysql-test/t/ctype_ucs_binlog.test:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
mysql-test/t/distinct.test:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/endspace.test:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/fulltext_order_by.test:
  Auto merged
mysql-test/t/func_compress.test:
  Auto merged
mysql-test/t/func_concat.test:
  Auto merged
mysql-test/t/func_date_add.test:
  Auto merged
mysql-test/t/func_equal.test:
  Auto merged
mysql-test/t/func_if.test:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_set.test:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/gis-rtree.test:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
mysql-test/t/heap_btree.test:
  Auto merged
mysql-test/t/heap_hash.test:
  Auto merged
mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged
mysql-test/t/insert_update.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/keywords.test:
  Auto merged
mysql-test/t/limit.test:
  Auto merged
mysql-test/t/lock.test:
  Auto merged
mysql-test/t/lowercase_table.test:
  Auto merged
mysql-test/t/lowercase_table3.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/mysqlbinlog2.test:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
mysql-test/t/ndb_autodiscover.test:
  Auto merged
mysql-test/t/ndb_charset.test:
  Auto merged
mysql-test/t/ndb_grant.later:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
mysql-test/t/ndb_types.test:
  Auto merged
mysql-test/t/ndb_update.test:
  Auto merged
mysql-test/t/null.test:
  Auto merged
mysql-test/t/null_key.test:
  Auto merged
mysql-test/t/olap.test:
  Auto merged
mysql-test/t/openssl_1.test:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/ps_4heap.test:
  Auto merged
mysql-test/t/ps_5merge.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/replace.test:
  Auto merged
mysql-test/t/row.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl000015.test:
  Auto merged
mysql-test/t/rpl000017.test:
  Auto merged
mysql-test/t/rpl000018.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_charset.test:
  Auto merged
mysql-test/t/rpl_create_database.test:
  Auto merged
mysql-test/t/rpl_ddl.test:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
mysql-test/t/rpl_empty_master_crash.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_flush_tables.test:
  Auto merged
mysql-test/t/rpl_get_lock.test:
  Auto merged
mysql-test/t/rpl_heap.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_loaddata_rule_m.test:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
mysql-test/t/rpl_log_pos.test:
  Auto merged
mysql-test/t/rpl_max_relay_size.test:
  Auto merged
mysql-test/t/rpl_multi_query.test:
  Auto merged
mysql-test/t/rpl_openssl.test:
  Auto merged
mysql-test/t/rpl_redirect.test:
  Auto merged
mysql-test/t/rpl_relayrotate.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysql-test/t/rpl_reset_slave.test:
  Auto merged
mysql-test/t/rpl_server_id2.test:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
mysql-test/t/rpl_timezone.test:
  Auto merged
mysql-test/t/rpl_user_variables.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysql-test/t/synchronization.test:
  Auto merged
mysql-test/t/system_mysql_db.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
mysql-test/t/temp_table.test:
  Auto merged
mysql-test/t/timezone2.test:
  Auto merged
mysql-test/t/timezone_grant.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/type_ranges.test:
  Auto merged
mysql-test/t/type_timestamp.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
mysql-test/t/update.test:
  Auto merged
mysql-test/t/user_var-binlog.test:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
mysys/thr_lock.c:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
BitKeeper/deleted/.del-rpl_trunc_binlog.test~961b1f6ac73d37c8:
  Simple merge
mysql-test/r/ps_grant.result:
  Simple merge
mysql-test/t/analyse.test:
  Simple merge
mysql-test/t/auto_increment.test:
  Simple merge
mysql-test/t/bdb.test:
  Simple merge
mysql-test/t/bigint.test:
  Simple merge
mysql-test/t/case.test:
  Simple merge
mysql-test/t/cast.test:
  Simple merge
mysql-test/t/check.test:
  Simple merge
mysql-test/t/count_distinct.test:
  Simple merge
mysql-test/t/ctype_latin1_de.test:
  Simple merge
mysql-test/t/ctype_uca.test:
  Simple merge
mysql-test/t/ctype_ucs.test:
  Simple merge
mysql-test/t/ctype_utf8.test:
  Simple merge
mysql-test/t/delete.test:
  Simple merge
mysql-test/t/flush_block_commit.test:
  Simple merge
mysql-test/t/func_default.test:
  Simple merge
mysql-test/t/func_gconcat.test:
  Simple merge
mysql-test/t/func_group.test:
  Aligned code with 4.1
mysql-test/t/func_in.test:
  Simple merge
mysql-test/t/func_math.test:
  Simple merge
mysql-test/t/func_misc.test:
  Simple merge
mysql-test/t/func_test.test:
  Simple merge
mysql-test/t/func_time.test:
  Simple merge
mysql-test/t/group_by.test:
  Simple merge
mysql-test/t/having.test:
  Simple merge
mysql-test/t/innodb.test:
  Simple merge
mysql-test/t/insert.test:
  Simple merge
mysql-test/t/join_outer.test:
  Simple merge
mysql-test/t/kill.test:
  Simple merge
mysql-test/t/loaddata.test:
  Simple merge
mysql-test/t/lock_multi.test:
  Simple merge
mysql-test/t/multi_update.test:
  Simple merge
mysql-test/t/mysqlbinlog.test:
  Simple merge
mysql-test/t/mysqldump.test:
  Aligned code with 4.1
mysql-test/t/mysqltest.test:
  Simple merge
mysql-test/t/ndb_basic.test:
  Simple merge
mysql-test/t/ndb_cache.test:
  Simple merge
mysql-test/t/ndb_subquery.test:
  Simple merge
mysql-test/t/ps_grant.test:
  Simple merge
mysql-test/t/range.test:
  Simple merge
mysql-test/t/rpl_drop_temp.test:
  Simple merge
mysql-test/t/rpl_loaddata_rule_s.test:
  Simple merge
mysql-test/t/rpl_loaddatalocal.test:
  Simple merge
mysql-test/t/rpl_rotate_logs.test:
  Simple merge
mysql-test/t/rpl_until.test:
  Simple merge
mysql-test/t/rpl_variables.test:
  Simple merge
mysql-test/t/select.test:
  Simple merge
mysql-test/t/sql_mode.test:
  Simple merge
mysql-test/t/type_blob.test:
  Simple merge
mysql-test/t/type_decimal.test:
  Simple merge
mysql-test/t/user_var.test:
  Simple merge
mysql-test/t/variables.test:
  Simple merge
sql/lock.cc:
  Simple optimization
sql/mysql_priv.h:
  Simple merge
sql/sql_table.cc:
  Simple merge
sql/table.cc:
  Simple merge
sql/unireg.cc:
  Simple merge
parents 79f75d8f 167fb5f1
...@@ -357,6 +357,7 @@ innobase/conftest.s1 ...@@ -357,6 +357,7 @@ innobase/conftest.s1
innobase/conftest.subs innobase/conftest.subs
innobase/ib_config.h innobase/ib_config.h
innobase/ib_config.h.in innobase/ib_config.h.in
innobase/mkinstalldirs
innobase/stamp-h1 innobase/stamp-h1
insert_test insert_test
install install
...@@ -537,6 +538,7 @@ mit-pthreads/machdep.c ...@@ -537,6 +538,7 @@ mit-pthreads/machdep.c
mit-pthreads/pg++ mit-pthreads/pg++
mit-pthreads/pgcc mit-pthreads/pgcc
mit-pthreads/syscall.S mit-pthreads/syscall.S
mkinstalldirs
myisam/FT1.MYD myisam/FT1.MYD
myisam/FT1.MYI myisam/FT1.MYI
myisam/ft_dump myisam/ft_dump
...@@ -639,6 +641,7 @@ mysql-test/r/slave-stopped.eval ...@@ -639,6 +641,7 @@ mysql-test/r/slave-stopped.eval
mysql-test/share/mysql mysql-test/share/mysql
mysql-test/std_data/*.pem mysql-test/std_data/*.pem
mysql-test/t/index_merge.load mysql-test/t/index_merge.load
mysql-test/var
mysql-test/var/* mysql-test/var/*
mysql.kdevprj mysql.kdevprj
mysql.proj mysql.proj
...@@ -793,6 +796,7 @@ ndb/src/common/portlib/libportlib.dsp ...@@ -793,6 +796,7 @@ ndb/src/common/portlib/libportlib.dsp
ndb/src/common/transporter/libtransporter.dsp ndb/src/common/transporter/libtransporter.dsp
ndb/src/common/util/libgeneral.dsp ndb/src/common/util/libgeneral.dsp
ndb/src/cw/cpcd/ndb_cpcd ndb/src/cw/cpcd/ndb_cpcd
ndb/src/dummy.cpp
ndb/src/kernel/blocks/backup/libbackup.dsp ndb/src/kernel/blocks/backup/libbackup.dsp
ndb/src/kernel/blocks/backup/restore/ndb_restore ndb/src/kernel/blocks/backup/restore/ndb_restore
ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp
...@@ -879,6 +883,7 @@ ndb/test/tools/hugoScanUpdate ...@@ -879,6 +883,7 @@ ndb/test/tools/hugoScanUpdate
ndb/test/tools/ndb_cpcc ndb/test/tools/ndb_cpcc
ndb/test/tools/restart ndb/test/tools/restart
ndb/test/tools/verify_index ndb/test/tools/verify_index
ndb/tools/ndb_config
ndb/tools/ndb_delete_all ndb/tools/ndb_delete_all
ndb/tools/ndb_delete_all.dsp ndb/tools/ndb_delete_all.dsp
ndb/tools/ndb_desc ndb/tools/ndb_desc
...@@ -1116,7 +1121,3 @@ vio/test-ssl ...@@ -1116,7 +1121,3 @@ vio/test-ssl
vio/test-sslclient vio/test-sslclient
vio/test-sslserver vio/test-sslserver
vio/viotest-ssl vio/viotest-ssl
ndb/src/dummy.cpp
innobase/mkinstalldirs
mkinstalldirs
mysql-test/var
...@@ -144,7 +144,7 @@ enum enum_thr_lock_result thr_multi_lock(THR_LOCK_DATA **data, ...@@ -144,7 +144,7 @@ enum enum_thr_lock_result thr_multi_lock(THR_LOCK_DATA **data,
uint count, THR_LOCK_OWNER *owner); uint count, THR_LOCK_OWNER *owner);
void thr_multi_unlock(THR_LOCK_DATA **data,uint count); void thr_multi_unlock(THR_LOCK_DATA **data,uint count);
void thr_abort_locks(THR_LOCK *lock); void thr_abort_locks(THR_LOCK *lock);
bool thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread); my_bool thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread);
void thr_print_locks(void); /* For debugging */ void thr_print_locks(void); /* For debugging */
my_bool thr_upgrade_write_delay_lock(THR_LOCK_DATA *data); my_bool thr_upgrade_write_delay_lock(THR_LOCK_DATA *data);
my_bool thr_reschedule_write_lock(THR_LOCK_DATA *data); my_bool thr_reschedule_write_lock(THR_LOCK_DATA *data);
......
prepare stmt1 from ' show full processlist ';
execute stmt1;
Id User Host db Command Time State Info
number root localhost test Execute time NULL show full processlist
deallocate prepare stmt1;
...@@ -54,6 +54,7 @@ my_col ...@@ -54,6 +54,7 @@ my_col
4 4
execute s_t9 ; execute s_t9 ;
ERROR 42S02: Table 'mysqltest.t9' doesn't exist ERROR 42S02: Table 'mysqltest.t9' doesn't exist
deallocate prepare s_t9;
revoke all privileges on mysqltest.t1 from second_user@localhost revoke all privileges on mysqltest.t1 from second_user@localhost
identified by 'looser' ; identified by 'looser' ;
show grants for second_user@localhost ; show grants for second_user@localhost ;
......
...@@ -86,3 +86,5 @@ UPDATE t1 SET t1.xstatus_vor = Greatest(t1.xstatus_vor,1) WHERE t1.aufnr = ...@@ -86,3 +86,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
...@@ -48,6 +48,8 @@ insert into t1 values ('abc'),('abc\'def\\hij\"klm\0opq'),('\''),('\"'),('\\'),( ...@@ -48,6 +48,8 @@ insert into t1 values ('abc'),('abc\'def\\hij\"klm\0opq'),('\''),('\"'),('\\'),(
select * from t1 procedure analyse(); select * from t1 procedure analyse();
drop table t1; drop table t1;
# End of 4.1 tests
#decimal-related test #decimal-related test
create table t1 (df decimal(5,1)); create table t1 (df decimal(5,1));
......
# #
# 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
...@@ -1333,3 +1333,5 @@ INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','' ...@@ -1333,3 +1333,5 @@ INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily',''
# Cleanup, test is over # Cleanup, test is over
# #
drop table t1, t2, t4; drop table t1, t2, t4;
# End of 4.1 tests
...@@ -219,6 +219,8 @@ INSERT INTO t1 (b) VALUES ('bbbb'); ...@@ -219,6 +219,8 @@ 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
# #
# Bug #11080 & #11005 Multi-row REPLACE fails on a duplicate key error # Bug #11080 & #11005 Multi-row REPLACE fails on a duplicate key error
# #
......
...@@ -52,3 +52,5 @@ unlock tables; ...@@ -52,3 +52,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
...@@ -937,6 +937,8 @@ SELECT id FROM t1 WHERE (list_id = 1) AND (term = "lettera"); ...@@ -937,6 +937,8 @@ 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
# #
# alter temp table # alter temp table
# #
......
...@@ -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,6 +104,8 @@ t2.value64=t1.value64; ...@@ -104,6 +104,8 @@ t2.value64=t1.value64;
drop table t1, t2; drop table t1, t2;
# End of 4.1 tests
# #
# Test of CREATE ... SELECT and unsigned integers # Test of CREATE ... SELECT and unsigned integers
# #
......
...@@ -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
...@@ -58,3 +58,5 @@ select ifnull(A, 'N') as A, ifnull(B, 'N') as B, ifnull(not A, 'N') as nA, ifnul ...@@ -58,3 +58,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
...@@ -122,6 +122,9 @@ SELECT 'case+union+test' ...@@ -122,6 +122,9 @@ 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
# #
# Tests for bug #9939: conversion of the arguments for COALESCE and IFNULL # Tests for bug #9939: conversion of the arguments for COALESCE and IFNULL
# #
......
...@@ -156,6 +156,9 @@ select cast(concat('184467440','73709551615') as signed); ...@@ -156,6 +156,9 @@ 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
#decimal-related additions #decimal-related additions
select cast('1.2' as decimal(3,2)); select cast('1.2' as decimal(3,2));
select 1e18 * cast('1.2' as decimal(3,2)); select 1e18 * cast('1.2' as decimal(3,2));
......
...@@ -22,6 +22,8 @@ connection con1; ...@@ -22,6 +22,8 @@ connection con1;
reap; reap;
drop table t1; drop table t1;
# End of 4.1 tests
# #
# Bug #9897 Views: 'Check Table' crashes MySQL, with a view and a table # Bug #9897 Views: 'Check Table' crashes MySQL, with a view and a table
# in the statement # in the statement
......
...@@ -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,6 +55,8 @@ create table t1 (f int); ...@@ -55,6 +55,8 @@ 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
# #
# Bug #6515 # Bug #6515
# #
......
...@@ -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
...@@ -514,3 +514,5 @@ create table test.t1 like x; ...@@ -514,3 +514,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,5 @@ CREATE TABLE t1 (a text) character set big5; ...@@ -27,3 +27,5 @@ 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;
# 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
...@@ -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
...@@ -133,6 +133,8 @@ ALTER TABLE t1 ADD KEY ifword(col1); ...@@ -133,6 +133,8 @@ 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
# #
# Bug#9509 # Bug#9509
# #
......
...@@ -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
...@@ -456,6 +456,8 @@ drop table t1; ...@@ -456,6 +456,8 @@ 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
# #
# Check UPPER/LOWER changeing length # Check UPPER/LOWER changeing length
# #
......
...@@ -419,6 +419,8 @@ insert into t1 values (0x005b); ...@@ -419,6 +419,8 @@ 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
# #
# Conversion from an UCS2 string to a decimal column # Conversion from an UCS2 string to a decimal column
# #
......
...@@ -17,4 +17,4 @@ show binlog events from 98; ...@@ -17,4 +17,4 @@ show binlog events from 98;
--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
...@@ -843,6 +843,8 @@ insert into t1 values (_utf8 0x5b); ...@@ -843,6 +843,8 @@ 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
# #
# Test for bug #11484: wrong results for a DISTINCT varchar column in uft8. # Test for bug #11484: wrong results for a DISTINCT varchar column in uft8.
# #
......
...@@ -260,3 +260,5 @@ select str_to_date("2003-01-02 10:11:12.0012ABCD", "%Y-%m-%d %H:%i:%S.%f") as f1 ...@@ -260,3 +260,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
...@@ -36,3 +36,5 @@ insert delayed into t1 values (3,"this will give an","error"); ...@@ -36,3 +36,5 @@ insert delayed into t1 values (3,"this will give an","error");
show status like 'not_flushed_delayed_rows'; show status like 'not_flushed_delayed_rows';
select * from t1; select * from t1;
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -153,6 +153,8 @@ DELETE FROM t1 WHERE t1.a > 0 ORDER BY t1.a LIMIT 1; ...@@ -153,6 +153,8 @@ 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
# #
# Test of multi-delete where we are not scanning the first table # Test of multi-delete where we are not scanning the first table
# #
......
...@@ -248,3 +248,5 @@ insert into t3 values(3),(3); ...@@ -248,3 +248,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
...@@ -340,3 +340,5 @@ create table t1 (id int, dsc varchar(50)); ...@@ -340,3 +340,5 @@ create table t1 (id int, dsc varchar(50));
insert into t1 values (1, "line number one"), (2, "line number two"), (3, "line number three"); insert into t1 values (1, "line number one"), (2, "line number two"), (3, "line number three");
select distinct id, IFNULL(dsc, '-') from t1; select distinct id, IFNULL(dsc, '-') from t1;
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
...@@ -77,6 +77,8 @@ show create database test; ...@@ -77,6 +77,8 @@ show create database test;
drop table t1; drop table t1;
# End of 4.1 tests
# FLUSH TABLES WITH READ LOCK should block writes to binlog too # FLUSH TABLES WITH READ LOCK should block writes to binlog too
connection con1; connection con1;
create table t1 (a int) engine=innodb; create table t1 (a int) engine=innodb;
......
...@@ -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,5 @@ SET NAMES latin1; ...@@ -338,3 +338,5 @@ 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;
# 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
...@@ -137,3 +137,4 @@ order by ...@@ -137,3 +137,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
...@@ -47,3 +47,4 @@ set @@max_allowed_packet=1048576*100; ...@@ -47,3 +47,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
...@@ -52,3 +52,4 @@ select 'a' union select concat('a', -0.0); ...@@ -52,3 +52,4 @@ select 'a' union select concat('a', -0.0);
--replace_result a-0.0000 a0.0000 --replace_result a-0.0000 a0.0000
select 'a' union select concat('a', -0.0000); select 'a' union select concat('a', -0.0000);
# 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
...@@ -18,6 +18,8 @@ explain select * from t1 where str <> default(str); ...@@ -18,6 +18,8 @@ explain select * from t1 where str <> default(str);
drop table t1; drop table t1;
# End of 4.1 tests
# #
# Bug #11314 (HAVING DEFAULT() hangs) # Bug #11314 (HAVING DEFAULT() hangs)
# #
......
...@@ -7,3 +7,5 @@ ...@@ -7,3 +7,5 @@
# Bug #11643: des_encrypt() causes server to die # Bug #11643: des_encrypt() causes server to die
# #
select des_encrypt('hello'); select des_encrypt('hello');
# End of 4.1 tests
...@@ -86,3 +86,5 @@ select hex(des_decrypt(des_encrypt("hello",4),'password2')); ...@@ -86,3 +86,5 @@ select hex(des_decrypt(des_encrypt("hello",4),'password2'));
select hex(des_decrypt(des_encrypt("hello","hidden"))); select hex(des_decrypt(des_encrypt("hello","hidden")));
explain extended select des_decrypt(des_encrypt("hello",4),'password2'), des_decrypt(des_encrypt("hello","hidden")); explain extended select des_decrypt(des_encrypt("hello",4),'password2'), des_decrypt(des_encrypt("hello","hidden"));
# End of 4.1 tests
...@@ -35,3 +35,4 @@ select hex("hello"); ...@@ -35,3 +35,4 @@ select hex("hello");
select hex(des_decrypt(des_encrypt("hello",4),'password2')); select hex(des_decrypt(des_encrypt("hello",4),'password2'));
select hex(des_decrypt(des_encrypt("hello","hidden"))); select hex(des_decrypt(des_encrypt("hello","hidden")));
# End of 4.1 tests
...@@ -33,3 +33,5 @@ select * from t1 where id <=>id; ...@@ -33,3 +33,5 @@ select * from t1 where id <=>id;
select * from t1 where value <=> value; select * from t1 where value <=> value;
select * from t1 where id <=> value or value<=>id; select * from t1 where id <=> value or value<=>id;
drop table t1,t2; drop table t1,t2;
# End of 4.1 tests
...@@ -310,6 +310,8 @@ select a, group_concat(b order by b) from t1 group by a with rollup; ...@@ -310,6 +310,8 @@ select a, group_concat(b order by b) from t1 group by a with rollup;
select a, group_concat(distinct b order by b) from t1 group by a with rollup; select a, group_concat(distinct b order by b) from t1 group by a with rollup;
drop table t1; drop table t1;
# End of 4.1 tests
# #
# Bug #6475 # Bug #6475
# #
......
...@@ -509,7 +509,41 @@ create table t2 select f2 from (select now() f2 from t1) a; ...@@ -509,7 +509,41 @@ create table t2 select f2 from (select now() f2 from t1) a;
show columns from t2; show columns from t2;
drop table t2, t1; drop table t2, t1;
#
# Bug 8893: wrong result for min/max optimization with 2 indexes
#
CREATE TABLE t1(
id int PRIMARY KEY,
a int,
b int,
INDEX i_b_id(a,b,id),
INDEX i_id(a,id)
);
INSERT INTO t1 VALUES
(1,1,4), (2,2,1), (3,1,3), (4,2,1), (5,1,1);
SELECT MAX(id) FROM t1 WHERE id < 3 AND a=2 AND b=6;
DROP TABLE t1;
# change the order of the last two index definitions
CREATE TABLE t1(
id int PRIMARY KEY,
a int,
b int,
INDEX i_id(a,id),
INDEX i_b_id(a,b,id)
);
INSERT INTO t1 VALUES
(1,1,4), (2,2,1), (3,1,3), (4,2,1), (5,1,1);
SELECT MAX(id) FROM t1 WHERE id < 3 AND a=2 AND b=6;
DROP TABLE t1;
# End of 4.1 tests
#
# decimal-related tests # decimal-related tests
#
create table t2 (ff double); create table t2 (ff double);
insert into t2 values (2.2); insert into t2 values (2.2);
select cast(sum(distinct ff) as decimal(5,2)) from t2; select cast(sum(distinct ff) as decimal(5,2)) from t2;
...@@ -565,36 +599,6 @@ insert into t1 values (5.00000000001); ...@@ -565,36 +599,6 @@ insert into t1 values (5.00000000001);
select col1,sum(col1),max(col1),min(col1) from t1 group by col1; select col1,sum(col1),max(col1),min(col1) from t1 group by col1;
DROP TABLE t1; DROP TABLE t1;
#
# Bug 8893: wrong result for min/max optimization with 2 indexes
#
CREATE TABLE t1(
id int PRIMARY KEY,
a int,
b int,
INDEX i_b_id(a,b,id),
INDEX i_id(a,id)
);
INSERT INTO t1 VALUES
(1,1,4), (2,2,1), (3,1,3), (4,2,1), (5,1,1);
SELECT MAX(id) FROM t1 WHERE id < 3 AND a=2 AND b=6;
DROP TABLE t1;
# change the order of the last two index definitions
CREATE TABLE t1(
id int PRIMARY KEY,
a int,
b int,
INDEX i_id(a,id),
INDEX i_b_id(a,b,id)
);
INSERT INTO t1 VALUES
(1,1,4), (2,2,1), (3,1,3), (4,2,1), (5,1,1);
SELECT MAX(id) FROM t1 WHERE id < 3 AND a=2 AND b=6;
DROP TABLE t1;
# #
# Test that new VARCHAR correctly works with COUNT(DISTINCT) # Test that new VARCHAR correctly works with COUNT(DISTINCT)
# #
......
...@@ -87,3 +87,5 @@ SELECT a, NULLIF(a,'') FROM t1; ...@@ -87,3 +87,5 @@ SELECT a, NULLIF(a,'') FROM t1;
SELECT a, NULLIF(a,'') FROM t1 WHERE NULLIF(a,'') IS NULL; SELECT a, NULLIF(a,'') FROM t1 WHERE NULLIF(a,'') IS NULL;
DROP TABLE t1; DROP TABLE t1;
# End of 4.1 tests
...@@ -102,6 +102,8 @@ insert into t1 values ('aa'), ('bb'); ...@@ -102,6 +102,8 @@ insert into t1 values ('aa'), ('bb');
select * from t1 where a in (NULL, 'aa'); select * from t1 where a in (NULL, 'aa');
drop table t1; drop table t1;
# End of 4.1 tests
# #
# Bug #11885: WHERE condition with NOT IN (one element) # Bug #11885: WHERE condition with NOT IN (one element)
# #
......
...@@ -11,3 +11,5 @@ insert into t1 values (0,"2002-05-01"),(0,"2002-05-01"),(0,"2002-05-01"); ...@@ -11,3 +11,5 @@ insert into t1 values (0,"2002-05-01"),(0,"2002-05-01"),(0,"2002-05-01");
flush tables; flush tables;
select * from t1 where isnull(to_days(mydate)); select * from t1 where isnull(to_days(mydate));
drop table t1; drop table t1;
# End of 4.1 tests
...@@ -96,3 +96,4 @@ DROP TABLE t1; ...@@ -96,3 +96,4 @@ DROP TABLE t1;
# #
select _cp866'aaaaaaaaa' like _cp866'%aaaa%' collate cp866_bin; select _cp866'aaaaaaaaa' like _cp866'%aaaa%' collate cp866_bin;
# End of 4.1 tests
...@@ -68,6 +68,8 @@ explain extended select degrees(pi()),radians(360); ...@@ -68,6 +68,8 @@ explain extended select degrees(pi()),radians(360);
--error 1054 --error 1054
select rand(rand); select rand(rand);
# End of 4.1 tests
# #
# Bug #8459 (FORMAT returns incorrect result) # Bug #8459 (FORMAT returns incorrect result)
# #
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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