Viewing all changes in revision 159.
- Committer: Brian Aker
- Date: 2008-07-14 22:18:37 UTC
- mfrom: (77.1.96 codestyle)
- Revision ID: brian@tangent.org-20080714221837-oceoshx7fjkla9u3
Merge from Monty
- files added:
- client/sql_string.cc
- dbug
- include
- include/mysql
- files removed:
- client/errname.h
- drizzled/field
- drizzled/share/czech
- drizzled/share/danish
- drizzled/share/dutch
- drizzled/share/english
- drizzled/share/estonian
- drizzled/share/french
- drizzled/share/german
- drizzled/share/greek
- drizzled/share/hungarian
- drizzled/share/italian
- drizzled/share/japanese
- drizzled/share/japanese-sjis
- drizzled/share/korean
- drizzled/share/norwegian
- drizzled/share/norwegian-ny
- drizzled/share/polish
- drizzled/share/portuguese
- drizzled/share/romanian
- drizzled/share/russian
- drizzled/share/serbian
- drizzled/share/slovak
- drizzled/share/spanish
- drizzled/share/swedish
- drizzled/share/ukrainian
- plugin/crc32
- plugin/md5
- files renamed:
- client/completion_hash.c => client/completion_hash.cc
- client/drizzle.c => client/mysql.cc
- client/drizzleadmin.cc => client/mysqladmin.cc
- client/drizzlebinlog.cc => client/mysqlbinlog.cc
- client/drizzlecheck.c => client/mysqlcheck.c
- client/drizzledump.c => client/mysqldump.c
- client/drizzleimport.c => client/mysqlimport.c
- client/drizzletest.cc => client/mysqltest.cc
- client/readline.c => client/readline.cc
- mysys/base64.h => include/base64.h
- mystrings/decimal.h => include/decimal.h
- libdrizzle/drizzle.h => include/drizzle.h
- libdrizzle/drizzle_com.h => include/drizzle_com.h
- libdrizzle/drizzle_h.ic => include/drizzle_h.ic
- libdrizzle/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
- 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
- mysys/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
- libdrizzle/my_time.h => include/my_time.h
- mysys/my_tree.h => include/my_tree.h
- mystrings/my_uctype.h => include/my_uctype.h
- mystrings/my_xml.h => include/my_xml.h
- storage/myisam/myisam.h => include/myisam.h
- storage/myisam/myisammrg.h => include/myisammrg.h
- storage/myisam/myisampack.h => include/myisampack.h
- drizzled/plugin.h => include/mysql/plugin.h
- drizzled/plugin_audit.h => include/mysql/plugin_audit.h
- mysys/mysys_err.h => include/mysys_err.h
- mysys/queues.h => include/queues.h
- mysys/sha1.h => include/sha1.h
- libdrizzle/sql_common.h => include/sql_common.h
- mysys/thr_alarm.h => include/thr_alarm.h
- mysys/thr_lock.h => include/thr_lock.h
- mysys/typelib.h => include/typelib.h
- vio/violite.h => include/violite.h
- drizzled/ => server/
- mystrings/ => strings/
- tests/stress-test.pl => tests/drizzle-stress-test.pl *
- tests/test-run.pl => tests/drizzle-test-run.pl
- files modified:
- .bzrignore
expand all
collapse all
added
removed
