mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge bk@192.168.21.1:mysql-4.1
into mysql.com:/home/hf/work/mysql-4.1.mrg mysql-test/mysql-test-run.pl: Auto merged sql/sql_table.cc: Auto merged
This commit is contained in:
@ -678,6 +678,7 @@ sub command_line_setup () {
|
|||||||
$glob_use_embedded_server= 1;
|
$glob_use_embedded_server= 1;
|
||||||
push(@glob_test_mode, "embedded");
|
push(@glob_test_mode, "embedded");
|
||||||
$opt_skip_rpl= 1; # We never run replication with embedded
|
$opt_skip_rpl= 1; # We never run replication with embedded
|
||||||
|
$opt_skip_ndbcluster= 1;
|
||||||
|
|
||||||
if ( $opt_extern )
|
if ( $opt_extern )
|
||||||
{
|
{
|
||||||
|
@ -279,6 +279,7 @@ while test $# -gt 0; do
|
|||||||
USE_EMBEDDED_SERVER=1
|
USE_EMBEDDED_SERVER=1
|
||||||
USE_MANAGER=0 NO_SLAVE=1
|
USE_MANAGER=0 NO_SLAVE=1
|
||||||
USE_RUNNING_SERVER=""
|
USE_RUNNING_SERVER=""
|
||||||
|
USE_NDBCLUSTER=""
|
||||||
TEST_MODE="$TEST_MODE embedded" ;;
|
TEST_MODE="$TEST_MODE embedded" ;;
|
||||||
--purify)
|
--purify)
|
||||||
USE_PURIFY=1
|
USE_PURIFY=1
|
||||||
|
@ -37,3 +37,12 @@ Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_
|
|||||||
execute stmt1;
|
execute stmt1;
|
||||||
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
|
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
|
||||||
deallocate prepare stmt1;
|
deallocate prepare stmt1;
|
||||||
|
create temporary table t1(a int, index(a));
|
||||||
|
insert into t1 values('1'),('2'),('3'),('4'),('5');
|
||||||
|
analyze table t1;
|
||||||
|
Table Op Msg_type Msg_text
|
||||||
|
test.t1 analyze status OK
|
||||||
|
show index from t1;
|
||||||
|
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
|
||||||
|
t1 1 a 1 a A 5 NULL NULL YES BTREE
|
||||||
|
drop table t1;
|
||||||
|
@ -48,4 +48,13 @@ execute stmt1;
|
|||||||
execute stmt1;
|
execute stmt1;
|
||||||
deallocate prepare stmt1;
|
deallocate prepare stmt1;
|
||||||
|
|
||||||
|
#
|
||||||
|
# bug#15225 (ANALYZE temporary has no effect)
|
||||||
|
#
|
||||||
|
create temporary table t1(a int, index(a));
|
||||||
|
insert into t1 values('1'),('2'),('3'),('4'),('5');
|
||||||
|
analyze table t1;
|
||||||
|
show index from t1;
|
||||||
|
drop table t1;
|
||||||
|
|
||||||
# End of 4.1 tests
|
# End of 4.1 tests
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
# This test should work in embedded server after we fix mysqltest
|
||||||
|
-- source include/not_embedded.inc
|
||||||
|
|
||||||
# We run with different binaries for normal and --embedded-server
|
# We run with different binaries for normal and --embedded-server
|
||||||
#
|
#
|
||||||
# If this test fails with "command "$MYSQL_CLIENT_TEST" failed",
|
# If this test fails with "command "$MYSQL_CLIENT_TEST" failed",
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
-- source include/not_embedded.inc
|
||||||
|
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
#
|
#
|
||||||
|
@ -2195,10 +2195,15 @@ send_result_message:
|
|||||||
table->table->version=0; // Force close of table
|
table->table->version=0; // Force close of table
|
||||||
else if (open_for_modify)
|
else if (open_for_modify)
|
||||||
{
|
{
|
||||||
pthread_mutex_lock(&LOCK_open);
|
if (table->table->tmp_table)
|
||||||
remove_table_from_cache(thd, table->table->table_cache_key,
|
table->table->file->info(HA_STATUS_CONST);
|
||||||
table->table->real_name, RTFC_NO_FLAG);
|
else
|
||||||
pthread_mutex_unlock(&LOCK_open);
|
{
|
||||||
|
pthread_mutex_lock(&LOCK_open);
|
||||||
|
remove_table_from_cache(thd, table->table->table_cache_key,
|
||||||
|
table->table->real_name, RTFC_NO_FLAG);
|
||||||
|
pthread_mutex_unlock(&LOCK_open);
|
||||||
|
}
|
||||||
/* May be something modified consequently we have to invalidate cache */
|
/* May be something modified consequently we have to invalidate cache */
|
||||||
query_cache_invalidate3(thd, table->table, 0);
|
query_cache_invalidate3(thd, table->table, 0);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user