mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add bdb_version variable, and a new test.

Browse source
This commit is contained in:
tim@donna.mysql.com 2001-01-13 16:12:45 +02:00
parent 6295e1b195
commit b9eaaf17b9
4 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View file

@ -1,2 +1,3 @@
jani@hynda.mysql.fi jani@hynda.mysql.fi
monty@donna.mysql.com monty@donna.mysql.com
tim@donna.mysql.com

7
mysql-test/r/bdb.result
View file

@ -406,3 +406,10 @@ a
1 1
2 2
3 3
b
this is a blob
b i
this is a blob 1
b i
this is a blob 1
b i

10
mysql-test/t/bdb.test
View file

@ -334,3 +334,13 @@ CREATE TABLE t1 (a int not null, primary key (a)) type=bdb;
insert into t1 values(1),(2),(3); insert into t1 values(1),(2),(3);
select t1.a from t1 natural join t1 as t2 order by t1.a; select t1.a from t1 natural join t1 as t2 order by t1.a;
drop table t1; drop table t1;
#
# Test key on blob with null values
#
create table t1 (b blob, i int, key (b(100)), key (i), key (i, b(20)));
insert into t1 values ('this is a blob', 1), (null, -1), (null, null);
select b from t1 where b = 'this is a blob';
select * from t1 where b like 't%';
select b, i from t1 where b is not null;
select * from t1 where b is null and i > 0;

1
sql/mysqld.cc
View file

@ -2634,6 +2634,7 @@ struct show_var_st init_vars[]= {
{"bdb_logdir", (char*) &berkeley_logdir, SHOW_CHAR_PTR}, {"bdb_logdir", (char*) &berkeley_logdir, SHOW_CHAR_PTR},
{"bdb_shared_data", (char*) &berkeley_shared_data, SHOW_BOOL}, {"bdb_shared_data", (char*) &berkeley_shared_data, SHOW_BOOL},
{"bdb_tmpdir", (char*) &berkeley_tmpdir, SHOW_CHAR_PTR}, {"bdb_tmpdir", (char*) &berkeley_tmpdir, SHOW_CHAR_PTR},
{"bdb_version", (char*) DB_VERSION_STRING, SHOW_CHAR},
#endif #endif
{"binlog_cache_size", (char*) &binlog_cache_size, SHOW_LONG}, {"binlog_cache_size", (char*) &binlog_cache_size, SHOW_LONG},
{"character_set", default_charset, SHOW_CHAR}, {"character_set", default_charset, SHOW_CHAR},