mariadb/mysys
unknown c155c66da6 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


mysql-test/t/disabled.def:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/show_check.result:
  Manual merge.
mysql-test/t/show_check.test:
  Manual merge.
2007-03-06 16:44:14 +03:00
..
.cvsignore
array.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
base64.c Fixed compiler warnings 2007-02-23 13:13:55 +02:00
ChangeLog
charset-def.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
charset.c Many files: 2006-12-23 20:17:15 +01:00
checksum.c Many files: 2006-12-23 20:17:15 +01:00
CMakeLists.txt Many files: 2006-12-31 02:29:11 +01:00
default.c Merge chilla.local:/home/mydev/mysql-4.0-axmrg 2007-02-01 08:09:36 +01:00
default_modify.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
errors.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
hash.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
list.c Many files: 2006-12-23 20:17:15 +01:00
make-ccc Remove unused (and incorrect) my_lread() and my_lwrite() 2006-09-14 23:29:44 -06:00
make-conf.c Many files: 2006-12-23 20:17:15 +01:00
Makefile.am Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
md5.c Many files: 2006-12-23 20:17:15 +01:00
mf_brkhant.c Many files: 2006-12-23 20:17:15 +01:00
mf_cache.c Many files: 2006-12-23 20:17:15 +01:00
mf_dirname.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
mf_fn_ext.c Many files: 2006-12-23 20:17:15 +01:00
mf_format.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
mf_getdate.c Many files: 2006-12-23 20:17:15 +01:00
mf_iocache.c Bug#25807: LOAD DATA INFILE does not work with Pipes 2007-02-13 16:35:29 -05:00
mf_iocache2.c Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-02-24 11:52:08 +01:00
mf_keycache.c Fixed compiler warnings 2007-02-23 13:13:55 +02:00
mf_keycaches.c Many files: 2006-12-23 20:17:15 +01:00
mf_loadpath.c Many files: 2006-12-23 20:17:15 +01:00
mf_pack.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
mf_path.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
mf_qsort.c Many files: 2006-12-23 20:17:15 +01:00
mf_qsort2.c Many files: 2006-12-23 20:17:15 +01:00
mf_radix.c Many files: 2006-12-23 20:17:15 +01:00
mf_same.c Many files: 2006-12-23 20:17:15 +01:00
mf_sort.c Many files: 2006-12-23 20:17:15 +01:00
mf_soundex.c Many files: 2006-12-23 20:17:15 +01:00
mf_strip.c Many files: 2006-12-23 20:17:15 +01:00
mf_tempdir.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
mf_tempfile.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
mf_unixpath.c Many files: 2006-12-23 20:17:15 +01:00
mf_util.c Many files: 2006-12-23 20:17:15 +01:00
mf_wcomp.c Many files: 2006-12-23 20:17:15 +01:00
mf_wfile.c Many files: 2006-12-23 20:17:15 +01:00
mulalloc.c Many files: 2006-12-23 20:17:15 +01:00
my_access.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_aes.c my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
my_alarm.c Many files: 2006-12-23 20:17:15 +01:00
my_alloc.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_append.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_atomic.c Many files: 2006-12-27 02:23:51 +01:00
my_bit.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_bitmap.c After merge fixes 2007-01-29 01:47:35 +02:00
my_chsize.c Many files: 2006-12-23 20:17:15 +01:00
my_clock.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_compress.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_conio.c Many files: 2006-12-23 20:17:15 +01:00
my_copy.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_crc32.c Many files: 2006-12-23 20:17:15 +01:00
my_create.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_delete.c Many files: 2006-12-23 20:17:15 +01:00
my_div.c Many files: 2006-12-23 20:17:15 +01:00
my_dup.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_error.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_file.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_fopen.c Many files: 2006-12-23 20:17:15 +01:00
my_fstream.c Many files: 2006-12-23 20:17:15 +01:00
my_gethostbyname.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
my_gethwaddr.c my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
my_getncpus.c Many files: 2006-12-27 02:23:51 +01:00
my_getopt.c Fixed compiler warnings 2007-02-23 13:13:55 +02:00
my_getpagesize.c Many files: 2006-12-23 20:17:15 +01:00
my_getsystime.c my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
my_getwd.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_handler.c my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
my_init.c Fixed compiler warnings 2007-02-23 13:13:55 +02:00
my_largepage.c Many files: 2006-12-23 20:17:15 +01:00
my_lib.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_libwrap.c Many files: 2006-12-23 20:17:15 +01:00
my_lock.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_lockmem.c Many files: 2006-12-23 20:17:15 +01:00
my_malloc.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_memmem.c Many files: 2006-12-27 02:23:51 +01:00
my_messnc.c Many files: 2006-12-23 20:17:15 +01:00
my_mkdir.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_mmap.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_net.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_netware.c Many files: 2006-12-23 20:17:15 +01:00
my_new.cc Many files: 2006-12-23 20:17:15 +01:00
my_once.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_open.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_port.c my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
my_pread.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_pthread.c Merge olga.mysql.com:/home/igor/mysql-5.0-opt 2007-02-13 01:34:36 -08:00
my_quick.c Many files: 2006-12-23 20:17:15 +01:00
my_read.c Many files: 2006-12-23 20:17:15 +01:00
my_realloc.c Many files: 2006-12-23 20:17:15 +01:00
my_redel.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_rename.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_seek.c Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint 2007-01-11 15:16:33 +01:00
my_semaphore.c my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
my_sleep.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_static.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_static.h Many files: 2006-12-23 20:17:15 +01:00
my_symlink.c Many files: 2006-12-23 20:17:15 +01:00
my_symlink2.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_sync.c Many files: 2006-12-23 20:17:15 +01:00
my_thr_init.c Fixed compiler warnings 2007-02-23 13:13:55 +02:00
my_vle.c Many files: 2006-12-31 02:29:11 +01:00
my_wincond.c Bug#25042 OPTIMIZE TABLE cause race condition in IO CACHE SHARE 2007-02-15 14:08:21 +01:00
my_windac.c Many files: 2006-12-23 20:17:15 +01:00
my_winsem.c
my_winthread.c Many files: 2006-12-23 20:17:15 +01:00
my_write.c Many files: 2006-12-23 20:17:15 +01:00
mysys_priv.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
ptr_cmp.c Fixed compiler warnings 2007-02-23 13:13:55 +02:00
queues.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
rijndael.c my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
safemalloc.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
sha1.c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-22 14:04:40 +02:00
string.c Merge recycle.(none):/src/bug22807/my50-bug22807 2007-01-19 13:20:52 -05:00
test_charset.c Many files: 2006-12-23 20:17:15 +01:00
test_dir.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
test_fn.c Many files: 2006-12-23 20:17:15 +01:00
test_xml.c Many files: 2006-12-23 20:17:15 +01:00
testhash.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
thr_alarm.c Fixed compiler warnings 2007-02-23 13:13:55 +02:00
thr_lock.c Fixed compiler warnings 2007-02-23 13:13:55 +02:00
thr_mutex.c Fixed compiler warnings 2007-02-23 13:13:55 +02:00
thr_rwlock.c Many files: 2006-12-23 20:17:15 +01:00
tree.c Many files: 2006-12-23 20:17:15 +01:00
trie.c Many files: 2006-12-27 02:23:51 +01:00
typelib.c Merge siva.hindu.god:/usr/home/tim/m/bk/g50 2006-12-26 22:28:28 -07:00