Viewing all changes in revision 51.1.57.
- Committer: Jay Pipes
- Date: 2008-07-10 15:13:58 UTC
- mfrom: (127 drizzle)
- mto: (77.3.26 glibclient) (51.3.4 remove-dbug)
- mto: This revision was merged to the branch mainline in revision 129.
- Revision ID: jay@mysql.com-20080710151358-go4jpxhebp3rjpat
Merging mainline
- 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
- files removed:
- ABOUT-NLS
- drizzled/field
- drizzled/functions
- drizzled/serialize
- drizzled/util
- plugin/auth_pam
- plugin/compress
- plugin/crc32
- plugin/hello_world
- plugin/logging_query
- plugin/md5
- plugin/uncompress
- plugin/uncompressed_length
- po
- 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
- 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
- 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
- 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
- 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
- libdrizzle/libdrizzle.ver => libdrizzle/libdrizzle.ver.in
- mysys/my_time.c => libdrizzle/my_time.c
- mysys/my_filename.c => mysys/my_div.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
- mystrings/ => strings/
- mystrings/stpcpy.c => strings/strmov.c
- mystrings/stpncpy.c => strings/strnmov.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
- files modified:
- .bzrignore
expand all
collapse all
added
removed
