mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-23 08:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity
mariadb/include
History
unknown 1384e64005 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
BUILD/SETUP.sh:
  Auto merged
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
cmd-line-utils/readline/display.c:
  Auto merged
configure.in:
  Auto merged
extra/yassl/include/buffer.hpp:
  Auto merged
extra/yassl/include/crypto_wrapper.hpp:
  Auto merged
extra/yassl/include/yassl_imp.hpp:
  Auto merged
extra/yassl/include/yassl_int.hpp:
  Auto merged
extra/yassl/src/crypto_wrapper.cpp:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Auto merged
extra/yassl/taocrypt/include/des.hpp:
  Auto merged
extra/yassl/taocrypt/include/hash.hpp:
  Auto merged
extra/yassl/taocrypt/include/hmac.hpp:
  Auto merged
extra/yassl/taocrypt/include/modarith.hpp:
  Auto merged
extra/yassl/taocrypt/include/modes.hpp:
  Auto merged
extra/yassl/taocrypt/include/rsa.hpp:
  Auto merged
extra/yassl/taocrypt/include/type_traits.hpp:
  Auto merged
extra/yassl/taocrypt/mySTL/list.hpp:
  Auto merged
extra/yassl/taocrypt/src/aes.cpp:
  Auto merged
extra/yassl/taocrypt/src/algebra.cpp:
  Auto merged
extra/yassl/testsuite/testsuite.cpp:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysys/default.c:
  Auto merged
ndb/src/common/transporter/Transporter.cpp:
  Auto merged
ndb/src/common/util/File.cpp:
  Auto merged
ndb/src/common/util/SocketClient.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/ClusterMgr.hpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
sql/field.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  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
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
extra/yassl/taocrypt/src/asn.cpp:
  Manual merge (Fix shadowed variable name)
extra/yassl/taocrypt/test/test.cpp:
  No changes
ndb/src/common/util/ConfigValues.cpp:
  Manual merge (Fix shadowed variable name)
sql/field.h:
  manual merge
sql/ha_myisam.cc:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
sql/item_cmpfunc.cc:
  manual merge
sql/item_subselect.cc:
  Manual merge (Fix shadowed variable name)
sql/mysqld.cc:
  no changes
2007-02-21 14:07:08 +02:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
abi_check Make --mem settable with environment variable MTR_MEM and make it possible to pass the directory to use. I.e --mem=<directory> 2006-11-07 11:07:27 +01:00
base64.h Many files: 2006-12-23 20:17:15 +01:00
config-netware.h Many files: 2006-12-23 20:17:15 +01:00
config-os2.h Many files: 2006-12-23 20:17:15 +01:00
config-win.h Merge siva.hindu.god:/usr/home/tim/m/bk/g50 2006-12-26 22:28:28 -07:00
decimal.h Many files: 2006-12-23 20:17:15 +01:00
errmsg.h Many files: 2006-12-23 20:17:15 +01:00
ft_global.h Many files: 2006-12-23 20:17:15 +01:00
hash.h Many files: 2006-12-23 20:17:15 +01:00
heap.h Many files: 2006-12-23 20:17:15 +01:00
help_end.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
help_start.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
keycache.h Many files: 2006-12-23 20:17:15 +01:00
m_ctype.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-22 14:04:40 +02:00
m_string.h Many files: 2006-12-23 20:17:15 +01:00
Makefile.am my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
md5.h Many files: 2006-12-23 20:17:15 +01:00
my_aes.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
my_alarm.h Many files: 2006-12-23 20:17:15 +01:00
my_alloc.h Many files: 2006-12-23 20:17:15 +01:00
my_base.h Many files: 2006-12-23 20:17:15 +01:00
my_bitmap.h Many files: 2006-12-23 20:17:15 +01:00
my_dbug.h Many files: 2006-12-23 20:17:15 +01:00
my_dir.h Many files: 2006-12-23 20:17:15 +01:00
my_getopt.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
my_global.h Fixed unsafe define of uint4korr() 2007-02-21 13:02:57 +02:00
my_global.h.rej Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2007-01-22 03:33:59 +02:00
my_handler.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
my_libwrap.h Many files: 2006-12-23 20:17:15 +01:00
my_list.h Many files: 2006-12-23 20:17:15 +01:00
my_net.h Many files: 2006-12-23 20:17:15 +01:00
my_no_pthread.h Many files: 2006-12-23 20:17:15 +01:00
my_nosys.h Many files: 2006-12-23 20:17:15 +01:00
my_pthread.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-02-21 14:07:08 +02:00
my_pthread.h.rej Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2007-01-22 03:33:59 +02:00
my_semaphore.h more #ifdef THREAD added 2003-04-30 12:32:43 +02:00
my_sys.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-22 14:04:40 +02:00
my_time.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-22 14:04:40 +02:00
my_tree.h Many files: 2006-12-23 20:17:15 +01:00
my_user.h Many files: 2006-12-23 20:17:15 +01:00
my_xml.h Many files: 2006-12-23 20:17:15 +01:00
myisam.h Many files: 2006-12-23 20:17:15 +01:00
myisammrg.h Many files: 2006-12-23 20:17:15 +01:00
myisampack.h Many files: 2006-12-23 20:17:15 +01:00
mysql.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-22 14:04:40 +02:00
mysql_com.h Many files: 2006-12-23 20:17:15 +01:00
mysql_embed.h Many files: 2006-12-23 20:17:15 +01:00
mysql_h.ic Merge polly.local:/tmp/maint/bug24117/my50-bug24117 2006-12-19 12:24:44 +03:00
mysql_time.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mysql_version.h.in Merge with 4.0 to get fixes for Windows project files 2004-05-25 02:47:25 +03:00
mysys_err.h Many files: 2006-12-23 20:17:15 +01:00
queues.h Many files: 2006-12-23 20:17:15 +01:00
raid.h Many files: 2006-12-23 20:17:15 +01:00
rijndael.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sha1.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_common.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sslopt-case.h Many files: 2006-12-23 20:17:15 +01:00
sslopt-longopts.h Many files: 2006-12-23 20:17:15 +01:00
sslopt-vars.h Many files: 2006-12-23 20:17:15 +01:00
t_ctype.h Many files: 2006-12-23 20:17:15 +01:00
thr_alarm.h Merge chilla.local:/home/mydev/mysql-4.1-axmrg 2007-02-02 10:03:22 +01:00
thr_lock.h Merge mysql.com:/home/svoj/devel/mysql/BUG23526/mysql-5.0-engines2 2006-12-30 03:44:25 +04:00
typelib.h Merge siva.hindu.god:/usr/home/tim/m/bk/g50 2006-12-26 22:28:28 -07:00
violite.h Many files: 2006-12-23 20:17:15 +01:00