diff options
| author | unknown <igor@rurik.mysql.com> | 2004-02-19 01:09:54 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2004-02-19 01:09:54 -0800 |
| commit | f4353d48ccc39527540daf709a1167462b39738c (patch) | |
| tree | aa627335f475f099e0d352b39af4e24d6e1ac189 /netware/libmysql.imp | |
| parent | c88e5213d4f8acbbba33d293a9573042818f0aec (diff) | |
| parent | 9ce4695da0bfe74e840dcf708da10cac9740e137 (diff) | |
| download | mariadb-git-f4353d48ccc39527540daf709a1167462b39738c.tar.gz | |
Manual merge
mysql-test/r/func_test.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_row.cc:
Auto merged
sql/item_row.h:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_select.h:
Auto merged
Diffstat (limited to 'netware/libmysql.imp')
| -rw-r--r-- | netware/libmysql.imp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/netware/libmysql.imp b/netware/libmysql.imp index 75fcc8d1a99..977fb1b0b1f 100644 --- a/netware/libmysql.imp +++ b/netware/libmysql.imp @@ -77,7 +77,7 @@ mysql_thread_init, mysql_thread_safe,
mysql_use_result,
net_safe_read,
-simple_command,
+#simple_command, mysql_connect,
mysql_create_db,
mysql_drop_db,
|