mariadb/libmysql
unknown 64b075e677 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51


BUILD/check-cpu:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqladmin.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
mysys/my_read.c:
  Auto merged
mysys/my_seek.c:
  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/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
Makefile.am:
  Use local
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Use local
sql/mysqld.cc:
  Use local
strings/ctype-extra.c:
  SCCS merged
2007-01-18 08:41:52 -07:00
..
.cvsignore
acinclude.m4
client_settings.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
CMakeLists.txt Many files: 2006-12-31 02:29:11 +01:00
conf_to_src.c manually merged 2004-08-18 19:57:55 +02:00
dll.c Final patch to remove the last of the OS2 support. 2006-04-15 18:17:32 -07:00
errmsg.c Added some missing DBUG_RETURN 2006-11-23 16:41:21 +02:00
get_password.c This is an implementation of two WL items: 2006-05-18 18:57:50 +04:00
libmysql.c Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50 2007-01-18 08:41:52 -07:00
libmysql.def Backport fix for mysql client not using SSl library directly 2006-04-22 00:48:13 +02:00
libmysql.ver.in BUG#3074: Unversioned symbols in shared library 2006-01-17 18:51:08 +04:00
Makefile.am my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
Makefile.shared ha_innodb.m4, Makefile.am, ha_ndbcluster.m4, Makefile.shared, ha_berkeley.m4: 2006-11-27 21:15:25 +01:00
manager.c Final patch to remove the last of the OS2 support. 2006-04-15 18:17:32 -07:00
mytest.c make dist changes for Cmake build 2006-09-01 10:32:12 +02:00