mariadb/libmysql
unknown 95b7215869 Merge bk-internal:/home/bk/mysql-5.1
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/table.cc:
  Auto merged
strings/decimal.c:
  Auto merged
2006-11-28 17:14:16 +01:00
..
.cvsignore
acinclude.m4
client_settings.h Fixed Bug#7838, "pipe_sig_handler should be static". 2005-02-17 23:00:48 +02:00
CMakeLists.txt Additional files for cmake support 2006-08-31 19:52:42 +02: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 bk-internal:/home/bk/mysql-5.1 2006-11-28 17:14:16 +01: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 make dist changes for Cmake build 2006-09-01 10:32:12 +02:00
Makefile.shared Merge 192.168.0.20:mysql/bug15069/my51-bug15069 2006-04-10 15:14:47 +02: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