diff options
| author | unknown <monty@mysql.com> | 2004-04-12 01:43:07 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-04-12 01:43:07 +0300 |
| commit | c3846fdb0d6e6862a4e4d49c823611e2a07d4dec (patch) | |
| tree | 3f612a50043fe61483fd12385876c47bf3017e10 /sql/item.cc | |
| parent | 91e2f80bcb22c420816ec0f982ab137e567ee30d (diff) | |
| parent | fd7303416a18461bd815c062733b497bfaf0baa5 (diff) | |
| download | mariadb-git-c3846fdb0d6e6862a4e4d49c823611e2a07d4dec.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
sql/item.cc:
Auto merged
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/item.cc b/sql/item.cc index adaae50f0d2..2584c1cafb3 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -678,9 +678,7 @@ void Item_param::set_longdata(const char *str, ulong length) int Item_param::save_in_field(Field *field, bool no_conversions) { - THD *thd= current_thd; - - DBUG_ASSERT(thd->command == COM_EXECUTE); + DBUG_ASSERT(current_thd->command == COM_EXECUTE); if (null_value) return (int) set_field_to_null(field); |