summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authorigor@rurik.mysql.com <>2005-12-10 23:31:03 -0800
committerigor@rurik.mysql.com <>2005-12-10 23:31:03 -0800
commitad53d7203314ed859b8101bc9b089db8c7453e9a (patch)
tree6b4057c32ab656cc8492feed92caa812a84d4f76 /sql/sql_class.h
parent09e6597015d432e07bc14aefb61b60236d797b40 (diff)
parentc8000f437d2e18006e82e305eb1db880f618045f (diff)
downloadmariadb-git-ad53d7203314ed859b8101bc9b089db8c7453e9a.tar.gz
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index dce78281adb..81cf4185e7e 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -2087,7 +2087,7 @@ public:
Routine to which this Item_splocal belongs. Used for checking if correct
runtime context is used for variable handling.
*/
- sp_head *owner;
+ sp_head *sp;
#endif
bool local;
uint offset;