diff options
| author | unknown <serg@janus.mylan> | 2007-03-16 20:33:27 +0100 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-03-16 20:33:27 +0100 |
| commit | 929b7b1b5ff811d1a06c1c9cea5b58e008e20c8f (patch) | |
| tree | 5c776e7835969b55a2ad2ba1f861c8ad843a8a9d /sql/sql_udf.cc | |
| parent | 68f09e779291c0f48bcc79d7699dd708fda32c32 (diff) | |
| parent | a2630174940dfe4be437503eb82d07838b54cda2 (diff) | |
| download | mariadb-git-929b7b1b5ff811d1a06c1c9cea5b58e008e20c8f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
Diffstat (limited to 'sql/sql_udf.cc')
| -rw-r--r-- | sql/sql_udf.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc index 7dec58d9b6e..b0e7831465a 100644 --- a/sql/sql_udf.cc +++ b/sql/sql_udf.cc @@ -514,8 +514,7 @@ int mysql_drop_function(THD *thd,const LEX_STRING *udf_name) table->use_all_columns(); table->field[0]->store(exact_name_str, exact_name_len, &my_charset_bin); if (!table->file->index_read_idx(table->record[0], 0, - (byte*) table->field[0]->ptr, - table->key_info[0].key_length, + (byte*) table->field[0]->ptr, ~ULL(0), HA_READ_KEY_EXACT)) { int error; |