mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 23:34:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/include
History
unknown a2989a35f5 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel


client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_time.h:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/my_malloc.c:
  Auto merged
mysys/my_static.c:
  Auto merged
mysys/safemalloc.c:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/time.cc:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
client/client_priv.h:
  Manual merge with main 5.1 source.
sql/event_data_objects.cc:
  Manual merge with main 5.1 source.
sql/event_db_repository.cc:
  Manual merge with main 5.1 source.
sql/mysqld.cc:
  Manual merge with main 5.1 source.
sql/sql_load.cc:
  Manual merge with main 5.1 source.
sql/sql_parse.cc:
  Manual merge with main 5.1 source.
2007-04-10 16:28:47 +03:00
..
atomic Many files: 2006-12-27 02:23:51 +01:00
mysql Two things: 2007-01-26 15:36:39 -08:00
.cvsignore
abi_check
base64.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
config-netware.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
config-win.h Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 2007-03-28 23:08:00 +02:00
decimal.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
errmsg.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
ft_global.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
hash.h Many files: 2006-12-23 20:17:15 +01:00
heap.h wl#3700 - post-review fixes: 2007-03-17 00:13:25 +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 mysql.com:/home/my/mysql-5.0 2007-01-27 03:46:45 +02:00
m_string.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
Makefile.am Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 2007-03-12 13:29:11 +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_atomic.h move intptr from my_atomic.h to my_global.h 2007-01-28 21:12:58 +01:00
my_base.h Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 2007-04-04 17:03:31 +02:00
my_bitmap.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_dbug.h Fixed compiler warnings. 2007-02-28 22:23:35 +02: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 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-03-22 01:04:39 +01: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 Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_no_pthread.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_nosys.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_pthread.h restored run-time thread lib detection 2007-03-28 15:33:29 +02:00
my_sys.h Merge recycle.(none):/src/bug23736/my50-bug23736 2007-03-20 10:54:56 -04:00
my_time.h Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-10 16:28:47 +03:00
my_tree.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_trie.h Many files: 2006-12-27 02:23:51 +01:00
my_uctype.h Many files: 2006-12-31 02:29:11 +01:00
my_user.h Many files: 2006-12-23 20:17:15 +01:00
my_vle.h Many files: 2006-12-31 02:29:11 +01:00
my_xml.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
myisam.h wl#3700 - post-review fixes: 2007-03-17 00:13:25 +01:00
myisammrg.h wl#3700 - post-review fixes: 2007-03-17 00:13:25 +01:00
myisampack.h Many files: 2006-12-23 20:17:15 +01:00
mysql.h Bug #24121 Incorrect test for SSL_VERIFY_SERVER_CERT 2007-03-27 21:04:05 +02:00
mysql_com.h Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte 2007-04-03 16:13:27 +05:00
mysql_embed.h Many files: 2006-12-23 20:17:15 +01:00
mysql_h.ic Change find_type family to accept const TYPELIB*. 2007-03-27 20:27:58 +04:00
mysql_time.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mysql_version.h.in
mysys_err.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
queues.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +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 restored run-time thread lib detection 2007-03-28 15:33:29 +02:00
thr_lock.h Fixed compiler warnings 2007-02-23 13:13:55 +02:00
typelib.h Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-04 21:25:39 +03:00
violite.h Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 2007-03-28 15:57:27 +02:00