diff options
| author | unknown <monty@mysql.com> | 2004-03-18 14:53:38 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-18 14:53:38 +0200 |
| commit | 5b624042b86fc7661fcfebea24e60426e1ebcd81 (patch) | |
| tree | 1aa4a724b10969054f71296f6c52b946d7fb468d /libmysqld | |
| parent | 93ca1bfac6d5607cba6775e20e8f302ad0faf9b8 (diff) | |
| download | mariadb-git-5b624042b86fc7661fcfebea24e60426e1ebcd81.tar.gz | |
Removed compiler warning
Changed _XXX to _MY_XXX to solve conflict problem on Mac OS X
include/m_ctype.h:
Changed _XXX to _MY_XXX to solve conflict problem on Mac OS X
include/mysql.h:
Removed compiler warning
libmysqld/lib_sql.cc:
Removed compiler warning
mysys/charset2html.c:
Changed _XXX to _MY_XXX to solve conflict problem on Mac OS X
regex/regcomp.c:
Changed _XXX to _MY_XXX to solve conflict problem on Mac OS X
sql-common/client.c:
Indentation fix
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 9c837219e71..83bd9d5f52b 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -246,7 +246,7 @@ static MYSQL_RES * emb_mysql_store_result(MYSQL *mysql) return mysql_store_result(mysql); } -int emb_next_result(MYSQL *mysql) +my_bool emb_next_result(MYSQL *mysql) { THD *thd= (THD*)mysql->thd; DBUG_ENTER("emb_next_result"); |