diff options
| author | unknown <brian@zim.(none)> | 2006-08-10 13:44:04 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-08-10 13:44:04 -0700 |
| commit | 189b8bc5313dc7cddcc225a40c1b2aacd0c2b61e (patch) | |
| tree | 7eef0e76390b5483cb9482dcfd19d0fac649d9cb /sql/handler.cc | |
| parent | 6fb4287a4e5c9c76f6dce5f2513163abf3fa1452 (diff) | |
| parent | 04d2b020a49dfc129d587380aba50e5bac6f393b (diff) | |
| download | mariadb-git-189b8bc5313dc7cddcc225a40c1b2aacd0c2b61e.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
into zim.(none):/home/brian/mysql/remove-bdb-5.1
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/Makefile.am:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index fbccfe7fa46..d67acf69d14 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -74,7 +74,6 @@ static const LEX_STRING sys_table_aliases[]= { {(char*)STRING_WITH_LEN("INNOBASE")}, {(char*)STRING_WITH_LEN("INNODB")}, {(char*)STRING_WITH_LEN("NDB")}, {(char*)STRING_WITH_LEN("NDBCLUSTER")}, - {(char*)STRING_WITH_LEN("BDB")}, {(char*)STRING_WITH_LEN("BERKELEYDB")}, {(char*)STRING_WITH_LEN("HEAP")}, {(char*)STRING_WITH_LEN("MEMORY")}, {(char*)STRING_WITH_LEN("MERGE")}, {(char*)STRING_WITH_LEN("MRG_MYISAM")}, {NullS, 0} @@ -1508,7 +1507,7 @@ int handler::ha_open(TABLE *table_arg, const char *name, int mode, /* Read first row (only) from a table - This is never called for InnoDB or BDB tables, as these table types + This is never called for InnoDB tables, as these table types has the HA_STATS_RECORDS_IS_EXACT set. */ |