diff options
| author | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2008-03-07 11:25:47 +0200 |
|---|---|---|
| committer | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2008-03-07 11:25:47 +0200 |
| commit | ab013df0806c83bf36d1ae4d4503ce8ff2caad84 (patch) | |
| tree | ca9a1a82215627b05504ef9b583eb2a3925fe1fa /sql/handler.cc | |
| parent | d4025ce1a60322635bf5f7adb765f4612563ee3a (diff) | |
| parent | b806eea262123165cd1209a58d8a9177d4bac3ed (diff) | |
| download | mariadb-git-ab013df0806c83bf36d1ae4d4503ce8ff2caad84.tar.gz | |
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 0fb61895a61..8dee27b509d 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -288,7 +288,8 @@ handler *get_ha_partition(partition_info *part_info) @retval !=0 Error */ -static int ha_init_errors(void) + +int ha_init_errors(void) { #define SETMSG(nr, msg) errmsgs[(nr) - HA_ERR_FIRST]= (msg) const char **errmsgs; @@ -501,9 +502,6 @@ int ha_init() int error= 0; DBUG_ENTER("ha_init"); - if (ha_init_errors()) - DBUG_RETURN(1); - DBUG_ASSERT(total_ha < MAX_HA); /* Check if there is a transaction-capable storage engine besides the @@ -3338,10 +3336,10 @@ handler::ha_repair_partitions(THD *thd) int ha_enable_transaction(THD *thd, bool on) { int error=0; - DBUG_ENTER("ha_enable_transaction"); - thd->transaction.on= on; - if (on) + DBUG_PRINT("enter", ("on: %d", (int) on)); + + if ((thd->transaction.on= on)) { /* Now all storage engines should have transaction handling enabled. |