mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Fixed bug in mysqlcheck when using --fast
Fixed problem when converting bigint to double. Fixed bug in count(distinct null) Fixed bug with empty BDB tables. BitKeeper/deleted/.del-ATIS-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~dd306b2e583ebde4: Delete: sql-bench/Results/ATIS-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg BitKeeper/deleted/.del-RUN-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~11038a44f73070e7: Delete: sql-bench/Results/RUN-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg BitKeeper/deleted/.del-alter-table-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~662b96bc66bc91b6: Delete: sql-bench/Results/alter-table-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg BitKeeper/deleted/.del-big-tables-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~788ad492867b1226: Delete: sql-bench/Results/big-tables-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg BitKeeper/deleted/.del-connect-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~5316add301edb60: Delete: sql-bench/Results/connect-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg BitKeeper/deleted/.del-create-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~26e09af61f88d8c9: Delete: sql-bench/Results/create-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg BitKeeper/deleted/.del-insert-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~fd2699adb3190d07: Delete: sql-bench/Results/insert-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg BitKeeper/deleted/.del-select-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~b01175ad38fd12b6: Delete: sql-bench/Results/select-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~8ba598d217450157: Delete: sql-bench/Results/wisconsin-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg Docs/manual.texi: Changelog + update to Linux section client/mysqlcheck.c: Fixed bug when using --fast --check --auto-repair --fast will not anymore repair tables that had warnings but where ok. mysql-test/r/bdb.result: New test case mysql-test/r/bigint.result: New test case mysql-test/r/count_distinct.result: New test case mysql-test/t/bdb.test: New test case mysql-test/t/bigint.test: New test case mysql-test/t/count_distinct.test: New test case sql-bench/Comments/postgres.benchmark: Update for PostgreSQL 7.1.2 sql-bench/graph-compare-results.sh: Fixed colors for mysql --fast tests sql/field.cc: Fixed problem when converting bigint to double. sql/item_sum.cc: Fixed bug in count(distinct null) sql/item_sum.h: Fixed bug in count(distinct null) sql/mysqlbinlog.cc: Fixed typo sql/sql_base.cc: cleanup sql/sql_select.cc: Fixed bug with empty BDB tables. sql/time.cc: Removed warning when reading timestamps with sub seconds.
This commit is contained in:
@@ -400,7 +400,22 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
|
||||
goto err; /* purecov: inspected */
|
||||
}
|
||||
if (join.const_tables && !thd->locked_tables)
|
||||
{
|
||||
TABLE **table, **end;
|
||||
for (table=join.table, end=table + join.const_tables ;
|
||||
table != end;
|
||||
table++)
|
||||
{
|
||||
/* BDB tables require that we call index_end() before doing an unlock */
|
||||
if ((*table)->key_read)
|
||||
{
|
||||
(*table)->key_read=0;
|
||||
(*table)->file->extra(HA_EXTRA_NO_KEYREAD);
|
||||
}
|
||||
(*table)->file->index_end();
|
||||
}
|
||||
mysql_unlock_some_tables(thd, join.table,join.const_tables);
|
||||
}
|
||||
if (!conds && join.outer_join)
|
||||
{
|
||||
/* Handle the case where we have an OUTER JOIN without a WHERE */
|
||||
@@ -2761,7 +2776,12 @@ return_zero_rows(select_result *result,TABLE_LIST *tables,List<Item> &fields,
|
||||
if (send_row)
|
||||
result->send_data(fields);
|
||||
if (tables) // Not from do_select()
|
||||
{
|
||||
/* Close open cursors */
|
||||
for (TABLE_LIST *table=tables; table ; table=table->next)
|
||||
table->table->file->index_end();
|
||||
result->send_eof(); // Should be safe
|
||||
}
|
||||
}
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user