mariadb/include
unknown 4d0e9ad917 Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)
BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysqld_error.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Auto merged
mysql-test/r/null.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/null.test:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
2004-11-11 18:58:57 -08:00
..
.cvsignore
config-netware.h Always enable HAVE_COMPRESS on netware 2004-05-28 01:02:20 +03:00
config-os2.h
config-win.h Simpler arena swapping code 2004-11-08 01:13:54 +02:00
decimal.h take into accound end \0 in decimal_string_size 2004-11-03 22:30:37 +01:00
errmsg.h client.c, libmysql.c: 2004-06-30 22:18:41 -05:00
ft_global.h
hash.h After merge fixes 2004-10-07 10:50:13 +03:00
heap.h key_cmp -> key_cmp_if_same 2004-05-16 14:48:32 +03:00
help_end.h Added patches from Novell 2004-05-25 22:00:14 +03:00
help_start.h Added patches from Novell 2004-05-25 22:00:14 +03:00
keycache.h
m_ctype.h Bug #6040 can't retrieve records with umlaut characters in case insensitive manner 2004-10-18 15:23:24 +05:00
m_string.h If the system has 64 bit "long", then "long long" does not add new 2004-08-30 17:41:41 +02:00
Makefile.am fix problem with make dist and decimal.h 2004-11-04 13:07:38 +01:00
md5.h
merge.h
my_aes.h
my_alarm.h
my_alloc.h
my_base.h merge with 4.1 2004-10-29 19:26:52 +03:00
my_bitmap.h Manual merge 2004-06-14 11:18:56 +04:00
my_dbug.h More debugging 2004-11-10 18:07:39 +02:00
my_dir.h
my_getopt.h Merge with 4.0 2004-09-01 04:12:09 +03:00
my_global.h Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump) 2004-11-11 18:58:57 -08:00
my_handler.h
my_list.h one more name clash in public includes fixed 2004-11-02 22:46:55 +01:00
my_net.h
my_no_pthread.h
my_nosys.h
my_pthread.h To allow compilation on Tru64, the MySQL code should not mess 2004-10-04 11:45:07 +02:00
my_semaphore.h
my_sys.h Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump) 2004-11-11 18:58:57 -08:00
my_time.h merge with 4.1 2004-10-29 19:26:52 +03:00
my_tree.h
my_xml.h
myisam.h Merge with 4.0 for 4.1 release 2004-10-06 19:14:33 +03:00
myisammrg.h key_cmp -> key_cmp_if_same 2004-05-16 14:48:32 +03:00
myisampack.h Casted all macro arguments, 2004-07-28 21:46:22 +02:00
mysql.h Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump) 2004-11-11 18:58:57 -08:00
mysql_com.h Merge with 4.1 to get in latest bug fixes 2004-11-04 15:06:24 +02:00
mysql_embed.h Merge with 4.0, mainly to get changes to windows project files 2004-05-20 00:54:52 +03:00
mysql_time.h Cleanup in mysql_time.h/my_time.h headers. The first is used in mysql.h, 2004-08-05 14:16:43 -07:00
mysql_version.h.in Merge with 4.0 to get fixes for Windows project files 2004-05-25 02:47:25 +03:00
mysqld_error.h no new message in 4.1 (causes merge issues with 5.0). Using ER_UNKNOW_ERROR and hardcoded message string instead. 2004-11-11 00:00:17 +01:00
mysys_err.h
nisam.h
queues.h
raid.h
rijndael.h
sha1.h
sql_common.h Remove stale declaration, fix a typo in comment. 2004-10-15 22:03:11 +04:00
sql_state.h Fixed BUG#6030: Stored procedure has no appropriate DROP privilege. 2004-10-22 20:29:06 +02:00
sslopt-case.h
sslopt-longopts.h
sslopt-vars.h
t_ctype.h
thr_alarm.h Added patches from Novell 2004-05-25 22:00:14 +03:00
thr_lock.h
typelib.h Bug#6202: ENUMs are not case sensitive even if declared BINARY 2004-10-25 17:51:26 +05:00
violite.h Merge with 4.0.21 2004-06-18 04:38:58 +03:00