maria-developers team mailing list archive
-
maria-developers team
-
Mailing list archive
-
Message #03282
[Branch ~maria-captains/maria/5.1-converting] Rev 2866: merged
Merge authors:
Bo Thorsen (bo.thorsen)
Michael Widenius (monty)
Sergei (sergii)
------------------------------------------------------------
revno: 2866 [merge]
committer: Sergei Golubchik <sergii@xxxxxxxxx>
branch nick: 5.1
timestamp: Mon 2010-06-14 19:05:32 +0200
message:
merged
modified:
CMakeLists.txt
client/mysqldump.c
client/mysqltest.cc
mysql-test/r/mysqldump.result
mysql-test/r/openssl_1.result
mysql-test/suite/maria/r/maria-recover.result
mysql-test/suite/maria/r/maria3.result
mysql-test/suite/maria/t/maria3.test
storage/maria/ha_maria.cc
storage/maria/ha_maria.h
storage/maria/ma_blockrec.h
storage/maria/ma_init.c
storage/maria/ma_open.c
storage/maria/ma_pagecache.c
storage/maria/ma_recovery.c
storage/maria/ma_state.c
storage/maria/ma_static.c
storage/maria/maria_def.h
--
lp:~maria-captains/maria/5.1-converting
https://code.launchpad.net/~maria-captains/maria/5.1-converting
Your team Maria developers is subscribed to branch lp:~maria-captains/maria/5.1-converting.
To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1-converting/+edit-subscription
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2010-03-04 08:03:07 +0000
+++ CMakeLists.txt 2010-06-14 08:18:49 +0000
@@ -327,7 +327,6 @@
ADD_SUBDIRECTORY(libmysql)
ADD_SUBDIRECTORY(tests)
ADD_SUBDIRECTORY(unittest/mytap)
-ADD_SUBDIRECTORY(unittest/examples)
ADD_SUBDIRECTORY(unittest/mysys)
IF(WITH_EMBEDDED_SERVER)
ADD_SUBDIRECTORY(libmysqld)
=== modified file 'client/mysqldump.c'
--- client/mysqldump.c 2010-04-28 12:52:24 +0000
+++ client/mysqldump.c 2010-06-13 22:13:32 +0000
@@ -964,7 +964,7 @@
static void DB_error(MYSQL *mysql_arg, const char *when)
{
DBUG_ENTER("DB_error");
- maybe_die(EX_MYSQLERR, "Got error: %d: %s %s",
+ maybe_die(EX_MYSQLERR, "Got error: %d: \"%s\" %s",
mysql_errno(mysql_arg), mysql_error(mysql_arg), when);
DBUG_VOID_RETURN;
}
=== modified file 'client/mysqltest.cc'
--- client/mysqltest.cc 2010-04-28 12:52:24 +0000
+++ client/mysqltest.cc 2010-06-14 09:18:54 +0000
@@ -73,6 +73,10 @@
#define QUERY_SEND_FLAG 1
#define QUERY_REAP_FLAG 2
+#ifndef HAVE_SETENV
+static int setenv(const char *name, const char *value, int overwrite);
+#endif
+
enum {
OPT_SKIP_SAFEMALLOC=OPT_MAX_CLIENT_OPTION,
OPT_PS_PROTOCOL, OPT_SP_PROTOCOL, OPT_CURSOR_PROTOCOL, OPT_VIEW_PROTOCOL,
@@ -226,7 +230,6 @@
int alloced_len;
int int_dirty; /* do not update string if int is updated until first read */
int alloced;
- char *env_s;
} VAR;
/*Perl/shell-like variable registers */
@@ -1981,13 +1984,20 @@
+ name_len+1, MYF(MY_WME))))
die("Out of memory");
- tmp_var->name = (name) ? (char*) tmp_var + sizeof(*tmp_var) : 0;
+ if (name != NULL)
+ {
+ tmp_var->name= reinterpret_cast<char*>(tmp_var) + sizeof(*tmp_var);
+ memcpy(tmp_var->name, name, name_len);
+ tmp_var->name[name_len]= 0;
+ }
+ else
+ tmp_var->name= NULL;
+
tmp_var->alloced = (v == 0);
if (!(tmp_var->str_val = (char*)my_malloc(val_alloc_len+1, MYF(MY_WME))))
die("Out of memory");
- memcpy(tmp_var->name, name, name_len);
if (val)
{
memcpy(tmp_var->str_val, val, val_len);
@@ -1998,7 +2008,6 @@
tmp_var->alloced_len = val_alloc_len;
tmp_var->int_val = (val) ? atoi(val) : 0;
tmp_var->int_dirty = 0;
- tmp_var->env_s = 0;
return tmp_var;
}
@@ -2126,20 +2135,15 @@
if (env_var)
{
- char buf[1024], *old_env_s= v->env_s;
if (v->int_dirty)
{
sprintf(v->str_val, "%d", v->int_val);
v->int_dirty= 0;
v->str_val_len= strlen(v->str_val);
}
- my_snprintf(buf, sizeof(buf), "%.*s=%.*s",
- v->name_len, v->name,
- v->str_val_len, v->str_val);
- if (!(v->env_s= my_strdup(buf, MYF(MY_WME))))
- die("Out of memory");
- putenv(v->env_s);
- my_free(old_env_s, MYF(MY_ALLOW_ZERO_PTR));
+ /* setenv() expects \0-terminated strings */
+ DBUG_ASSERT(v->name[v->name_len] == 0);
+ setenv(v->name, v->str_val, 1);
}
DBUG_VOID_RETURN;
}
@@ -9828,3 +9832,18 @@
delete_dynamic(&lines);
DBUG_VOID_RETURN;
}
+
+#ifndef HAVE_SETENV
+static int setenv(const char *name, const char *value, int overwrite)
+{
+ size_t buflen= strlen(name) + strlen(value) + 2;
+ char *envvar= (char *)malloc(buflen);
+ if(!envvar)
+ return ENOMEM;
+ strcpy(envvar, name);
+ strcat(envvar, "=");
+ strcat(envvar, value);
+ putenv(envvar);
+ return 0;
+}
+#endif
=== modified file 'mysql-test/r/mysqldump.result'
--- mysql-test/r/mysqldump.result 2009-09-07 20:50:10 +0000
+++ mysql-test/r/mysqldump.result 2010-06-13 22:13:32 +0000
@@ -1658,8 +1658,8 @@
mysqldump: Couldn't find table: "T_"
test_sequence
------ Testing with illegal database names ------
-mysqldump: Got error: 1049: Unknown database 'mysqldump_test_d' when selecting the database
-mysqldump: Got error: 1049: Unknown database 'mysqld\ump_test_db' when selecting the database
+mysqldump: Got error: 1049: "Unknown database 'mysqldump_test_d'" when selecting the database
+mysqldump: Got error: 1049: "Unknown database 'mysqld\ump_test_db'" when selecting the database
drop table t1, t2, t3;
drop database mysqldump_test_db;
use test;
@@ -1833,7 +1833,7 @@
#
create table t1 (a int);
mysqldump: Couldn't execute 'SELECT /*!40001 SQL_NO_CACHE */ * FROM `t1` WHERE xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx': You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 (1064)
-mysqldump: Got error: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 when retrieving data from server
+mysqldump: Got error: 1064: "You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1" when retrieving data from server
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
=== modified file 'mysql-test/r/openssl_1.result'
--- mysql-test/r/openssl_1.result 2010-03-04 08:03:07 +0000
+++ mysql-test/r/openssl_1.result 2010-06-13 22:13:32 +0000
@@ -189,7 +189,7 @@
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
SSL error: Unable to get private key from 'MYSQL_TEST_DIR/std_data/client-cert.pem'
-mysqldump: Got error: 2026: SSL connection error when trying to connect
+mysqldump: Got error: 2026: "SSL connection error" when trying to connect
DROP TABLE t1;
Variable_name Value
Ssl_cipher DHE-RSA-AES256-SHA
=== modified file 'mysql-test/suite/maria/r/maria-recover.result'
--- mysql-test/suite/maria/r/maria-recover.result 2010-01-27 17:41:05 +0000
+++ mysql-test/suite/maria/r/maria-recover.result 2010-06-13 22:13:32 +0000
@@ -8,7 +8,7 @@
set global maria_recover=default;
select @@global.maria_recover;
@@global.maria_recover
-OFF
+NORMAL
set global maria_recover=normal;
select @@global.maria_recover;
@@global.maria_recover
=== modified file 'mysql-test/suite/maria/r/maria3.result'
--- mysql-test/suite/maria/r/maria3.result 2010-02-12 14:21:13 +0000
+++ mysql-test/suite/maria/r/maria3.result 2010-06-13 22:13:32 +0000
@@ -313,7 +313,7 @@
maria_pagecache_buffer_size 8384512
maria_pagecache_division_limit 100
maria_page_checksum OFF
-maria_recover OFF
+maria_recover NORMAL
maria_repair_threads 1
maria_sort_buffer_size 8388608
maria_stats_method nulls_unequal
@@ -549,6 +549,30 @@
count(*)
1
drop table t1, t2;
+create temporary table t1 (a int, key(a)) transactional=0 row_format=page;
+create temporary table t2 (a int, key(a)) transactional=0 row_format=page;
+insert into t1 values (0),(1),(2),(3),(4);
+insert into t2 select * from t1;
+insert into t1 select NULL from t2;
+select count(*) from t1;
+count(*)
+10
+select count(*) from t1 where a >= 4;
+count(*)
+1
+drop table t1, t2;
+create temporary table t1 (a int, key(a)) transactional=0 row_format=fixed;
+create temporary table t2 (a int, key(a)) transactional=0 row_format=dynamic;
+insert into t1 values (0),(1),(2),(3),(4);
+insert into t2 select * from t1;
+insert into t1 select NULL from t2;
+select count(*) from t1;
+count(*)
+10
+select count(*) from t1 where a >= 4;
+count(*)
+1
+drop table t1, t2;
create table t1 (i int auto_increment not null primary key) transactional=0;
check table t1 extended;
Table Op Msg_type Msg_text
=== modified file 'mysql-test/suite/maria/t/maria3.test'
--- mysql-test/suite/maria/t/maria3.test 2010-02-12 14:21:13 +0000
+++ mysql-test/suite/maria/t/maria3.test 2010-06-13 22:13:32 +0000
@@ -433,6 +433,24 @@
select count(*) from t1 where a >= 4;
drop table t1, t2;
+create temporary table t1 (a int, key(a)) transactional=0 row_format=page;
+create temporary table t2 (a int, key(a)) transactional=0 row_format=page;
+insert into t1 values (0),(1),(2),(3),(4);
+insert into t2 select * from t1;
+insert into t1 select NULL from t2;
+select count(*) from t1;
+select count(*) from t1 where a >= 4;
+drop table t1, t2;
+
+create temporary table t1 (a int, key(a)) transactional=0 row_format=fixed;
+create temporary table t2 (a int, key(a)) transactional=0 row_format=dynamic;
+insert into t1 values (0),(1),(2),(3),(4);
+insert into t2 select * from t1;
+insert into t1 select NULL from t2;
+select count(*) from t1;
+select count(*) from t1 where a >= 4;
+drop table t1, t2;
+
#
# Test problems with small rows and row_type=page
# Bug 35048 "maria table corruption reported when transactional=0"
=== modified file 'storage/maria/ha_maria.cc'
--- storage/maria/ha_maria.cc 2010-02-12 14:21:13 +0000
+++ storage/maria/ha_maria.cc 2010-06-13 22:13:32 +0000
@@ -202,7 +202,7 @@
"Specifies how corrupted tables should be automatically repaired."
" Possible values are \"NORMAL\" (the default), \"BACKUP\", \"FORCE\","
" \"QUICK\", or \"OFF\" which is like not using the option.",
- NULL, NULL, HA_RECOVER_NONE, &maria_recover_typelib);
+ NULL, NULL, HA_RECOVER_DEFAULT, &maria_recover_typelib);
static MYSQL_THDVAR_ULONG(repair_threads, PLUGIN_VAR_RQCMDARG,
"Number of threads to use when repairing maria tables. The value of 1 "
@@ -707,8 +707,54 @@
DBUG_VOID_RETURN;
}
+/*
+ Create a transaction object
+
+ SYNOPSIS
+ info Maria handler
+
+ RETURN
+ 0 ok
+ # Error number (HA_ERR_OUT_OF_MEM)
+*/
+
+static int maria_create_trn_for_mysql(MARIA_HA *info)
+{
+ THD *thd= (THD*) info->external_ptr;
+ TRN *trn= THD_TRN;
+ DBUG_ENTER("maria_create_trn_for_mysql");
+
+ if (!trn) /* no transaction yet - open it now */
+ {
+ trn= trnman_new_trn(& thd->transaction.wt);
+ if (unlikely(!trn))
+ DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+ THD_TRN= trn;
+ if (thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))
+ trans_register_ha(thd, TRUE, maria_hton);
+ }
+ _ma_set_trn_for_table(info, trn);
+ if (!trnman_increment_locked_tables(trn))
+ {
+ trans_register_ha(thd, FALSE, maria_hton);
+ trnman_new_statement(trn);
+ }
+#ifdef EXTRA_DEBUG
+ if (info->lock_type == F_WRLCK &&
+ ! (trnman_get_flags(trn) & TRN_STATE_INFO_LOGGED))
+ {
+ trnman_set_flags(trn, trnman_get_flags(trn) | TRN_STATE_INFO_LOGGED |
+ TRN_STATE_TABLES_CAN_CHANGE);
+ (void) translog_log_debug_info(trn, LOGREC_DEBUG_INFO_QUERY,
+ (uchar*) thd->query(),
+ thd->query_length());
+ }
+#endif
+ DBUG_RETURN(0);
}
+} /* extern "C" */
+
/**
Transactional table doing bulk insert with one single UNDO
(UNDO_BULK_INSERT) and with repair.
@@ -2313,9 +2359,9 @@
return maria_delete_table(name);
}
+
int ha_maria::external_lock(THD *thd, int lock_type)
{
- TRN *trn= THD_TRN;
DBUG_ENTER("ha_maria::external_lock");
/*
We don't test now_transactional because it may vary between lock/unlock
@@ -2335,22 +2381,7 @@
/* Transactional table */
if (lock_type != F_UNLCK)
{
- /* Start of new statement */
- if (!trn) /* no transaction yet - open it now */
- {
- trn= trnman_new_trn(& thd->transaction.wt);
- if (unlikely(!trn))
- DBUG_RETURN(HA_ERR_OUT_OF_MEM);
- THD_TRN= trn;
- if (thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))
- trans_register_ha(thd, TRUE, maria_hton);
- }
- _ma_set_trn_for_table(file, trn);
- if (!trnman_increment_locked_tables(trn))
- {
- trans_register_ha(thd, FALSE, maria_hton);
- trnman_new_statement(trn);
- }
+ file->external_ptr= thd; // For maria_register_trn()
if (!file->s->lock_key_trees) // If we don't use versioning
{
@@ -2383,20 +2414,10 @@
DBUG_PRINT("info", ("Disabling logging for table"));
_ma_tmp_disable_logging_for_table(file, TRUE);
}
-#ifdef EXTRA_DEBUG
- if (lock_type == F_WRLCK &&
- ! (trnman_get_flags(trn) & TRN_STATE_INFO_LOGGED))
- {
- trnman_set_flags(trn, trnman_get_flags(trn) | TRN_STATE_INFO_LOGGED |
- TRN_STATE_TABLES_CAN_CHANGE);
- (void) translog_log_debug_info(trn, LOGREC_DEBUG_INFO_QUERY,
- (uchar*) thd->query(),
- thd->query_length());
- }
-#endif
}
else
{
+ TRN *trn= THD_TRN;
/* End of transaction */
/*
@@ -2421,6 +2442,8 @@
file->state= &file->s->state.state;
if (trn)
{
+ DBUG_PRINT("info",
+ ("locked_tables: %u", trnman_has_locked_tables(trn)));
if (trnman_has_locked_tables(trn) &&
!trnman_decrement_locked_tables(trn))
{
@@ -3187,9 +3210,11 @@
MYSQL_VERSION_ID, server_id, maria_log_pagecache,
TRANSLOG_DEFAULT_FLAGS, 0) ||
maria_recovery_from_log() ||
- ((force_start_after_recovery_failures != 0) && mark_recovery_success()) ||
+ ((force_start_after_recovery_failures != 0 ||
+ maria_recovery_changed_data) && mark_recovery_success()) ||
ma_checkpoint_init(checkpoint_interval);
maria_multi_threaded= maria_in_ha_maria= TRUE;
+ maria_create_trn_hook= maria_create_trn_for_mysql;
#if defined(HAVE_REALPATH) && !defined(HAVE_valgrind) && !defined(HAVE_BROKEN_REALPATH)
/* We can only test for sub paths if my_symlink.c is using realpath */
=== modified file 'storage/maria/ha_maria.h'
--- storage/maria/ha_maria.h 2008-12-02 22:02:52 +0000
+++ storage/maria/ha_maria.h 2010-06-13 22:13:32 +0000
@@ -141,7 +141,7 @@
bool check_and_repair(THD * thd);
bool is_crashed() const;
bool is_changed() const;
- bool auto_repair() const { return 1; }
+ bool auto_repair() const { return maria_recover_options != HA_RECOVER_NONE; }
int optimize(THD * thd, HA_CHECK_OPT * check_opt);
int restore(THD * thd, HA_CHECK_OPT * check_opt);
int backup(THD * thd, HA_CHECK_OPT * check_opt);
=== modified file 'storage/maria/ma_blockrec.h'
--- storage/maria/ma_blockrec.h 2009-02-09 21:52:42 +0000
+++ storage/maria/ma_blockrec.h 2010-06-13 22:13:32 +0000
@@ -279,7 +279,8 @@
my_bool write_hook_for_commit(enum translog_record_type type,
TRN *trn, MARIA_HA *tbl_info, LSN *lsn,
void *hook_arg);
-void _ma_block_get_status(void* param, my_bool concurrent_insert);
+void _ma_block_get_status(void *param, my_bool concurrent_insert);
+void _ma_block_get_status_no_versioning(void *param, my_bool concurrent_ins);
void _ma_block_update_status(void *param);
void _ma_block_restore_status(void *param);
my_bool _ma_block_check_status(void *param);
=== modified file 'storage/maria/ma_init.c'
--- storage/maria/ma_init.c 2008-10-09 20:03:54 +0000
+++ storage/maria/ma_init.c 2010-06-13 22:13:32 +0000
@@ -40,6 +40,11 @@
}
+static int dummy_maria_create_trn_hook(MARIA_HA *info __attribute__((unused)))
+{
+ return 0;
+}
+
/*
Initialize maria
@@ -64,6 +69,7 @@
pthread_mutex_init(&THR_LOCK_maria,MY_MUTEX_INIT_SLOW);
_ma_init_block_record_data();
trnman_end_trans_hook= _ma_trnman_end_trans_hook;
+ maria_create_trn_hook= dummy_maria_create_trn_hook;
my_handler_error_register();
}
hash_init(&maria_stored_state, &my_charset_bin, 32,
=== modified file 'storage/maria/ma_open.c'
--- storage/maria/ma_open.c 2009-06-30 12:01:29 +0000
+++ storage/maria/ma_open.c 2010-06-13 22:13:32 +0000
@@ -892,6 +892,11 @@
share->lock_restore_status= _ma_restore_status;
}
}
+ else if (share->now_transactional)
+ {
+ DBUG_ASSERT(share->data_file_type == BLOCK_RECORD);
+ share->lock.get_status= _ma_block_get_status_no_versioning;
+ }
}
#endif
/*
=== modified file 'storage/maria/ma_pagecache.c'
--- storage/maria/ma_pagecache.c 2009-02-19 09:01:25 +0000
+++ storage/maria/ma_pagecache.c 2010-06-13 22:13:32 +0000
@@ -4187,7 +4187,13 @@
{
PAGECACHE_BLOCK_LINK *block= *cache;
- if (block->pins)
+ /*
+ This code is only run for non transactional tables.
+ We may have other threads reading the block during flush,
+ as non transactional tables can have many readers while the
+ one writer is doing the flush.
+ */
+ if (block->wlocks)
{
KEYCACHE_DBUG_PRINT("flush_cached_blocks",
("block: %u (0x%lx) pinned",
@@ -4204,13 +4210,9 @@
*first_errno= HA_ERR_INTERNAL_ERROR;
continue;
}
- /* if the block is not pinned then it is not write locked */
- DBUG_ASSERT(block->wlocks == 0);
- DBUG_ASSERT(block->pins == 0);
if (make_lock_and_pin(pagecache, block,
- PAGECACHE_LOCK_WRITE, PAGECACHE_PIN, FALSE))
+ PAGECACHE_LOCK_READ, PAGECACHE_PIN, FALSE))
DBUG_ASSERT(0);
- DBUG_ASSERT(block->pins == 1);
KEYCACHE_DBUG_PRINT("flush_cached_blocks",
("block: %u (0x%lx) to be flushed",
@@ -4222,7 +4224,6 @@
DBUG_PRINT("info", ("block: %u (0x%lx) pins: %u",
PCBLOCK_NUMBER(pagecache, block), (ulong)block,
block->pins));
- DBUG_ASSERT(block->pins == 1);
/**
@todo IO If page is contiguous with next page to flush, group flushes
in one single my_pwrite().
@@ -4241,7 +4242,7 @@
pagecache_pthread_mutex_lock(&pagecache->cache_lock);
if (make_lock_and_pin(pagecache, block,
- PAGECACHE_LOCK_WRITE_UNLOCK,
+ PAGECACHE_LOCK_READ_UNLOCK,
PAGECACHE_UNPIN, FALSE))
DBUG_ASSERT(0);
=== modified file 'storage/maria/ma_recovery.c'
--- storage/maria/ma_recovery.c 2010-02-10 19:06:24 +0000
+++ storage/maria/ma_recovery.c 2010-06-13 22:13:32 +0000
@@ -266,6 +266,7 @@
DBUG_ASSERT(apply == MARIA_LOG_APPLY || !should_run_undo_phase);
DBUG_ASSERT(!maria_multi_threaded);
recovery_warnings= 0;
+ maria_recovery_changed_data= 0;
/* checkpoints can happen only if TRNs have been built */
DBUG_ASSERT(should_run_undo_phase || !take_checkpoints);
all_active_trans= (struct st_trn_for_recovery *)
@@ -465,8 +466,18 @@
fflush(stderr);
}
if (!error)
+ {
ma_message_no_user(ME_JUST_INFO, "recovery done");
- }
+ maria_recovery_changed_data= 1;
+ }
+ }
+ else if (!error && max_trid_in_control_file != max_long_trid)
+ {
+ /* Set max trid in log file so that one can run maria_chk on the tables */
+ max_trid_in_control_file= trnman_get_max_trid();
+ maria_recovery_changed_data= 1;
+ }
+
if (error)
my_message(HA_ERR_INITIALIZATION,
"Maria recovery failed. Please run maria_chk -r on all maria "
=== modified file 'storage/maria/ma_state.c'
--- storage/maria/ma_state.c 2009-11-29 23:08:56 +0000
+++ storage/maria/ma_state.c 2010-06-13 22:13:32 +0000
@@ -53,12 +53,16 @@
my_bool _ma_setup_live_state(MARIA_HA *info)
{
- TRN *trn= info->trn;
+ TRN *trn;
MARIA_SHARE *share= info->s;
MARIA_USED_TABLES *tables;
MARIA_STATE_HISTORY *history;
DBUG_ENTER("_ma_setup_live_state");
+ if (maria_create_trn_hook(info))
+ DBUG_RETURN(1);
+
+ trn= info->trn;
for (tables= (MARIA_USED_TABLES*) info->trn->used_tables;
tables;
tables= tables->next)
@@ -69,6 +73,7 @@
goto end;
}
}
+
/* Table was not used before, create new table state entry */
if (!(tables= (MARIA_USED_TABLES*) my_malloc(sizeof(*tables),
MYF(MY_WME | MY_ZEROFILL))))
@@ -566,7 +571,8 @@
{
MARIA_HA *info=(MARIA_HA*) param;
DBUG_ENTER("_ma_block_get_status");
- DBUG_PRINT("info", ("concurrent_insert %d", concurrent_insert));
+ DBUG_PRINT("enter", ("concurrent_insert %d", concurrent_insert));
+
info->row_base_length= info->s->base_length;
info->row_flag= info->s->base.default_row_flag;
if (concurrent_insert)
@@ -589,6 +595,21 @@
*/
(void) _ma_setup_live_state(info);
}
+ else
+ {
+ /*
+ Info->trn is set if this table is already handled and we are
+ called from maria_versioning()
+ */
+ if (info->s->base.born_transactional && !info->trn)
+ {
+ /*
+ Assume for now that this doesn't fail (It can only fail in
+ out of memory conditions)
+ */
+ (void) maria_create_trn_hook(info);
+ }
+ }
DBUG_VOID_RETURN;
}
@@ -616,6 +637,28 @@
}
+/* Get status when transactional but not versioned */
+
+void _ma_block_get_status_no_versioning(void* param, my_bool concurrent_insert)
+{
+ MARIA_HA *info=(MARIA_HA*) param;
+ DBUG_ENTER("_ma_block_get_status_no_version");
+ DBUG_PRINT("enter", ("concurrent_insert %d", concurrent_insert));
+ DBUG_ASSERT(info->s->base.born_transactional);
+
+ info->state->changed= 0; /* from _ma_reset_update_flag() */
+ if (!info->trn)
+ {
+ /*
+ Assume for now that this doesn't fail (It can only fail in
+ out of memory conditions)
+ */
+ (void) maria_create_trn_hook(info);
+ }
+ DBUG_VOID_RETURN;
+}
+
+
/**
Enable/disable versioning
*/
=== modified file 'storage/maria/ma_static.c'
--- storage/maria/ma_static.c 2008-10-16 08:54:53 +0000
+++ storage/maria/ma_static.c 2010-06-13 22:13:32 +0000
@@ -37,6 +37,7 @@
my_bool maria_delay_key_write= 0, maria_page_checksums= 1;
my_bool maria_inited= FALSE;
my_bool maria_in_ha_maria= FALSE; /* If used from ha_maria or not */
+my_bool maria_recovery_changed_data= 0;
pthread_mutex_t THR_LOCK_maria;
#if defined(THREAD) && !defined(DONT_USE_RW_LOCKS)
ulong maria_concurrent_insert= 2;
@@ -55,6 +56,7 @@
MY_TMPDIR *maria_tmpdir; /* Tempdir for redo */
char *maria_data_root;
HASH maria_stored_state;
+int (*maria_create_trn_hook)(MARIA_HA *);
/**
@brief when transactionality does not matter we can use this transaction
=== modified file 'storage/maria/maria_def.h'
--- storage/maria/maria_def.h 2010-03-28 18:10:00 +0000
+++ storage/maria/maria_def.h 2010-06-13 22:13:32 +0000
@@ -482,7 +482,8 @@
struct st_maria_handler
{
MARIA_SHARE *s; /* Shared between open:s */
- struct st_ma_transaction *trn; /* Pointer to active transaction */
+ struct st_ma_transaction *trn; /* Pointer to active transaction */
+ void *external_ptr; /* Pointer to THD in mysql */
MARIA_STATUS_INFO *state, state_save;
MARIA_STATUS_INFO *state_start; /* State at start of transaction */
MARIA_ROW cur_row; /* The active row that we just read */
@@ -788,8 +789,9 @@
extern uint maria_quick_table_bits;
extern char *maria_data_root;
extern uchar maria_zero_string[];
-extern my_bool maria_inited, maria_in_ha_maria;
+extern my_bool maria_inited, maria_in_ha_maria, maria_recovery_changed_data;
extern HASH maria_stored_state;
+extern int (*maria_create_trn_hook)(MARIA_HA *);
/* This is used by _ma_calc_xxx_key_length och _ma_store_key */
typedef struct st_maria_s_param
@@ -1242,5 +1244,4 @@
extern my_bool maria_flush_log_for_page_none(uchar *page,
pgcache_page_no_t page_no,
uchar *data_ptr);
-void maria_concurrent_inserts(MARIA_HA *info, my_bool concurrent_insert);
extern PAGECACHE *maria_log_pagecache;
