diff options
| author | brian@zim.(none) <> | 2006-09-28 11:25:02 -0700 |
|---|---|---|
| committer | brian@zim.(none) <> | 2006-09-28 11:25:02 -0700 |
| commit | bb09a2a940faf95740211442a95ef98e06cbbbcb (patch) | |
| tree | 6eb3b34cf1914b966c4189ea4b8907faca22d7e8 /sql/sql_cursor.cc | |
| parent | 542cf080a48174dceea17b361ebcde8650676821 (diff) | |
| parent | 7493331fa47f9fbddc6c11ade36566fdad7baeed (diff) | |
| download | mariadb-git-bb09a2a940faf95740211442a95ef98e06cbbbcb.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
into zim.(none):/home/brian/mysql/merge-5.1
Diffstat (limited to 'sql/sql_cursor.cc')
| -rw-r--r-- | sql/sql_cursor.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_cursor.cc b/sql/sql_cursor.cc index 2784e71ccae..82ee8d72d33 100644 --- a/sql/sql_cursor.cc +++ b/sql/sql_cursor.cc @@ -323,7 +323,7 @@ Sensitive_cursor::post_open(THD *thd) if (ht->create_cursor_read_view) { info->ht= ht; - info->read_view= (ht->create_cursor_read_view)(); + info->read_view= (ht->create_cursor_read_view)(thd); ++info; } } @@ -433,7 +433,7 @@ Sensitive_cursor::fetch(ulong num_rows) thd->set_n_backup_active_arena(this, &backup_arena); for (info= ht_info; info->read_view ; info++) - (info->ht->set_cursor_read_view)(info->read_view); + (info->ht->set_cursor_read_view)(thd, info->read_view); join->fetch_limit+= num_rows; @@ -454,7 +454,7 @@ Sensitive_cursor::fetch(ulong num_rows) reset_thd(thd); for (info= ht_info; info->read_view; info++) - (info->ht->set_cursor_read_view)(0); + (info->ht->set_cursor_read_view)(thd, 0); if (error == NESTED_LOOP_CURSOR_LIMIT) { @@ -487,7 +487,7 @@ Sensitive_cursor::close() for (Engine_info *info= ht_info; info->read_view; info++) { - (info->ht->close_cursor_read_view)(info->read_view); + (info->ht->close_cursor_read_view)(thd, info->read_view); info->read_view= 0; info->ht= 0; } |