mariadb/include
unknown 6e5abcaf03 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


Makefile.am:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2007-04-23 13:28:09 +02:00
..
atomic
mysql
.cvsignore
base64.h
config-netware.h
config-win.h
decimal.h
errmsg.h Added more descriptive error message of why statement was automaticly dropped 2007-04-13 01:56:22 +03:00
ft_global.h
hash.h
heap.h
help_end.h
help_start.h
keycache.h
m_ctype.h
m_string.h
Makefile.am Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508 2007-04-11 09:34:02 +02:00
md5.h
my_aes.h
my_alarm.h
my_alloc.h
my_atomic.h
my_base.h Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 2007-04-05 08:39:12 +02:00
my_bitmap.h
my_dbug.h
my_dir.h
my_getopt.h
my_global.h Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 2007-04-18 14:18:55 +02:00
my_handler.h
my_libwrap.h
my_list.h
my_net.h
my_no_pthread.h
my_nosys.h
my_pthread.h
my_sys.h
my_time.h Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-10 16:28:47 +03: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
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