diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2008-05-15 19:45:42 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2008-05-15 19:45:42 -0400 |
| commit | 9906138343428c9ab1f9fc2f17490bb06ca2ac58 (patch) | |
| tree | e0367d45ae9e212b5fc86960272efd604d3e35e4 /sql/sp_head.h | |
| parent | 496ec47d220591453163cc303fd9bea569991e51 (diff) | |
| parent | 55012e427bc4b3b6a5ffa070e229c519c8cd0b98 (diff) | |
| download | mariadb-git-9906138343428c9ab1f9fc2f17490bb06ca2ac58.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my50-bug36570
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570
BitKeeper/deleted/.del-binlog_innodb.result:
Auto merged
sql/sp_head.cc:
Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
need to re-record.
mysql-test/suite/rpl/r/rpl_sp.result:
need to re-record.
mysql-test/r/mysqlbinlog.result:
manual merge.
mysql-test/suite/rpl/t/rpl_sp.test:
manual merge.
sql/sp.cc:
manual merge.
sql/sp_head.h:
manual merge.
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index 8d7062740c8..3d7597e2402 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -180,6 +180,7 @@ public: st_sp_chistics *m_chistics; ulong m_sql_mode; ///< For SHOW CREATE and execution LEX_STRING m_qname; ///< db.name + bool m_explicit_name; ///< Prepend the db name? */ /** Key representing routine in the set of stored routines used by statement. [routine_type]db.name |