mariadb/client
unknown 4a9edcc32c Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
client/mysqltest.c:
  Auto merged
extra/comp_err.c:
  Auto merged
include/my_time.h:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
client/mysql_upgrade.c:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge
mysql-test/r/ctype_cp932.result:
  Manual merge
mysql-test/r/mysqlbinlog.result:
  Manual merge
mysql-test/t/ctype_cp932.test:
  Manual merge
mysql-test/t/mysql.test:
  Manual merge
mysql-test/t/mysqlbinlog.test:
  Manual merge
2007-03-01 18:12:56 +01:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
client_priv.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
CMakeLists.txt Add echo.c to be built on Windows 2007-02-16 15:25:49 +01:00
completion_hash.cc Many files: 2006-12-23 20:17:15 +01:00
completion_hash.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
echo.c Workaround for problem where cygwin's bash/sh randomly fails with error 128 which 2007-02-16 15:19:38 +01:00
get_password.c Many files: 2006-12-23 20:17:15 +01:00
Makefile.am Add echo.c as EXTRA_DIST file 2007-02-19 13:21:06 +01:00
my_readline.h Many files: 2006-12-23 20:17:15 +01:00
mysql.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-02-21 14:07:08 +02:00
mysql_upgrade.c Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 2007-03-01 18:12:56 +01:00
mysqladmin.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mysqlbinlog.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-22 14:04:40 +02:00
mysqlcheck.c Many files: 2006-12-23 20:17:15 +01:00
mysqldump.c Fixed compiler warnings (for linux and win32 and win64) 2007-02-22 16:59:57 +02:00
mysqlimport.c my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mysqlmanager-pwgen.c Many files: 2006-12-23 20:17:15 +01:00
mysqlmanagerc.c Many files: 2006-12-23 20:17:15 +01:00
mysqlshow.c my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mysqltest.c Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 2007-03-01 18:12:56 +01:00
readline.cc Many files: 2006-12-23 20:17:15 +01:00
sql_string.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-22 14:04:40 +02:00
sql_string.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-22 14:04:40 +02:00