mariadb/mysys
unknown bb48472601 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
libmysqld/CMakeLists.txt:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/rpl_injector.cc:
  Auto merged
sql/rpl_injector.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_locale.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
unittest/mysys/my_atomic-t.c:
  Auto merged
sql/log_event.cc:
  Manual merge main->rpl
sql/mysqld.cc:
  Manual merge main->rpl
2007-01-12 12:31:44 +01:00
..
.cvsignore
array.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
base64.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
ChangeLog Fix skipp -> skip once and for all. 2004-06-03 11:52:54 -05:00
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 mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +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 Many files: 2006-12-23 20:17:15 +01:00
mf_iocache2.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
mf_keycache.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01: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 Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01: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 Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01: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 Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01: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 mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01: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 mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +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 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-01-12 12:31:44 +01:00
my_vle.c Many files: 2006-12-31 02:29:11 +01:00
my_wincond.c Many files: 2006-12-23 20:17:15 +01:00
my_windac.c Many files: 2006-12-23 20:17:15 +01:00
my_winsem.c Added support for semaphores in mysys. 2002-06-29 00:16:15 +03:00
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 Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01: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 my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
string.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01: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 Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
thr_lock.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
thr_mutex.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01: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 Many files: 2006-12-23 20:17:15 +01:00