diff options
| author | unknown <heikki@hundin.mysql.fi> | 2004-06-10 15:01:16 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2004-06-10 15:01:16 +0300 |
| commit | 378761c19359f7f69548429441d2d8063c3fad8b (patch) | |
| tree | 08581be9d382f6d6f1948c0beb28f17fd2087ccc /sql/ha_innodb.cc | |
| parent | 1a520c7a4771100f24244bfc79b47f961c42675a (diff) | |
| download | mariadb-git-378761c19359f7f69548429441d2d8063c3fad8b.tar.gz | |
Added function
/***********************************************************************
This function stores binlog offset and flushes logs */
void innobase_store_binlog_offset_and_flush_log(char *binlog_name,longlong offset)
requested by Guilhem to ha_innodb.cc and ha_innodb.h.
Change made by Jan.Lindstrom@innodb.com
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 619c05711c4..6ff468cdbb8 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -1748,14 +1748,9 @@ innobase_mysql_cmp( } } - /* Starting from 4.1.3 we use strnncollsp() in comparisons of - non-latin1_swedish_ci strings. NOTE that the collation order - changes then: 'b\0\0...' is ordered BEFORE 'b ...'. Users - having indexes on such data need to rebuild their tables! */ - - ret = charset->coll->strnncollsp(charset, - a, a_length, - b, b_length); + ret = my_strnncoll(charset, + a, a_length, + b, b_length); if (ret < 0) { return(-1); } else if (ret > 0) { @@ -4663,21 +4658,6 @@ ha_innobase::start_stmt( prepared for an update of a row */ prebuilt->select_lock_type = LOCK_X; - } else { - if (thd->lex->sql_command == SQLCOM_SELECT - && thd->lex->lock_option == TL_READ) { - - /* For other than temporary tables, we obtain - no lock for consistent read (plain SELECT) */ - - prebuilt->select_lock_type = LOCK_NONE; - } else { - /* Not a consistent read: use LOCK_X as the - select_lock_type value (TODO: how could we know - whether it should be LOCK_S, LOCK_X, or LOCK_NONE?) */ - - prebuilt->select_lock_type = LOCK_X; - } } /* Set the MySQL flag to mark that there is an active transaction */ @@ -5057,7 +5037,7 @@ ha_innobase::store_lock( /*********************************************************************** This function initializes the auto-inc counter if it has not been initialized yet. This function does not change the value of the auto-inc -counter if it already has been initialized. In parameter ret returns +counter if it already has been initialized. In paramete ret returns the value of the auto-inc counter. */ int @@ -5189,7 +5169,7 @@ This function stores binlog offset and flushes logs */ void innobase_store_binlog_offset_and_flush_log( /*=============================*/ - char *binlog_name, /* in: binlog name */ + char *binlog_name, /* in: binlog name */ longlong offset /* in: binlog offset */ ) { @@ -5214,5 +5194,4 @@ innobase_store_binlog_offset_and_flush_log( /* Syncronous flush of the log buffer to disk */ log_buffer_flush_to_disk(); } - #endif /* HAVE_INNOBASE_DB */ |