mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/libmysqld
History
unknown d10db4cf6c Merge rama.(none):/home/jimw/my/tmp_merge 
into  rama.(none):/home/jimw/my/mysql-5.1-clean


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
extra/yassl/include/openssl/ssl.h:
  Auto merged
extra/yassl/include/yassl_int.hpp:
  Auto merged
extra/yassl/src/ssl.cpp:
  Auto merged
extra/yassl/src/template_instnt.cpp:
  Auto merged
extra/yassl/src/yassl_imp.cpp:
  Auto merged
extra/yassl/src/yassl_int.cpp:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/embedded_priv.h:
  Auto merged
BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/mysqldump-max.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/time.cc:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
BitKeeper/deleted/.del-have_case_sensitive_file_system.inc:
  Delete: mysql-test/include/have_case_sensitive_file_system.inc
BitKeeper/deleted/.del-case_sensitive_file_system.require:
  Delete: mysql-test/r/case_sensitive_file_system.require
mysql-test/lib/mtr_cases.pl:
  Resolve conflict
mysql-test/mysql-test-run.pl:
  Resolve conflict
mysql-test/r/mysqldump.result:
  Resolve conflict
mysql-test/t/mysqldump.test:
  Resolve conflict
sql/sql_parse.cc:
  Resolve conflict
2006-07-28 15:51:48 -07:00
..
examples Re-apply missing changeset, orignally pushed by elliot 2006-06-06 14:21:07 +03:00
CMakeLists.txt Add sql_locale.cc to cmake scripts. 2006-07-28 16:37:16 +04:00
copyright Added all changes from old 4.0 version: 2001-04-11 13:04:03 +02:00
emb_qcache.cc Fixes to embedded server to be able to run tests with it 2006-02-24 18:34:15 +02:00
emb_qcache.h Fix crash in embedded server due to incorrect storage of results 2005-03-31 19:17:45 -08:00
embedded_priv.h Merge mysql.com:/home/hf/work/mysql-4.1.mrg 2006-07-18 14:52:29 +05:00
lib_sql.cc Merge rama.(none):/home/jimw/my/tmp_merge 2006-07-28 15:51:48 -07:00
libmysqld.c merging 2006-07-18 16:43:39 +05:00
libmysqld.def Backport fix for mysql client not using SSl library directly 2006-04-22 00:48:13 +02:00
libmysqld.rc query_id and my_xid -> ulonglong 2005-01-27 22:38:56 +01:00
Makefile.am Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-26 23:33:25 +04:00
resource.h query_id and my_xid -> ulonglong 2005-01-27 22:38:56 +01:00