mariadb/extra
unknown 49e1bba346 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


extra/perror.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
BitKeeper/deleted/.del-var~62c955ccf2da1a21:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.hpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged
2005-07-20 07:53:10 +02:00
..
yassl WL#2286 - Compile MySQL w/YASSL support 2005-07-01 20:00:59 +05:00
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
charset2html.c dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features 2004-11-04 22:29:00 +01:00
comp_err.c Remove compiler warnings and remove not used variables 2005-02-25 16:53:22 +02:00
Makefile.am Merge 2005-07-06 00:06:11 +02:00
my_print_defaults.c Cleanups during review 2005-07-18 15:33:18 +03:00
mysql_waitpid.c Added global my_getopt_error_reporter function pointer which is 2004-08-31 21:27:58 +05:00
perror.c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-07-20 07:53:10 +02:00
replace.c Cleanups during review 2005-07-18 15:33:18 +03:00
resolve_stack_dump.c Applied a patch for Netware. 2005-02-08 19:49:40 +02:00
resolveip.c Merge with 4.0 2004-09-01 04:12:09 +03:00