mariadb/include
unknown 711cf7503d Merge mysql.com:/home/gluh/MySQL/Merge/5.1
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/events_bugs.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/select.result:
  manual merge
mysql-test/t/select.test:
  manual merge
2007-11-14 17:30:16 +04:00
..
atomic
mysql
.cvsignore
base64.h
config-netware.h
config-win.h
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
my_aes.h
my_alarm.h
my_alloc.h
my_atomic.h
my_attribute.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_md5.h
my_net.h
my_no_pthread.h
my_nosys.h
my_pthread.h
my_sys.h
my_time.h
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
mysql_embed.h
mysql_h.ic
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