diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-02-09 12:10:12 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-02-09 12:10:12 +0200 |
| commit | 584ddfdab2316c0b0520c6903fe6bf4b8a435b0a (patch) | |
| tree | 4b7dc051ca61468dc50e8f7ab046eb07b55e7c3a /sql/sql_udf.cc | |
| parent | faa8a41b1db57e643617eda8c49803f6e1287f87 (diff) | |
| parent | 1f739ca45eb009de8dadd4503374bc4a5c6bf5c0 (diff) | |
| download | mariadb-git-584ddfdab2316c0b0520c6903fe6bf4b8a435b0a.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-derived2-4.1
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/sql_udf.cc')
| -rw-r--r-- | sql/sql_udf.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc index 337f2540a39..6e8aae54b23 100644 --- a/sql/sql_udf.cc +++ b/sql/sql_udf.cc @@ -149,7 +149,7 @@ void udf_init() tables.lock_type = TL_READ; tables.db=new_thd->db; - if (open_and_lock_tables(new_thd, &tables)) + if (simple_open_n_lock_tables(new_thd, &tables)) { DBUG_PRINT("error",("Can't open udf table")); sql_print_error("Can't open mysql/func table"); |