mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage/ndb/include/util
History
unknown f296bb095d Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new


BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b:
  Auto merged
BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868:
  Auto merged
BitKeeper/deleted/.del-changelog-5.0.xml~f4c50926ccdd7434:
  Auto merged
BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8:
  Auto merged
BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4:
  Auto merged
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
  Auto merged
BitKeeper/deleted/.del-NOTES~e926d3e6929ac052:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  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/auto_increment.result:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/r/symlink.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/date_formats.test:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/ndb_condition_pushdown.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/util/NdbSqlUtil.hpp:
  Auto merged
storage/ndb/src/common/util/NdbSqlUtil.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
vio/vio.c:
  Auto merged
client/client_priv.h:
  manual merge
include/violite.h:
  Automatic
mysql-test/Makefile.am:
  manual merge
mysql-test/r/mysqldump.result:
  Automatic
mysql-test/r/rpl_user_variables.result:
  Manual merge (diff is because lars removed displaying of binlog)
mysql-test/t/disabled.def:
  manual merge
mysql-test/t/mysqldump.test:
  manual merge
mysql-test/t/rpl_user_variables.test:
  manual merge (Changes becasue of lars removed binlog logging)
sql/mysqld.cc:
  manual merge
vio/viossl.c:
  manual merge
vio/viosslfactories.c:
  manual merge
client/client_priv.h.rej:
  merge 5.0 -> 5.1
2006-05-09 20:50:29 +03:00
..
BaseString.hpp Import ndb varsize 2005-11-07 12:19:28 +01:00
basestring_vsnprintf.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
Bitmask.hpp Merge perch.ndb.mysql.com:/home/jonas/src/50-work 2006-01-13 09:22:02 +01:00
ConfigValues.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
File.hpp Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug17411-thisisaverylongnamethatshouldbewaylongerthanthe128limitthatweprivouslyhadbutireallywantotestitandseethatitdoesreallywork.nowitshouldbeabout160charslongnonow.iwonderifanythingwillchokeornotwiththisoutrageouslylongpathname 2006-02-16 15:51:37 +11:00
InputStream.hpp ndb - 2006-03-24 10:23:50 +01:00
md5_hash.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndb_opts.h Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 2006-04-21 14:00:44 +02:00
NdbAutoPtr.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbOut.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbSqlUtil.hpp Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 2006-05-09 20:50:29 +03:00
OutputStream.hpp ndb - 2006-03-24 10:19:10 +01:00
Parser.hpp Merge 2005-09-12 14:22:06 +02:00
Properties.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
random.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
SimpleProperties.hpp Remove compiler warnings 2006-03-29 17:04:00 +03:00
socket_io.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
SocketAuthenticator.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
SocketClient.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
SocketServer.hpp Merge perch.ndb.mysql.com:/home/jonas/src/50-work 2006-04-26 15:16:21 +02:00
UtilBuffer.hpp Import ndb varsize 2005-11-07 12:19:28 +01:00
uucode.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
Vector.hpp wl2723 - ndb opt. nr 2006-01-11 11:35:25 +01:00
version.h Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 2005-07-15 15:08:38 +02:00