mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/libmysql
History
unknown 3c3f9d9022 Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-mysqld_safe-watch.sh~37cbc9a97ffd2555:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysys/my_handler.c:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/heap/hp_test1.c:
  Auto merged
storage/heap/hp_test2.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
sql/table.cc:
  Use local (manual merge)
mysql-test/mysql-test-run.sh:
  Manual merge.
sql/ha_ndbcluster.cc:
  Manual merge.
sql/item.cc:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.
2006-07-13 22:09:36 +04:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
acinclude.m4 Import changeset 2000-07-31 21:29:14 +02:00
client_settings.h Fixed Bug#7838, "pipe_sig_handler should be static". 2005-02-17 23:00:48 +02:00
CMakeLists.txt performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1. 2006-05-11 11:29:08 -05: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 A fix and a test case for Bug#9643 " CURSOR_TYPE_SCROLLABLE dos not work" 2005-05-16 18:27:21 +04:00
get_password.c This is an implementation of two WL items: 2006-05-18 18:57:50 +04:00
libmysql.c Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-13 22:09:36 +04: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 Re-apply missing changeset, orignally pushed by elliot 2006-06-06 14:21:07 +03: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 line endings consistent, use Unix format 2006-04-10 20:04:36 +02:00