mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage
History
unknown 16d46c9cba Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8:
  Auto merged
BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
  Auto merged
BitKeeper/deleted/.del-NOTES~e926d3e6929ac052:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/std_data/cacert.pem:
  Auto merged
mysql-test/std_data/client-cert.pem:
  Auto merged
mysql-test/std_data/client-key.pem:
  Auto merged
mysql-test/std_data/server-cert.pem:
  Auto merged
mysql-test/std_data/server-key.pem:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
vio/vio.c:
  Auto merged
client/client_priv.h:
  Merge 5.0 -> 5.1
include/violite.h:
  Merge 5.0 -> 5.1
mysql-test/Makefile.am:
  Merge 5.0 -> 5.1
mysql-test/t/disabled.def:
  Merge 5.0 -> 5.1
sql/mysqld.cc:
  Merge 5.0 -> 5.1
vio/viossl.c:
  Merge 5.0 -> 5.1
vio/viosslfactories.c:
  Merge 5.0 -> 5.1
2006-05-12 08:45:22 +02:00
..
archive auto-set MYSQL_PLUGIN_DIRECTORY for plug.in files 2006-05-06 07:43:18 -04:00
bdb Some changes to make it possible to build for Windows with CMake from 2006-03-24 22:50:56 +01:00
blackhole fix include path in windows build 2006-05-03 15:58:16 -07:00
csv fix include path in windows build 2006-05-03 15:58:16 -07:00
example auto-set MYSQL_PLUGIN_DIRECTORY for plug.in files 2006-05-06 07:43:18 -04:00
heap Merge mysql.com:/home/my/mysql-5.0 2006-05-04 15:58:30 +03:00
innobase Merge xiphis.org:/home/antony/work2/mysql-5.1 2006-05-01 22:45:31 -07:00
myisam Merge mysql.com:/home/mydev/mysql-5.1 2006-05-06 09:49:16 +02:00
myisammrg Some changes to make it possible to build for Windows with CMake from 2006-03-24 22:50:56 +01:00
ndb Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 2006-05-12 08:45:22 +02:00
Makefile.am fixes for 'make dist' and 'make distcheck' 2006-04-12 14:08:24 +02:00