Viewing all changes in revision 225.
- Committer: brian
- Date: 2008-07-26 22:42:45 UTC
- mfrom: (224.1.1 codestyle)
- Revision ID: brian@localhost.localdomain-20080726224245-chvo0pr016xwe6zk
Merge from Monty
- files added:
- drizzled/add_errmsg
- drizzled/share
- drizzled/share/charsets
- include
- mystrings/tests
- mysys/tests
- tests/suite/funcs_1
- tests/suite/funcs_1/bitdata
- tests/suite/funcs_1/data
- tests/suite/funcs_1/datadict
- tests/suite/funcs_1/include
- tests/suite/funcs_1/lib
- tests/suite/funcs_1/r
- tests/suite/funcs_1/storedproc
- tests/suite/funcs_1/t
- tests/suite/funcs_2
- tests/suite/funcs_2/charset
- tests/suite/funcs_2/data
- tests/suite/funcs_2/include
- tests/suite/funcs_2/lib
- tests/suite/funcs_2/r
- tests/suite/funcs_2/t
- files removed:
- ABOUT-NLS
- drizzled/serialize
- plugin/auth_pam
- po
- files renamed:
- client/completion_hash.cc => client/completion_hash.c
- client/drizzle.cc => client/drizzle.c
- client/drizzlecheck.cc => client/drizzlecheck.c
- client/drizzledump.cc => client/drizzledump.c
- client/drizzleimport.cc => client/drizzleimport.c
- client/drizzleslap.cc => client/mysqlslap.c
- client/readline.cc => client/readline.c
- m4/ => config/ac-macros/
- drizzled/server_includes.h => drizzled/mysql_priv.h
- libdrizzle/drizzle.h => include/drizzle.h
- libdrizzle/drizzle_com.h => include/drizzle_com.h
- mysys/drizzle_time.h => include/drizzle_time.h
- drizzled/version.h.in => include/drizzle_version.h.in
- libdrizzle/errmsg.h => include/errmsg.h
- mysys/hash.h => include/hash.h
- mystrings/m_ctype.h => include/m_ctype.h
- mystrings/m_string.h => include/m_string.h
- drizzled/base.h => include/my_base.h
- mysys/my_bit.h => include/my_bit.h
- mysys/my_bitmap.h => include/my_bitmap.h
- mysys/my_dir.h => include/my_dir.h
- mysys/my_getopt.h => include/my_getopt.h
- drizzled/global.h => include/my_global.h
- mysys/my_handler.h => include/my_handler.h
- mysys/my_list.h => include/my_list.h
- mysys/my_time.h => include/my_time.h
- mysys/my_tree.h => include/my_tree.h
- mystrings/my_uctype.h => include/my_uctype.h
- mysys/queues.h => include/queues.h
- libdrizzle/sql_common.h => include/sql_common.h
- mysys/typelib.h => include/typelib.h
- libdrizzle/libdrizzle.ver => libdrizzle/libdrizzle.ver.in
- mysys/my_time.c => libdrizzle/my_time.c
- mystrings/stpcpy.c => mystrings/strmov.c
- mystrings/stpncpy.c => mystrings/strnmov.c
- mysys/my_filename.c => mysys/my_div.c
- tests/r/drizzleslap.result => tests/r/mysqlslap.result
- tests/t/drizzleslap.test => tests/t/mysqlslap.test
- files modified:
- .bzrignore
- tests/r/ctype_eucjpms.result *
expand all
collapse all
added
removed
