diff options
| author | unknown <igor@rurik.mysql.com> | 2005-12-10 23:31:03 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-12-10 23:31:03 -0800 |
| commit | 544ae455a4d7f5c0a9ef9209c7857464559c8cae (patch) | |
| tree | 6b4057c32ab656cc8492feed92caa812a84d4f76 /sql/sql_class.h | |
| parent | e5b1f3cec0a6aa51deb71be8e010f6159f25f22b (diff) | |
| parent | 81c274d9089698e3c4cb1ba3cb65b70475ebbf16 (diff) | |
| download | mariadb-git-544ae455a4d7f5c0a9ef9209c7857464559c8cae.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
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; |