mariadb/include
unknown 5f10ffd064 Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into  mysql.com:/home/gluh/MySQL/Merge/5.1


include/mysql_com.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sp.cc:
  manual merge
sql/sp_head.cc:
  manual merge
sql/sql_class.h:
  manual merge
sql/table.cc:
  manual merge
2006-09-28 14:09:31 +05:00
..
atomic
mysql
.cvsignore
base64.h
config-netware.h
config-win.h Windows 64bit fixes 2006-09-21 15:19:20 +02:00
decimal.h
errmsg.h
ft_global.h
hash.h
heap.h
help_end.h
help_start.h
keycache.h
m_ctype.h
m_string.h
Makefile.am
md5.h
my_aes.h
my_alarm.h
my_alloc.h
my_atomic.h
my_base.h
my_bitmap.h
my_dbug.h
my_dir.h
my_getopt.h
my_global.h
my_handler.h
my_libwrap.h
my_list.h
my_net.h
my_no_pthread.h
my_nosys.h
my_pthread.h
my_semaphore.h
my_sys.h
my_time.h Windows 64bit fixes 2006-09-21 15:19:20 +02:00
my_tree.h
my_trie.h
my_uctype.h
my_user.h
my_vle.h
my_xml.h
myisam.h
myisammrg.h
myisampack.h
mysql.h
mysql_com.h Merge mysql.com:/home/gluh/MySQL/Merge/5.0 2006-09-28 14:09:31 +05:00
mysql_embed.h
mysql_time.h
mysql_version.h.in
mysys_err.h
queues.h
rijndael.h
sha1.h
sql_common.h
sslopt-case.h
sslopt-longopts.h
sslopt-vars.h
t_ctype.h
thr_alarm.h
thr_lock.h
typelib.h
violite.h