diff options
| author | unknown <monty@mysql.com> | 2005-06-06 14:36:21 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-06-06 14:36:21 +0300 |
| commit | 8ae95213fb10643cff2cd4e87a645f227c52815d (patch) | |
| tree | 111fb13a3d8c6cd0d9a22ef0c98e7d8892081661 /sql/sp_rcontext.cc | |
| parent | cdb905ead54b502d50bd86246939156c64556971 (diff) | |
| parent | 29f18223aaec312d214658ffc59694a0ab6be6d7 (diff) | |
| download | mariadb-git-8ae95213fb10643cff2cd4e87a645f227c52815d.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/sp_head.cc:
Auto merged
sql/sp_rcontext.cc:
Auto merged
Diffstat (limited to 'sql/sp_rcontext.cc')
| -rw-r--r-- | sql/sp_rcontext.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_rcontext.cc b/sql/sp_rcontext.cc index 0e8210301c1..6f2165539d7 100644 --- a/sql/sp_rcontext.cc +++ b/sql/sp_rcontext.cc @@ -14,6 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "mysql_priv.h" #ifdef USE_PRAGMA_IMPLEMENTATION #pragma implementation #endif @@ -22,7 +23,6 @@ #undef SAFEMALLOC /* Problems with threads */ #endif -#include "mysql_priv.h" #include "mysql.h" #include "sp_head.h" #include "sp_rcontext.h" |