diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-05-09 11:26:48 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-05-09 11:26:48 +0200 |
| commit | d406a6478092e3ddab0146d2c05eeab3e1f30e6e (patch) | |
| tree | c55cad5b59f1ef669924fb93c59e60e283fe3974 /sql/tztime.h | |
| parent | 848611b5ed1e565d02eea896e22753b818c458c5 (diff) | |
| parent | 9ab5f6143e793c0afdd552f6c5e76912758df8fa (diff) | |
| download | mariadb-git-d406a6478092e3ddab0146d2c05eeab3e1f30e6e.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug10241
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
include/my_global.h:
Auto merged
sql/field.h:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_heap.h:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_myisam.h:
Auto merged
sql/ha_myisammrg.h:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.h:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.h:
Auto merged
sql/item_geofunc.h:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/item_subselect.h:
Auto merged
sql/item_sum.h:
Auto merged
BitKeeper/deleted/.del-ha_isam.h~bf53d533be3d3927:
Auto merged
BitKeeper/deleted/.del-ha_isammrg.h~66fd2e5bfe7207dc:
Auto merged
sql/examples/ha_archive.h:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/opt_range.h:
Auto merged
sql/procedure.h:
Auto merged
sql/protocol.h:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_string.h:
Auto merged
sql/sql_udf.h:
Auto merged
sql/tztime.h:
Auto merged
Diffstat (limited to 'sql/tztime.h')
| -rw-r--r-- | sql/tztime.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/tztime.h b/sql/tztime.h index 777e521d761..cbf359e8961 100644 --- a/sql/tztime.h +++ b/sql/tztime.h @@ -15,7 +15,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef __GNUC__ +#ifdef USE_PRAGMA_INTERFACE #pragma interface /* gcc class interface */ #endif |