diff options
author | unknown <gkodinov@dl145s.mysql.com> | 2006-11-29 15:21:28 +0100 |
---|---|---|
committer | unknown <gkodinov@dl145s.mysql.com> | 2006-11-29 15:21:28 +0100 |
commit | 90578ce767ed8419c0014aa3175e3f6e58a60128 (patch) | |
tree | e5a5f3cfe1fd04961923f4d1b6742a81eb6ef226 /sql/table.cc | |
parent | 004aadd6f716e2bdd055a2518b50bd8d13e961e8 (diff) | |
parent | 867fc51c5d9227f8f2892d11b98becfa508baba7 (diff) | |
download | mariadb-git-90578ce767ed8419c0014aa3175e3f6e58a60128.tar.gz |
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt
mysql-test/t/view_grant.test:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/table.cc')
-rw-r--r-- | sql/table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 6bc43e48110..dfcf19907c8 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -88,7 +88,7 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat, MEM_ROOT **root_ptr, *old_root; TABLE_SHARE *share; DBUG_ENTER("openfrm"); - DBUG_PRINT("enter",("name: '%s' form: 0x%lx",name,outparam)); + DBUG_PRINT("enter",("name: '%s' form: 0x%lx", name, (long) outparam)); error= 1; disk_buff= NULL; |