Commit b9eaaf17 authored by tim@donna.mysql.com's avatar tim@donna.mysql.com
Browse files

Add bdb_version variable, and a new test.

parent 6295e1b1

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line 
jani@hynda.mysql.fi

monty@donna.mysql.com

tim@donna.mysql.com

mysql-test/r/bdb.result

+7 −0
Original line number Diff line number Diff line
@@ -406,3 +406,10 @@ a 
1

2

3

b

this is a blob

b	i

this is a blob	1

b	i

this is a blob	1

b	i

mysql-test/t/bdb.test

+10 −0
Original line number Diff line number Diff line
@@ -334,3 +334,13 @@ CREATE TABLE t1 (a int not null, primary key (a)) type=bdb; 
insert into t1 values(1),(2),(3);

select t1.a from t1 natural join t1 as t2 order by t1.a;

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;

sql/mysqld.cc

+1 −0
Original line number Diff line number Diff line
@@ -2634,6 +2634,7 @@ struct show_var_st init_vars[]= { 
  {"bdb_logdir",              (char*) &berkeley_logdir,             SHOW_CHAR_PTR},

  {"bdb_shared_data",	      (char*) &berkeley_shared_data,	    SHOW_BOOL},

  {"bdb_tmpdir",              (char*) &berkeley_tmpdir,             SHOW_CHAR_PTR},

  {"bdb_version",             (char*) DB_VERSION_STRING,            SHOW_CHAR},

#endif

  {"binlog_cache_size",       (char*) &binlog_cache_size,	    SHOW_LONG},

  {"character_set",           default_charset,                      SHOW_CHAR},