diff options
| author | unknown <tsmith@quadxeon.mysql.com> | 2007-04-04 11:05:22 +0200 |
|---|---|---|
| committer | unknown <tsmith@quadxeon.mysql.com> | 2007-04-04 11:05:22 +0200 |
| commit | 05840a57907f456ce39c56025daf08fd5be206b1 (patch) | |
| tree | f961771d4abd90dd7fd967252d569be1370fc4af /sql/sp_head.h | |
| parent | 73fb1aed614d77539debaa0c2f4445d09b6af010 (diff) | |
| parent | 65e5af7b7f8838c224d466ed0cd50440bc146ebc (diff) | |
| download | mariadb-git-05840a57907f456ce39c56025daf08fd5be206b1.tar.gz | |
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/51
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index 10a8583571c..90b937b9161 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -128,7 +128,7 @@ public: create_field m_return_field_def; /* This is used for FUNCTIONs only. */ - const uchar *m_tmp_query; // Temporary pointer to sub query string + const char *m_tmp_query; // Temporary pointer to sub query string st_sp_chistics *m_chistics; ulong m_sql_mode; // For SHOW CREATE and execution LEX_STRING m_qname; // db.name @@ -176,7 +176,7 @@ public: */ HASH m_sroutines; // Pointers set during parsing - const uchar *m_param_begin, *m_param_end, *m_body_begin; + const char *m_param_begin, *m_param_end, *m_body_begin; /* Security context for stored routine which should be run under |