diff options
| author | unknown <venu@myvenu.com> | 2002-11-22 10:20:14 -0800 |
|---|---|---|
| committer | unknown <venu@myvenu.com> | 2002-11-22 10:20:14 -0800 |
| commit | bd6df955e327b52b393f4a6f7fd61c2ed9751a85 (patch) | |
| tree | 1db1bf4593b745f0c12c8cb09b5934c136c3e073 /sql/mysql_priv.h | |
| parent | 1049175831a4aa145f64e912388cc6079d7f5789 (diff) | |
| parent | 7eafe60b3641e3d1c9067181bce7f465cfc742e8 (diff) | |
| download | mariadb-git-bd6df955e327b52b393f4a6f7fd61c2ed9751a85.tar.gz | |
protocol merge
libmysql/errmsg.c:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_error.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 058e6b4ee95..3ba88d493bd 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -512,7 +512,7 @@ int mysqld_show_column_types(THD *thd); int mysqld_help (THD *thd, const char *text); /* sql_prepare.cc */ -int compare_prep_stmt(PREP_STMT *a, PREP_STMT *b, void *not_used); +int compare_prep_stmt(void *not_used, PREP_STMT *stmt, ulong *key); void free_prep_stmt(PREP_STMT *stmt, TREE_FREE mode, void *not_used); bool mysql_stmt_prepare(THD *thd, char *packet, uint packet_length); void mysql_stmt_execute(THD *thd, char *packet); |