Viewing all changes in revision 322.2.4.
- Committer: Mats Kindahl
- Date: 2008-08-25 19:11:53 UTC
- mto: (489.1.2 codestyle)
- mto: This revision was merged to the branch mainline in revision 372.
- Revision ID: mats@mysql.com-20080825191153-0nlkopg4qydnda4o
Post-merge fix to new code using THD:proc_info, which was made private by the pre-merge patch.
- files added:
- client/drizzlebinlog.cc
- drizzled/share
- drizzled/share/charsets
- vio
- files removed:
- drizzled/alter_column.h
- drizzled/functions
- drizzled/functions/str
- drizzled/functions/time
- drizzled/item
- drizzled/replication
- drizzled/util
- plugin/compress
- plugin/errmsg_stderr
- plugin/logging_query
- plugin/uncompress
- plugin/uncompressed_length
- 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/drizzleslap.cc => client/mysqlslap.c
- drizzled/cached_item.cc => drizzled/item_buff.cc
- drizzled/item/cmpfunc.cc => drizzled/item_cmpfunc.cc
- drizzled/item/cmpfunc.h => drizzled/item_cmpfunc.h
- drizzled/item/create.cc => drizzled/item_create.cc
- drizzled/item/create.h => drizzled/item_create.h
- drizzled/item/func.cc => drizzled/item_func.cc
- drizzled/item/func.h => drizzled/item_func.h
- drizzled/item/row.cc => drizzled/item_row.cc
- drizzled/item/row.h => drizzled/item_row.h
- drizzled/item/strfunc.cc => drizzled/item_strfunc.cc
- drizzled/item/strfunc.h => drizzled/item_strfunc.h
- drizzled/item/subselect.cc => drizzled/item_subselect.cc
- drizzled/item/subselect.h => drizzled/item_subselect.h
- drizzled/item/sum.cc => drizzled/item_sum.cc
- drizzled/item/sum.h => drizzled/item_sum.h
- drizzled/item/timefunc.cc => drizzled/item_timefunc.cc
- drizzled/item/timefunc.h => drizzled/item_timefunc.h
- drizzled/replication/constants.h => drizzled/rpl_constants.h
- drizzled/replication/filter.cc => drizzled/rpl_filter.cc
- drizzled/replication/filter.h => drizzled/rpl_filter.h
- drizzled/replication/mi.cc => drizzled/rpl_mi.cc
- drizzled/replication/mi.h => drizzled/rpl_mi.h
- drizzled/replication/record.cc => drizzled/rpl_record.cc
- drizzled/replication/record.h => drizzled/rpl_record.h
- drizzled/replication/reporting.cc => drizzled/rpl_reporting.cc
- drizzled/replication/reporting.h => drizzled/rpl_reporting.h
- drizzled/replication/rli.cc => drizzled/rpl_rli.cc
- drizzled/replication/rli.h => drizzled/rpl_rli.h
- drizzled/replication/tblmap.cc => drizzled/rpl_tblmap.cc
- drizzled/replication/tblmap.h => drizzled/rpl_tblmap.h
- drizzled/replication/utility.cc => drizzled/rpl_utility.cc
- drizzled/replication/utility.h => drizzled/rpl_utility.h
- drizzled/replication/binlog.cc => drizzled/sql_binlog.cc
- drizzled/session.cc => drizzled/sql_class.cc
- drizzled/session.h => drizzled/sql_class.h
- drizzled/db.cc => drizzled/sql_db.cc
- drizzled/rename.cc => drizzled/sql_rename.cc
- drizzled/replication/replication.cc => drizzled/sql_repl.cc
- drizzled/replication/replication.h => drizzled/sql_repl.h
- drizzled/show.cc => drizzled/sql_show.cc
- drizzled/sql_state.cc => drizzled/sql_state.c
- drizzled/stacktrace.cc => drizzled/stacktrace.c
- extra/my_print_defaults.cc => extra/my_print_defaults.c
- extra/mysql_waitpid.cc => extra/mysql_waitpid.c
- libdrizzle/libdrizzle.h => libdrizzle/drizzle.h
- drizzled/common.h => libdrizzle/drizzle_com.h
- mysys/drizzle_time.h => libdrizzle/drizzle_time.h
- drizzled/gettext.h => libdrizzle/gettext.h
- mysys/my_time.cc => libdrizzle/my_time.c
- mysys/my_time.h => libdrizzle/my_time.h
- mystrings/bchange.cc => mystrings/bchange.c
- mystrings/bmove_upp.cc => mystrings/bmove_upp.c
- mystrings/ctype-bin.cc => mystrings/ctype-bin.c
- mystrings/ctype-extra.cc => mystrings/ctype-extra.c
- mystrings/ctype-mb.cc => mystrings/ctype-mb.c
- mystrings/ctype-simple.cc => mystrings/ctype-simple.c
- mystrings/ctype-uca.cc => mystrings/ctype-uca.c
- mystrings/ctype-utf8.cc => mystrings/ctype-utf8.c
- mystrings/ctype.cc => mystrings/ctype.c
- mystrings/decimal.cc => mystrings/decimal.c
- mystrings/dtoa.cc => mystrings/dtoa.c
- mystrings/int2str.cc => mystrings/int2str.c
- mystrings/is_prefix.cc => mystrings/is_prefix.c
- mystrings/llstr.cc => mystrings/llstr.c
- mystrings/longlong2str.cc => mystrings/longlong2str.c
- mystrings/my_strtoll10.cc => mystrings/my_strtoll10.c
- mystrings/stpcpy.cc => mystrings/stpcpy.c
- mystrings/stpncpy.cc => mystrings/stpncpy.c
- mystrings/str2int.cc => mystrings/str2int.c
- mystrings/str_alloc.cc => mystrings/str_alloc.c
- mystrings/strfill.cc => mystrings/strfill.c
- mystrings/strmake.cc => mystrings/strmake.c
- mystrings/strto.cc => mystrings/strto.c
- mystrings/strxmov.cc => mystrings/strxmov.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_dup.cc => mysys/my_dup.c
- mysys/my_error.cc => mysys/my_error.c
- mysys/my_file.cc => mysys/my_file.c
- mysys/my_filename.cc => mysys/my_filename.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
- storage/myisam/my_handler.c => mysys/my_handler.c
- storage/myisam/my_handler.h => mysys/my_handler.h
- 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
- storage/archive/azio.cc => storage/archive/azio.c
- storage/innobase/drizzle/ => storage/innobase/handler/
- storage/myisam/myisamchk.cc => storage/myisam/myisamchk.c
- tests/r/drizzleslap.result => tests/r/mysqlslap.result
- tests/resolve_stack_dump.cc => tests/resolve_stack_dump.c
- tests/t/drizzleslap.test => tests/t/mysqlslap.test
- libdrizzle/vio.c => vio/vio.c
- libdrizzle/vio.h => vio/violite.h
- libdrizzle/viosocket.c => vio/viosocket.c
- files modified:
- .bzrignore
expand all
collapse all
added
removed
