mariadb/client
unknown c97f7e7cb9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


include/my_global.h:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/mysqladmin.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysqlbug.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
Makefile.am:
  manual merge
mysql-test/t/trigger.test:
  manual merge
strings/ctype-extra.c:
  manual merge
2007-01-11 09:43:44 -05: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 my_strtoll10-x86.s: 2006-12-31 01:02:27 +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
get_password.c Many files: 2006-12-23 20:17:15 +01:00
Makefile.am my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
my_readline.h Many files: 2006-12-23 20:17:15 +01:00
mysql.cc Many files: 2006-12-23 20:17:15 +01:00
mysql_upgrade.c Merge trift2.:/MySQL/M50/mysql-5.0 2006-12-28 18:22:43 +01:00
mysqladmin.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mysqlbinlog.cc Merge siva.hindu.god:/usr/home/tim/m/bk/g50 2006-12-26 22:28:28 -07:00
mysqlcheck.c Many files: 2006-12-23 20:17:15 +01:00
mysqldump.c Many files: 2006-12-23 20:17:15 +01: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 siva.hindu.god:/usr/home/tim/m/bk/g50 2006-12-26 22:28:28 -07:00
readline.cc Many files: 2006-12-23 20:17:15 +01:00
sql_string.cc Many files: 2006-12-23 20:17:15 +01:00
sql_string.h Many files: 2006-12-23 20:17:15 +01:00