mariadb/include
unknown ddee00a6ed merge with 3.23.42
config.guess:
  Auto merged
config.sub:
  Auto merged
ltconfig:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
client/Makefile.am:
  Auto merged
include/errmsg.h:
  Auto merged
include/global.h:
  Auto merged
include/heap.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
isam/isamlog.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
merge/open.c:
  Auto merged
myisam/ft_search.c:
  Auto merged
myisam/ftdefs.h:
  Auto merged
myisam/mi_test_all.sh:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamlog.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
myisam/sort.c:
  Auto merged
myisammrg/myrg_open.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_casecnv.c:
  Auto merged
mysys/mf_format.c:
  Auto merged
mysys/my_lib.c:
  Auto merged
mysys/tree.c:
  Auto merged
sql-bench/bench-init.pl.sh:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
mysql-test/t/err000001.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/overflow.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
strings/ctype.c:
  Auto merged
Docs/manual.texi:
  Change to 3.23 manual.
  (I will later add the changes for 4.0 to this copy)
client/mysql.cc:
  merge
client/mysqlbinlog.cc:
  merge
client/mysqldump.c:
  merge
client/mysqltest.c:
  merge
client/thread_test.c:
  merge
configure.in:
  merge
include/my_pthread.h:
  merge
include/mysqld_error.h:
  merge
libmysql/net.c:
  merge
myisam/mi_cache.c:
  merge
myisam/mi_check.c:
  merge
mysql-test/t/fulltext.test:
  merge
mysys/mf_qsort.c:
  merge
sql/lock.cc:
  merge
sql/md5.c:
  merge
sql/mini_client.cc:
  merge
sql/share/czech/errmsg.txt:
  merge
sql/share/danish/errmsg.txt:
  merge
sql/share/dutch/errmsg.txt:
  merge
sql/share/english/errmsg.txt:
  merge
sql/share/estonian/errmsg.txt:
  merge
sql/share/french/errmsg.txt:
  merge
sql/share/german/errmsg.txt:
  merge
sql/share/greek/errmsg.txt:
  merge
sql/share/hungarian/errmsg.txt:
  merge
sql/share/italian/errmsg.txt:
  merge
sql/share/japanese/errmsg.txt:
  merge
sql/share/korean/errmsg.txt:
  merge
sql/share/norwegian-ny/errmsg.txt:
  merge
sql/share/norwegian/errmsg.txt:
  merge
sql/share/polish/errmsg.txt:
  merge
sql/share/portuguese/errmsg.txt:
  merge
sql/share/romanian/errmsg.txt:
  merge
sql/share/russian/errmsg.txt:
  merge
sql/share/slovak/errmsg.txt:
  merge
sql/share/spanish/errmsg.txt:
  merge
sql/share/swedish/errmsg.txt:
  merge
sql/sql_load.cc:
  merge
sql/sql_repl.cc:
  merge
2001-09-02 18:38:33 +02:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
.my_sys.h.swp fixed --skip-slave-thread bug 2000-10-26 22:11:55 -06:00
config-os2.h Fixes for OS2. 2001-08-22 01:45:07 +03:00
config-win.h Portability fixes. 2001-08-18 10:49:00 +03:00
dbug.h Small bug fixes 2000-09-07 04:55:17 +03:00
errmsg.h merge with 3.23.42 2001-09-02 18:38:33 +02:00
ft_global.h ft_* variables added 2001-04-17 21:30:02 +02:00
getopt.h New thr_alarm struct for better integration with OS2 2000-11-28 04:47:47 +02:00
global.h merge with 3.23.42 2001-09-02 18:38:33 +02:00
hash.h Import changeset 2000-07-31 21:29:14 +02:00
heap.h merge with 3.23.42 2001-09-02 18:38:33 +02:00
m_ctype.h Portability fixes 2001-04-23 03:28:08 +03:00
m_string.h Fix for OS2 2001-08-30 01:22:02 +03:00
Makefile.am Added missing file 2001-02-03 18:18:58 +02:00
merge.h Import changeset 2000-07-31 21:29:14 +02:00
my_alarm.h Import changeset 2000-07-31 21:29:14 +02:00
my_base.h Fix of UNION code 2001-08-19 14:43:51 +03:00
my_bitmap.h Force sockets to be blocking on HPUX 11.0 2001-02-07 23:27:19 +02:00
my_dir.h Import changeset 2000-07-31 21:29:14 +02:00
my_list.h Import changeset 2000-07-31 21:29:14 +02:00
my_net.h Portability fixes 2001-02-02 03:47:06 +02:00
my_no_pthread.h Import changeset 2000-07-31 21:29:14 +02:00
my_nosys.h Import changeset 2000-07-31 21:29:14 +02:00
my_pthread.h merge with 3.23.42 2001-09-02 18:38:33 +02:00
my_sys.h merge with 3.23.42 2001-09-02 18:38:33 +02:00
my_tree.h memory-limited tree 2001-07-02 21:18:57 +02:00
myisam.h merged 2001-07-02 21:52:22 +02:00
myisammrg.h Fix for SAFE_MUTEX + MERGE tables 2000-09-21 01:58:38 +03:00
myisampack.h Check that __FLOAT_WORD_ORDER is defined 2001-02-08 04:43:55 +02:00
mysql.h Fixed compilation problems when HAVE_OPENSSL is not defined 2001-09-01 23:29:58 +08:00
mysql_com.h merge with 3.23.42 2001-09-02 18:38:33 +02:00
mysql_version.h.in Changes for --with-server-suffix 2001-01-21 16:30:16 +02:00
mysqld_error.h merge with 3.23.42 2001-09-02 18:38:33 +02:00
mysys_err.h Added functions for symbolic link handling to make it possible to 2001-05-31 12:18:53 +03:00
nisam.h Import changeset 2000-07-31 21:29:14 +02:00
queues.h Fixes for MERGE TABLES and HEAP tables 2000-09-14 02:39:07 +03:00
raid.h Use C-style comments in common header files and C code. 2001-01-16 22:35:27 +02:00
sslopt-case.h Use C-style comments in common header files and C code. 2001-01-16 22:35:27 +02:00
sslopt-longopts.h Import changeset 2000-07-31 21:29:14 +02:00
sslopt-usage.h Import changeset 2000-07-31 21:29:14 +02:00
sslopt-vars.h Import changeset 2000-07-31 21:29:14 +02:00
t_ctype.h Import changeset 2000-07-31 21:29:14 +02:00
thr_alarm.h Fixes for OS2. 2001-08-22 01:45:07 +03:00
thr_lock.h Upgrade TL_WRITE_CONCURRENT_INSERT to TL_WRITE_LOW_PRIORITY if 2001-07-18 23:34:04 +03:00
violite.h OpenSSL fixes. Should not affect anything else. 2001-07-24 14:07:46 +08:00