mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Add 0x before pointers (to help with debugging)
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
This commit is contained in:
unknown
@ -513,18 +513,18 @@ insert t1 values (1, "aaa", "bbb"), (NULL, "", "ccccc"), (0, NULL, "");
|
||||
insert t2 select * from t1;
|
||||
checksum table t1, t2, t3 quick;
|
||||
Table Checksum
|
||||
test.t1 272226711
|
||||
test.t1 2948697075
|
||||
test.t2 NULL
|
||||
test.t3 NULL
|
||||
checksum table t1, t2, t3;
|
||||
Table Checksum
|
||||
test.t1 272226711
|
||||
test.t2 272226711
|
||||
test.t1 2948697075
|
||||
test.t2 3092701434
|
||||
test.t3 NULL
|
||||
checksum table t1, t2, t3 extended;
|
||||
Table Checksum
|
||||
test.t1 272226711
|
||||
test.t2 272226711
|
||||
test.t1 3092701434
|
||||
test.t2 3092701434
|
||||
test.t3 NULL
|
||||
drop table t1,t2;
|
||||
create table t1 (a int, key (a));
|
||||
@ -849,6 +849,213 @@ f 10
|
||||
g 10
|
||||
h 10
|
||||
i 10
|
||||
alter table t1 modify v varchar(300), drop key v, drop key v_2, add key v (v);
|
||||
show create table t1;
|
||||
Table Create Table
|
||||
t1 CREATE TABLE `t1` (
|
||||
`v` varchar(300) default NULL,
|
||||
`c` char(10) default NULL,
|
||||
`t` text,
|
||||
KEY `c` (`c`),
|
||||
KEY `t` (`t`(10)),
|
||||
KEY `v` (`v`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||
select count(*) from t1 where v='a';
|
||||
count(*)
|
||||
10
|
||||
select count(*) from t1 where v='a ';
|
||||
count(*)
|
||||
10
|
||||
select count(*) from t1 where v between 'a' and 'a ';
|
||||
count(*)
|
||||
10
|
||||
select count(*) from t1 where v between 'a' and 'a ' and v between 'a ' and 'b\n';
|
||||
count(*)
|
||||
10
|
||||
select count(*) from t1 where v like 'a%';
|
||||
count(*)
|
||||
11
|
||||
select count(*) from t1 where v like 'a %';
|
||||
count(*)
|
||||
9
|
||||
explain select count(*) from t1 where v='a ';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 ref v v 303 const 7 Using where; Using index
|
||||
explain select count(*) from t1 where v like 'a%';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 range v v 303 NULL 8 Using where; Using index
|
||||
explain select count(*) from t1 where v between 'a' and 'a ';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 range v v 303 NULL 7 Using where; Using index
|
||||
explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a ' and 'b\n';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 range v v 303 NULL 7 Using where; Using index
|
||||
explain select * from t1 where v='a';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 ref v v 303 const 7 Using where
|
||||
select v,count(*) from t1 group by v limit 10;
|
||||
v count(*)
|
||||
a 1
|
||||
a 10
|
||||
b 10
|
||||
c 10
|
||||
d 10
|
||||
e 10
|
||||
f 10
|
||||
g 10
|
||||
h 10
|
||||
i 10
|
||||
select v,count(t) from t1 group by v limit 10;
|
||||
v count(t)
|
||||
a 1
|
||||
a 10
|
||||
b 10
|
||||
c 10
|
||||
d 10
|
||||
e 10
|
||||
f 10
|
||||
g 10
|
||||
h 10
|
||||
i 10
|
||||
select sql_big_result v,count(t) from t1 group by v limit 10;
|
||||
v count(t)
|
||||
a 1
|
||||
a 10
|
||||
b 10
|
||||
c 10
|
||||
d 10
|
||||
e 10
|
||||
f 10
|
||||
g 10
|
||||
h 10
|
||||
i 10
|
||||
alter table t1 drop key v, add key v (v(30));
|
||||
show create table t1;
|
||||
Table Create Table
|
||||
t1 CREATE TABLE `t1` (
|
||||
`v` varchar(300) default NULL,
|
||||
`c` char(10) default NULL,
|
||||
`t` text,
|
||||
KEY `c` (`c`),
|
||||
KEY `t` (`t`(10)),
|
||||
KEY `v` (`v`(30))
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||
select count(*) from t1 where v='a';
|
||||
count(*)
|
||||
10
|
||||
select count(*) from t1 where v='a ';
|
||||
count(*)
|
||||
10
|
||||
select count(*) from t1 where v between 'a' and 'a ';
|
||||
count(*)
|
||||
10
|
||||
select count(*) from t1 where v between 'a' and 'a ' and v between 'a ' and 'b\n';
|
||||
count(*)
|
||||
10
|
||||
select count(*) from t1 where v like 'a%';
|
||||
count(*)
|
||||
11
|
||||
select count(*) from t1 where v like 'a %';
|
||||
count(*)
|
||||
9
|
||||
explain select count(*) from t1 where v='a ';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 ref v v 33 const 7 Using where
|
||||
explain select count(*) from t1 where v like 'a%';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 range v v 33 NULL 8 Using where
|
||||
explain select count(*) from t1 where v between 'a' and 'a ';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 range v v 33 NULL 7 Using where
|
||||
explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a ' and 'b\n';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 range v v 33 NULL 7 Using where
|
||||
explain select * from t1 where v='a';
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 ref v v 33 const 7 Using where
|
||||
select v,count(*) from t1 group by v limit 10;
|
||||
v count(*)
|
||||
a 1
|
||||
a 10
|
||||
b 10
|
||||
c 10
|
||||
d 10
|
||||
e 10
|
||||
f 10
|
||||
g 10
|
||||
h 10
|
||||
i 10
|
||||
select v,count(t) from t1 group by v limit 10;
|
||||
v count(t)
|
||||
a 1
|
||||
a 10
|
||||
b 10
|
||||
c 10
|
||||
d 10
|
||||
e 10
|
||||
f 10
|
||||
g 10
|
||||
h 10
|
||||
i 10
|
||||
select sql_big_result v,count(t) from t1 group by v limit 10;
|
||||
v count(t)
|
||||
a 1
|
||||
a 10
|
||||
b 10
|
||||
c 10
|
||||
d 10
|
||||
e 10
|
||||
f 10
|
||||
g 10
|
||||
h 10
|
||||
i 10
|
||||
alter table t1 modify v varchar(600), drop key v, add key v (v);
|
||||
show create table t1;
|
||||
Table Create Table
|
||||
t1 CREATE TABLE `t1` (
|
||||
`v` varchar(600) default NULL,
|
||||
`c` char(10) default NULL,
|
||||
`t` text,
|
||||
KEY `c` (`c`),
|
||||
KEY `t` (`t`(10)),
|
||||
KEY `v` (`v`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||
select v,count(*) from t1 group by v limit 10;
|
||||
v count(*)
|
||||
a 1
|
||||
a 10
|
||||
b 10
|
||||
c 10
|
||||
d 10
|
||||
e 10
|
||||
f 10
|
||||
g 10
|
||||
h 10
|
||||
i 10
|
||||
select v,count(t) from t1 group by v limit 10;
|
||||
v count(t)
|
||||
a 1
|
||||
a 10
|
||||
b 10
|
||||
c 10
|
||||
d 10
|
||||
e 10
|
||||
f 10
|
||||
g 10
|
||||
h 10
|
||||
i 10
|
||||
select sql_big_result v,count(t) from t1 group by v limit 10;
|
||||
v count(t)
|
||||
a 1
|
||||
a 10
|
||||
b 10
|
||||
c 10
|
||||
d 10
|
||||
e 10
|
||||
f 10
|
||||
g 10
|
||||
h 10
|
||||
i 10
|
||||
drop table t1;
|
||||
create table t1 (a char(10), unique (a));
|
||||
insert into t1 values ('a ');
|
||||
|
||||
Reference in New Issue
Block a user