mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/include
History
unknown 2f664e46c6 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-wl2936-two


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ndb_dd_basic.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/ndb_dd_basic.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/hash.c:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_connect.cc:
  Auto merged
sql/sql_delete.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_plugin.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_yacc.yy:
  Auto merged
sql/structs.h:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/innobase/handler/ha_innodb.h:
  Auto merged
include/typelib.h:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Manual merge
mysys/typelib.c:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Manual merge
2007-04-27 19:09:39 +02:00
..
atomic Many files: 2006-12-27 02:23:51 +01:00
mysql more wl#2936 fixes: removed implicit ha_thd() calls (too error-prone), 2007-04-15 15:47:27 +02:00
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
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 Added more descriptive error message of why statement was automaticly dropped 2007-04-13 01:56:22 +03:00
ft_global.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
hash.h WL#2936 2007-03-02 08:43:45 -08: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 pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 2007-04-24 14:07:30 +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 trift-lap.fambruehe:/MySQL/M51/mysql-5.1 2007-04-26 16:03:02 +02: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_attribute.h Bug#25118 ATTRIBUTE_FORMAT_FPTR undeclared in m_ctype.h 2007-04-12 00:43:25 +02:00
my_base.h Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 2007-04-05 08:39:12 +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 WL#2936 2007-03-23 10:14:46 -07:00
my_global.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 2007-04-27 19:09:39 +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 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 bk-internal.mysql.com:/home/bk/mysql-5.1-engines 2007-04-27 19:09:39 +02: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 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-16 10:37:50 +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 Merge with 4.0 to get fixes for Windows project files 2004-05-25 02:47:25 +03:00
mysys_err.h WL#2936 2007-03-02 08:43:45 -08: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 bk-internal.mysql.com:/home/bk/mysql-5.1-engines 2007-04-27 19:09:39 +02:00
violite.h Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 2007-03-28 15:57:27 +02:00