Viewing all changes in revision 134.
- Committer: Brian Aker
- Date: 2008-07-11 17:17:17 UTC
- mfrom: (77.1.79 codestyle)
- Revision ID: brian@tangent.org-20080711171717-039qp03g93w70rlq
MergeÂ
- files added:
- INSTALL
- dbug
- include
- include/mysql
- mysys/tests
- server/share
- server/share/charsets
- strings/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
- tests/suite/parts
- tests/suite/parts/inc
- tests/suite/parts/r
- tests/suite/parts/t
- vio
- files removed:
- ABOUT-NLS
- drizzled/field
- drizzled/functions
- drizzled/serialize
- drizzled/util
- plugin/auth_pam
- plugin/compress
- plugin/crc32
- plugin/errmsg_stderr
- plugin/hello_world
- plugin/logging_query
- plugin/md5
- plugin/uncompress
- plugin/uncompressed_length
- po
- storage/innobase/handler
- storage/innobase/mysql-test
- storage/innobase/scripts
- tests/r/pbxt
- tests/suite/vcol
- tests/suite/vcol/inc
- tests/suite/vcol/r
- tests/suite/vcol/t
- files renamed:
- client/drizzle.cc => client/mysql.cc
- client/drizzleadmin.cc => client/mysqladmin.cc
- client/drizzlecheck.cc => client/mysqlcheck.c
- client/drizzledump.cc => client/mysqldump.c
- client/drizzleimport.cc => client/mysqlimport.c
- client/drizzleslap.cc => client/mysqlslap.c
- client/drizzletest.cc => client/mysqltest.cc
- m4/ => config/ac-macros/
- mysys/base64.h => include/base64.h
- mystrings/decimal.h => include/decimal.h
- libdrizzle/libdrizzle.h => include/drizzle.h
- drizzled/common.h => include/drizzle_com.h
- mysys/drizzle_time.h => include/drizzle_time.h
- libdrizzle/errmsg.h => include/errmsg.h
- mysys/hash.h => include/hash.h
- storage/heap/heap.h => include/heap.h
- storage/myisam/keycache.h => include/keycache.h
- mystrings/m_ctype.h => include/m_ctype.h
- mystrings/m_string.h => include/m_string.h
- mysys/my_alloc.h => include/my_alloc.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
- storage/myisam/my_handler.h => include/my_handler.h
- mysys/my_list.h => include/my_list.h
- mysys/my_nosys.h => include/my_nosys.h
- mysys/my_pthread.h => include/my_pthread.h
- mysys/my_sys.h => include/my_sys.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
- storage/myisam/myisam.h => include/myisam.h
- storage/myisam/myisampack.h => include/myisampack.h
- drizzled/plugin.h => include/mysql/plugin.h
- mysys/mysys_err.h => include/mysys_err.h
- mysys/queues.h => include/queues.h
- mysys/sha1.h => include/sha1.h
- mysys/thr_alarm.h => include/thr_alarm.h
- mysys/thr_lock.h => include/thr_lock.h
- mysys/typelib.h => include/typelib.h
- libdrizzle/vio.h => include/violite.h
- libdrizzle/libdrizzle.ver => libdrizzle/libdrizzle.ver.in
- mysys/my_time.cc => libdrizzle/my_time.c
- mysys/array.cc => mysys/array.c
- mysys/base64.cc => mysys/base64.c
- mysys/charset-def.cc => mysys/charset-def.c
- mysys/charset.cc => mysys/charset.c
- mysys/checksum.cc => mysys/checksum.c
- mysys/default.cc => mysys/default.c
- mysys/default_modify.cc => mysys/default_modify.c
- mysys/errors.cc => mysys/errors.c
- mysys/hash.cc => mysys/hash.c
- mysys/list.cc => mysys/list.c
- mysys/make-conf.cc => mysys/make-conf.c
- mysys/mf_arr_appstr.cc => mysys/mf_arr_appstr.c
- mysys/mf_cache.cc => mysys/mf_cache.c
- mysys/mf_dirname.cc => mysys/mf_dirname.c
- mysys/mf_fn_ext.cc => mysys/mf_fn_ext.c
- mysys/mf_format.cc => mysys/mf_format.c
- mysys/mf_getdate.cc => mysys/mf_getdate.c
- mysys/mf_iocache.cc => mysys/mf_iocache.c
- mysys/mf_iocache2.cc => mysys/mf_iocache2.c
- mysys/mf_loadpath.cc => mysys/mf_loadpath.c
- mysys/mf_pack.cc => mysys/mf_pack.c
- mysys/mf_path.cc => mysys/mf_path.c
- mysys/mf_qsort.cc => mysys/mf_qsort.c
- mysys/mf_qsort2.cc => mysys/mf_qsort2.c
- mysys/mf_radix.cc => mysys/mf_radix.c
- mysys/mf_same.cc => mysys/mf_same.c
- mysys/mf_sort.cc => mysys/mf_sort.c
- mysys/mf_tempdir.cc => mysys/mf_tempdir.c
- mysys/mf_tempfile.cc => mysys/mf_tempfile.c
- mysys/mf_unixpath.cc => mysys/mf_unixpath.c
- mysys/mf_util.cc => mysys/mf_util.c
- mysys/mf_wcomp.cc => mysys/mf_wcomp.c
- mysys/mulalloc.cc => mysys/mulalloc.c
- mysys/my_access.cc => mysys/my_access.c
- mysys/my_alloc.cc => mysys/my_alloc.c
- mysys/my_bit.cc => mysys/my_bit.c
- mysys/my_bitmap.cc => mysys/my_bitmap.c
- mysys/my_copy.cc => mysys/my_copy.c
- mysys/my_create.cc => mysys/my_create.c
- mysys/my_delete.cc => mysys/my_delete.c
- mysys/my_filename.cc => mysys/my_div.c
- mysys/my_dup.cc => mysys/my_dup.c
- mysys/my_error.cc => mysys/my_error.c
- mysys/my_file.cc => mysys/my_file.c
- mysys/my_fopen.cc => mysys/my_fopen.c
- mysys/my_fstream.cc => mysys/my_fstream.c
- mysys/my_gethwaddr.cc => mysys/my_gethwaddr.c
- mysys/my_getopt.cc => mysys/my_getopt.c
- mysys/my_getsystime.cc => mysys/my_getsystime.c
- mysys/my_getwd.cc => mysys/my_getwd.c
- storage/myisam/my_handler.c => mysys/my_handler.c
- storage/myisam/my_handler_errors.c => mysys/my_handler_errors.h
- mysys/my_init.cc => mysys/my_init.c
- mysys/my_lib.cc => mysys/my_lib.c
- mysys/my_malloc.cc => mysys/my_malloc.c
- mysys/my_messnc.cc => mysys/my_messnc.c
- mysys/my_mkdir.cc => mysys/my_mkdir.c
- mysys/my_once.cc => mysys/my_once.c
- mysys/my_open.cc => mysys/my_open.c
- mysys/my_quick.cc => mysys/my_quick.c
- mysys/my_read.cc => mysys/my_read.c
- mysys/my_realloc.cc => mysys/my_realloc.c
- mysys/my_redel.cc => mysys/my_redel.c
- mysys/my_rename.cc => mysys/my_rename.c
- mysys/my_seek.cc => mysys/my_seek.c
- mysys/my_sleep.cc => mysys/my_sleep.c
- mysys/my_static.cc => mysys/my_static.c
- mysys/my_symlink.cc => mysys/my_symlink.c
- mysys/my_symlink2.cc => mysys/my_symlink2.c
- mysys/my_sync.cc => mysys/my_sync.c
- mysys/my_thr_init.cc => mysys/my_thr_init.c
- mysys/my_write.cc => mysys/my_write.c
- mysys/ptr_cmp.cc => mysys/ptr_cmp.c
- mysys/queues.cc => mysys/queues.c
- mysys/sha1.cc => mysys/sha1.c
- mysys/test_charset.cc => mysys/test_charset.c
- mysys/test_dir.cc => mysys/test_dir.c
- mysys/test_fn.cc => mysys/test_fn.c
- mysys/thr_alarm.cc => mysys/thr_alarm.c
- mysys/thr_lock.cc => mysys/thr_lock.c
- mysys/thr_mutex.cc => mysys/thr_mutex.c
- mysys/thr_rwlock.cc => mysys/thr_rwlock.c
- mysys/tree.cc => mysys/tree.c
- mysys/typelib.cc => mysys/typelib.c
- drizzled/ => server/
- drizzled/server_includes.h => server/mysql_priv.h
- drizzled/sql_state.cc => server/sql_state.c
- drizzled/stacktrace.cc => server/stacktrace.c
- storage/innobase/drizzle/ => storage/innobase/handler/
- mystrings/ => strings/
- mystrings/bchange.cc => strings/bchange.c
- mystrings/bmove_upp.cc => strings/bmove_upp.c
- mystrings/ctype-bin.cc => strings/ctype-bin.c
- mystrings/ctype-extra.cc => strings/ctype-extra.c
- mystrings/ctype-mb.cc => strings/ctype-mb.c
- mystrings/ctype-simple.cc => strings/ctype-simple.c
- mystrings/ctype-uca.cc => strings/ctype-uca.c
- mystrings/ctype-utf8.cc => strings/ctype-utf8.c
- mystrings/ctype.cc => strings/ctype.c
- mystrings/decimal.cc => strings/decimal.c
- mystrings/dtoa.cc => strings/dtoa.c
- mystrings/int2str.cc => strings/int2str.c
- mystrings/is_prefix.cc => strings/is_prefix.c
- mystrings/llstr.cc => strings/llstr.c
- mystrings/longlong2str.cc => strings/longlong2str.c
- mystrings/my_strtoll10.cc => strings/my_strtoll10.c
- mystrings/str2int.cc => strings/str2int.c
- mystrings/str_alloc.cc => strings/str_alloc.c
- mystrings/strfill.cc => strings/strfill.c
- mystrings/strmake.cc => strings/strmake.c
- mystrings/stpcpy.cc => strings/strmov.c
- mystrings/stpncpy.cc => strings/strnmov.c
- mystrings/strto.cc => strings/strto.c
- mystrings/strxmov.cc => strings/strxmov.c
- tests/stress-test.pl => tests/drizzle-stress-test.pl *
- tests/test-run.pl => tests/drizzle-test-run.pl
- tests/r/drizzleslap.result => tests/r/mysqlslap.result
- tests/t/drizzleslap.test => tests/t/mysqlslap.test
- libdrizzle/vio.c => vio/vio.c
- libdrizzle/viosocket.c => vio/viosocket.c
- files modified:
- .bzrignore
expand all
collapse all
added
removed
