~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to include/my_global.h

Committer: Brian Aker
Date: 2008-07-16 21:28:26 UTC
mfrom: (77.3.28 glibclient)
Revision ID: brian@tangent.org-20080716212826-p44t3u6v1zb0dmxg

Merge from Monty

files added:
config/ac-macros/glib-2.0.m4

files removed:
client/sql_string.cc

client/sql_string.h

storage/myisam/make-ccc

storage/myisam/mi_dbug.c

storage/myisam/mi_test1.c

storage/myisam/mi_test2.c

storage/myisam/mi_test3.c

storage/myisam/mi_test_all.in

storage/myisam/mi_test_all.res

storage/myisam/test_pack

files renamed:
client/completion_hash.cc => client/completion_hash.c

client/mysql.cc => client/drizzle.c

client/mysqladmin.cc => client/drizzleadmin.cc

client/mysqlbinlog.cc => client/drizzlebinlog.cc

client/mysqlcheck.c => client/drizzlecheck.c

client/mysqldump.c => client/drizzledump.c

client/mysqlimport.c => client/drizzleimport.c

client/mysqltest.cc => client/drizzletest.cc

client/readline.cc => client/readline.c

files modified:
client/Makefile.am

client/completion_hash.h

configure.ac

include/my_global.h

libdrizzle/my_time.c

mysys/my_getopt.c

server/Makefile.am

server/drizzled.cc

server/field.cc

server/item_timefunc.cc

server/log_event.cc

server/protocol.cc

server/rpl_mi.cc

server/slave.cc

server/sql_yacc.yy

storage/archive/Makefile.am

storage/blackhole/Makefile.am

storage/csv/Makefile.am

storage/heap/Makefile.am

storage/innobase/Makefile.am

storage/myisam/Makefile.am

storage/myisam/ha_myisam.cc

storage/myisam/mf_keycache.c

storage/myisam/mf_keycaches.c

storage/myisam/mi_cache.c

storage/myisam/mi_changed.c

storage/myisam/mi_check.c

storage/myisam/mi_close.c

storage/myisam/mi_create.c

storage/myisam/mi_delete.c

storage/myisam/mi_delete_all.c

storage/myisam/mi_delete_table.c

storage/myisam/mi_dynrec.c

storage/myisam/mi_extra.c

storage/myisam/mi_info.c

storage/myisam/mi_key.c

storage/myisam/mi_keycache.c

storage/myisam/mi_locking.c

storage/myisam/mi_log.c

storage/myisam/mi_open.c

storage/myisam/mi_packrec.c

storage/myisam/mi_page.c

storage/myisam/mi_panic.c

storage/myisam/mi_preload.c

storage/myisam/mi_range.c

storage/myisam/mi_rename.c

storage/myisam/mi_rfirst.c

storage/myisam/mi_rkey.c

storage/myisam/mi_rlast.c

storage/myisam/mi_rnext.c

storage/myisam/mi_rnext_same.c

storage/myisam/mi_rprev.c

storage/myisam/mi_rrnd.c

storage/myisam/mi_rsame.c

storage/myisam/mi_rsamepos.c

storage/myisam/mi_scan.c

storage/myisam/mi_search.c

storage/myisam/mi_statrec.c

storage/myisam/mi_unique.c

storage/myisam/mi_update.c

storage/myisam/mi_write.c

storage/myisam/my_pread.c

storage/myisam/myisamchk.c

storage/myisam/myisamdef.h

storage/myisam/myisamlog.c

storage/myisam/myisampack.c

storage/myisam/plug.in

storage/myisam/sort.c

strings/dtoa.c

tests/lib/mtr_process.pl

tests/test-run.pl

Show diffs side-by-side

added added

removed removed

include/my_global.h

1006

1007

#endif /* WORDS_BIGENDIAN */

1008

1009

/* sprintf does not always return the number of bytes :- */

1010

#ifdef SPRINTF_RETURNS_INT

1011

#define my_sprintf(buff,args) sprintf args

1012

#else

1013

#ifdef SPRINTF_RETURNS_PTR

1014

#define my_sprintf(buff,args) ((int)(sprintf args - buff))

1015

#else

1016

#define my_sprintf(buff,args) ((ulong) sprintf args, (ulong) strlen(buff))

1017

#endif

1018

#endif

1009

/* my_sprintf was here. RIP */

1019

1010

1020

1011

#if defined(HAVE_CHARSET_utf8mb3) || defined(HAVE_CHARSET_utf8mb4)

1021

1012

#define MYSQL_UNIVERSAL_CLIENT_CHARSET "utf8"

Older »