mirror of
https://github.com/MariaDB/server.git
synced 2025-12-04 17:23:46 +03:00
8eaef91fff
Add support for VARCHAR with 1 or 2 length bytes Enable VARCHAR packing in MyISAM files (previous patch didn't pack data properly) Give error if we got problems in temporary tables during a SELECT Don't use new table generated by ALTER TABLE if index generation fails Fixed wrong call by range_end() (Could cause an ASSERT in debug mode) BUILD/SETUP.sh: Add flags for Intel 64 dbug/dbug.c: Add 0x before pointers (to help with debugging) heap/_check.c: Add 0x before pointers (to help with debugging) heap/hp_create.c: Add support for VARCHAR with 1 or 2 length bytes heap/hp_delete.c: Add 0x before pointers heap/hp_hash.c: Add support for VARCHAR with 1 or 2 length bytes Added more debugging heap/hp_open.c: Add 0x before pointers heap/hp_rkey.c: Add 0x before pointers heap/hp_rrnd.c: Add 0x before pointers heap/hp_write.c: Add 0x before pointers include/my_base.h: Add support for VARCHAR with 1 or 2 length bytes myisam/ft_static.c: Add support for VARCHAR with 1 or 2 length bytes myisam/ft_test1.c: Add support for VARCHAR with 1 or 2 length bytes Fixed indentation (This file should probably be deleted as it doesn't compile) myisam/ft_update.c: Add support for VARCHAR with 1 or 2 length bytes Fixed indentation Removed some not needed 'else' myisam/mi_check.c: Don't give an error for tables packed with myisampack myisam/mi_checksum.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_create.c: Add support for VARCHAR with 1 or 2 length bytes Store in number of pack-length-bytes in keyseg->bit_start myisam/mi_dbug.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_dynrec.c: Add support for VARCHAR with 1 or 2 length bytes (old code in _mi_rec_unpack() didn't really work with VARCHAR's) myisam/mi_key.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_open.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_packrec.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_search.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_test1.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_test3.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_test_all.res: Update results myisam/mi_unique.c: Add support for VARCHAR with 1 or 2 length bytes myisam/myisampack.c: Add support for VARCHAR with 1 or 2 length bytes mysql-test/include/varchar.inc: Added more tests mysql-test/r/bdb.result: Update results after new tests mysql-test/r/information_schema.result: Update results mysql-test/r/innodb.result: Update results mysql-test/r/myisam.result: Update results after new tests mysql-test/r/ps_1general.result: Update results mysql-test/t/bdb.test: Shorter comments mysys/list.c: Add 0x before pointers mysys/my_handler.c: Add support for VARCHAR with 1 or 2 length bytes mysys/raid.cc: Add 0x before pointers sql/field.cc: Add support for VARCHAR with 1 or 2 length bytes sql/field.h: Add support for VARCHAR with 1 or 2 length bytes sql/field_conv.cc: Add support for VARCHAR with 1 or 2 length bytes sql/ha_berkeley.cc: Add support for VARCHAR with 1 or 2 length bytes sql/ha_heap.cc: Add support for VARCHAR with 1 or 2 length bytes sql/ha_myisam.cc: Ensure that enable_indexes() will report an error if it fails Enable VARCHAR packing for MyISAM files sql/item_sum.cc: Change key_cmp -> cmp() as we are comparing fields, not key segements sql/opt_range.cc: Add support for VARCHAR with 1 or 2 length bytes Change range_end to call ha_index_or_rnd_end() as in some error cases we may be in rnd mode when we abort sql/sql_base.cc: Remove compiler warning sql/sql_parse.cc: Move length checking code to sql_table.cc (as we don't have character set for fields at this stage) sql/sql_select.cc: Add support for VARCHAR with 1 or 2 length bytes Ensure that we report an error if we get an error while writing to internal temporary tables sql/sql_select.h: Add support for VARCHAR with 1 or 2 length bytes sql/sql_show.cc: Fix typo in comment sql/sql_table.cc: Don't use new table generated by ALTER TABLE if index generation fails vio/vio.c: Fixed DBUG info vio/viosocket.c: Fixed DBUG info vio/viossl.c: Fixed DBUG info vio/viosslfactories.c: Fixed DBUG info
223 lines
6.6 KiB
PHP
223 lines
6.6 KiB
PHP
# Initialise
|
|
--disable_warnings
|
|
drop table if exists t1,t2,t3;
|
|
--enable_warnings
|
|
|
|
disable_query_log;
|
|
select "--- Testing varchar ---";
|
|
enable_query_log;
|
|
|
|
#
|
|
# Simple basic test that endspace is saved
|
|
#
|
|
|
|
create table t1 (v varchar(10), c char(10), t text);
|
|
insert into t1 values('+ ', '+ ', '+ ');
|
|
set @a=repeat(' ',20);
|
|
insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));
|
|
select concat('*',v,'*',c,'*',t,'*') from t1;
|
|
|
|
# Check how columns are copied
|
|
show create table t1;
|
|
create table t2 like t1;
|
|
show create table t2;
|
|
create table t3 select * from t1;
|
|
show create table t3;
|
|
alter table t1 modify c varchar(10);
|
|
show create table t1;
|
|
alter table t1 modify v char(10);
|
|
show create table t1;
|
|
alter table t1 modify t varchar(10);
|
|
show create table t1;
|
|
select concat('*',v,'*',c,'*',t,'*') from t1;
|
|
drop table t1,t2,t3;
|
|
|
|
#
|
|
# Testing of keys
|
|
#
|
|
create table t1 (v varchar(10), c char(10), t text, key(v), key(c), key(t(10)));
|
|
show create table t1;
|
|
disable_query_log;
|
|
let $1=10;
|
|
while ($1)
|
|
{
|
|
let $2=27;
|
|
eval set @space=repeat(' ',10-$1);
|
|
while ($2)
|
|
{
|
|
eval set @char=char(ascii('a')+$2-1);
|
|
insert into t1 values(concat(@char,@space),concat(@char,@space),concat(@char,@space));
|
|
dec $2;
|
|
}
|
|
dec $1;
|
|
}
|
|
enable_query_log;
|
|
select count(*) from t1;
|
|
insert into t1 values(concat('a',char(1)),concat('a',char(1)),concat('a',char(1)));
|
|
select count(*) from t1 where v='a';
|
|
select count(*) from t1 where c='a';
|
|
select count(*) from t1 where t='a';
|
|
select count(*) from t1 where v='a ';
|
|
select count(*) from t1 where c='a ';
|
|
select count(*) from t1 where t='a ';
|
|
select count(*) from t1 where v between 'a' and 'a ';
|
|
select count(*) from t1 where v between 'a' and 'a ' and v between 'a ' and 'b\n';
|
|
select count(*) from t1 where v like 'a%';
|
|
select count(*) from t1 where c like 'a%';
|
|
select count(*) from t1 where t like 'a%';
|
|
select count(*) from t1 where v like 'a %';
|
|
explain select count(*) from t1 where v='a ';
|
|
explain select count(*) from t1 where c='a ';
|
|
explain select count(*) from t1 where t='a ';
|
|
explain select count(*) from t1 where v like 'a%';
|
|
explain select count(*) from t1 where v between 'a' and 'a ';
|
|
explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a ' and 'b\n';
|
|
|
|
--error 1062
|
|
alter table t1 add unique(v);
|
|
alter table t1 add key(v);
|
|
select concat('*',v,'*',c,'*',t,'*') as qq from t1 where v='a';
|
|
explain select * from t1 where v='a';
|
|
|
|
# GROUP BY
|
|
|
|
select v,count(*) from t1 group by v limit 10;
|
|
select v,count(t) from t1 group by v limit 10;
|
|
select v,count(c) from t1 group by v limit 10;
|
|
select sql_big_result v,count(t) from t1 group by v limit 10;
|
|
select sql_big_result v,count(c) from t1 group by v limit 10;
|
|
select c,count(*) from t1 group by c limit 10;
|
|
select c,count(t) from t1 group by c limit 10;
|
|
select sql_big_result c,count(t) from t1 group by c limit 10;
|
|
select t,count(*) from t1 group by t limit 10;
|
|
select t,count(t) from t1 group by t limit 10;
|
|
select sql_big_result t,count(t) from t1 group by t limit 10;
|
|
|
|
#
|
|
# Test varchar > 255 bytes
|
|
#
|
|
|
|
alter table t1 modify v varchar(300), drop key v, drop key v_2, add key v (v);
|
|
show create table t1;
|
|
select count(*) from t1 where v='a';
|
|
select count(*) from t1 where v='a ';
|
|
select count(*) from t1 where v between 'a' and 'a ';
|
|
select count(*) from t1 where v between 'a' and 'a ' and v between 'a ' and 'b\n';
|
|
select count(*) from t1 where v like 'a%';
|
|
select count(*) from t1 where v like 'a %';
|
|
explain select count(*) from t1 where v='a ';
|
|
explain select count(*) from t1 where v like 'a%';
|
|
explain select count(*) from t1 where v between 'a' and 'a ';
|
|
explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a ' and 'b\n';
|
|
explain select * from t1 where v='a';
|
|
|
|
# GROUP BY
|
|
|
|
select v,count(*) from t1 group by v limit 10;
|
|
select v,count(t) from t1 group by v limit 10;
|
|
select sql_big_result v,count(t) from t1 group by v limit 10;
|
|
|
|
#
|
|
# Test varchar > 255 bytes, key < 255
|
|
#
|
|
|
|
alter table t1 drop key v, add key v (v(30));
|
|
show create table t1;
|
|
select count(*) from t1 where v='a';
|
|
select count(*) from t1 where v='a ';
|
|
select count(*) from t1 where v between 'a' and 'a ';
|
|
select count(*) from t1 where v between 'a' and 'a ' and v between 'a ' and 'b\n';
|
|
select count(*) from t1 where v like 'a%';
|
|
select count(*) from t1 where v like 'a %';
|
|
explain select count(*) from t1 where v='a ';
|
|
explain select count(*) from t1 where v like 'a%';
|
|
explain select count(*) from t1 where v between 'a' and 'a ';
|
|
explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a ' and 'b\n';
|
|
explain select * from t1 where v='a';
|
|
|
|
# GROUP BY
|
|
|
|
select v,count(*) from t1 group by v limit 10;
|
|
select v,count(t) from t1 group by v limit 10;
|
|
select sql_big_result v,count(t) from t1 group by v limit 10;
|
|
|
|
#
|
|
# Test varchar > 512 (special case for GROUP BY becasue of
|
|
# CONVERT_IF_BIGGER_TO_BLOB define)
|
|
#
|
|
|
|
alter table t1 modify v varchar(600), drop key v, add key v (v);
|
|
show create table t1;
|
|
select v,count(*) from t1 group by v limit 10;
|
|
select v,count(t) from t1 group by v limit 10;
|
|
select sql_big_result v,count(t) from t1 group by v limit 10;
|
|
|
|
drop table t1;
|
|
|
|
#
|
|
# Test unique keys
|
|
#
|
|
|
|
create table t1 (a char(10), unique (a));
|
|
insert into t1 values ('a ');
|
|
--error 1062
|
|
insert into t1 values ('a ');
|
|
|
|
alter table t1 modify a varchar(10);
|
|
--error 1062
|
|
insert into t1 values ('a '),('a '),('a '),('a ');
|
|
--error 1062
|
|
insert into t1 values ('a ');
|
|
--error 1062
|
|
insert into t1 values ('a ');
|
|
--error 1062
|
|
insert into t1 values ('a ');
|
|
update t1 set a='a ' where a like 'a%';
|
|
select concat(a,'.') from t1;
|
|
update t1 set a='abc ' where a like 'a ';
|
|
select concat(a,'.') from t1;
|
|
update t1 set a='a ' where a like 'a %';
|
|
select concat(a,'.') from t1;
|
|
update t1 set a='a ' where a like 'a ';
|
|
select concat(a,'.') from t1;
|
|
drop table t1;
|
|
|
|
#
|
|
# test show create table
|
|
#
|
|
|
|
create table t1 (v varchar(10), c char(10), t text, key(v(5)), key(c(5)), key(t(5)));
|
|
show create table t1;
|
|
drop table t1;
|
|
create table t1 (v char(10) character set utf8);
|
|
show create table t1;
|
|
drop table t1;
|
|
|
|
create table t1 (v varchar(10), c char(10)) row_format=fixed;
|
|
show create table t1;
|
|
insert into t1 values('a','a'),('a ','a ');
|
|
select concat('*',v,'*',c,'*') from t1;
|
|
drop table t1;
|
|
|
|
#
|
|
# Test long varchars
|
|
#
|
|
|
|
create table t1 (v varchar(65530), key(v(10)));
|
|
insert into t1 values(repeat('a',65530));
|
|
select length(v) from t1 where v=repeat('a',65530);
|
|
drop table t1;
|
|
|
|
#
|
|
# Some errors/warnings on create
|
|
#
|
|
|
|
create table t1 (v varchar(65530), key(v));
|
|
drop table if exists t1;
|
|
create table t1 (v varchar(65536));
|
|
show create table t1;
|
|
drop table t1;
|
|
create table t1 (v varchar(65530) character set utf8);
|
|
show create table t1;
|
|
drop table t1;
|