mariadb/include
unknown f97f48acaf Merge with 4.0
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-apply-patch:
  Delete: netware/BUILD/apply-patch
BitKeeper/deleted/.del-save-patch:
  Delete: netware/BUILD/save-patch
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
  Auto merged
BitKeeper/triggers/post-commit:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
extra/resolveip.c:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/include/os0thread.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/thr/thr0loc.c:
  Auto merged
libmysql/manager.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/mi_extra.c:
  Auto merged
myisam/mi_locking.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/rpl_reset_slave.test:
  Auto merged
mysql-test/t/rpl_trunc_binlog.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
mysys/errors.c:
  Auto merged
mysys/my_symlink.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/unireg.h:
  Auto merged
client/mysqldump.c:
  merge with 4.0 (quoted names)
configure.in:
  use local file
include/my_pthread.h:
  Use local file
innobase/include/srv0srv.h:
  Use local file
innobase/row/row0sel.c:
  Use local file
innobase/srv/srv0srv.c:
  Use local file
libmysql/libmysql.c:
  Use local file
myisam/myisamchk.c:
  merge fixes
mysql-test/r/func_crypt.result:
  update results
mysql-test/r/order_by.result:
  update results
mysql-test/r/query_cache.result:
  update results
mysql-test/r/range.result:
  update results
mysql-test/r/rpl_reset_slave.result:
  update results
mysql-test/r/rpl_trunc_binlog.result:
  update results
mysql-test/t/func_crypt.test:
  Added disable_warnings/enable warnings
mysql-test/t/query_cache.test:
  merge tests
mysql-test/t/range.test:
  merge tests
mysys/charset.c:
  use local file (will merge patch separately)
sql/ha_innodb.cc:
  use local file
sql/log_event.cc:
  new slave_proxy_id handling
sql/slave.h:
  merge
sql/sql_base.cc:
  merge
sql/sql_parse.cc:
  Fixes for counting user connect resourses
  Added function comments for involved functions
sql/sql_select.cc:
  Fix for not doing sort with LIMIT when OPTION_FOUND_ROWS is used
sql/unireg.cc:
  merge fixes
support-files/mysql.server.sh:
  merge fixes
2003-11-04 09:40:36 +02:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
config-netware.h Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
config-os2.h Implemented UTC_TIME, UTC_DATE and UTC_TIMESTAMP functions (WL#345) 2003-08-11 23:43:01 +04:00
config-win.h Merge with 4.0 2003-11-04 09:40:36 +02:00
errmsg.h fix for #1210 2003-09-08 13:11:18 +05:00
ft_global.h query expansion for fulltext search 2003-10-23 15:21:06 +02:00
hash.h SCRUM 2003-09-19 14:44:31 +05:00
heap.h auto_increment for heap tables 2002-10-07 17:49:03 +05:00
m_ctype.h Merge 2003-11-03 22:48:03 +02:00
m_string.h Simplified 'wrong xxx name' error messages by introducing 'general' ER_WRONG_NAME error 2003-11-03 14:01:59 +02:00
Makefile.am - added missing include/sql_state.h to source distribution 2003-06-19 13:46:10 +02:00
md5.h Update copyright 2001-12-06 14:10:51 +02:00
merge.h Update copyright 2001-12-06 14:10:51 +02:00
my_aes.h Made keyread (key scanning) a key specific attribute. 2002-06-19 00:22:30 +03:00
my_alarm.h Update copyright 2001-12-06 14:10:51 +02:00
my_alloc.h Small improvement to alloc_root 2002-11-16 20:19:10 +02:00
my_base.h Merge 2003-10-30 10:45:28 -08:00
my_bitmap.h Bitmap post-review fixes 2003-10-30 19:17:57 +01:00
my_dbug.h Change dbug.h -> my_dbug.h (Portability fix) 2003-03-17 19:06:14 +02:00
my_dir.h Update copyright 2001-12-06 14:10:51 +02:00
my_getopt.h Support for variables with components 2003-07-06 19:09:57 +03:00
my_global.h Merge with 4.0 2003-11-04 09:40:36 +02:00
my_handler.h Two-level index structure for FULLTEXT indexes 2003-01-21 19:24:34 +01:00
my_list.h Portability fixes (for windows) 2003-01-21 21:07:59 +02:00
my_net.h 4 small items in this: 2003-10-31 23:20:23 +01:00
my_no_pthread.h merge with 3.23.52 2002-08-12 04:04:43 +03:00
my_nosys.h Update copyright 2001-12-06 14:10:51 +02:00
my_pthread.h Merge with 4.0 2003-11-04 09:40:36 +02:00
my_semaphore.h more #ifdef THREAD added 2003-04-30 12:32:43 +02:00
my_sys.h Merge with 4.0 2003-11-04 09:40:36 +02:00
my_tree.h Merge with 4.0 2002-11-21 15:56:48 +02:00
my_xml.h Portability fixes 2003-02-28 14:32:40 +02:00
myisam.h Manual merge after improving concurrency for key cache reassignment 2003-10-01 20:16:36 -07:00
myisammrg.h Merge with 4.0.8 2003-01-03 00:04:33 +02:00
myisampack.h Merge with 4.0 2002-11-21 15:56:48 +02:00
mysql.h merge with 4.0 2003-10-16 03:08:40 +03:00
mysql_com.h Merge with 4.0 2003-11-04 09:40:36 +02:00
mysql_embed.h SCRUM 2003-07-04 11:40:10 +05:00
mysql_version.h.in merge with public tree 2003-06-05 00:12:45 +03:00
mysqld_error.h Merge 2003-11-03 22:48:03 +02:00
mysys_err.h Call my_sync() after all data is written to .frm file 2003-11-02 15:55:02 +02:00
nisam.h Update copyright 2001-12-06 14:10:51 +02:00
queues.h fix_max_connections to resize alarm_queue (Bug #1435) 2003-10-06 14:11:16 +02:00
raid.h Lots of code fixes to the replication code (especially the binary logging and index log file handling) 2002-08-08 03:12:02 +03:00
rijndael.h Made keyread (key scanning) a key specific attribute. 2002-06-19 00:22:30 +03:00
sha1.h Made keyread (key scanning) a key specific attribute. 2002-06-19 00:22:30 +03:00
sql_common.h SCRUM 2003-09-17 15:18:18 +05:00
sql_state.h Simplified 'wrong xxx name' error messages by introducing 'general' ER_WRONG_NAME error 2003-11-03 14:01:59 +02:00
sslopt-case.h fixed so that --ssl and --skip-ssl works with the MySQL clients. 2002-09-17 23:46:53 +03:00
sslopt-longopts.h consistency fix - all help texts for command-line options should end with a dot. 2003-06-13 10:59:02 +02:00
sslopt-vars.h Update copyright 2001-12-06 14:10:51 +02:00
t_ctype.h Update copyright 2001-12-06 14:10:51 +02:00
thr_alarm.h dummy resize_thr_alarm for Netware 2003-10-15 17:10:47 +02:00
thr_lock.h Merge with 4.0 2003-03-16 19:17:54 +02:00
typelib.h Windows build fix 2003-01-18 14:04:34 -08:00
violite.h merge with 4.0.15 2003-08-29 13:44:35 +03:00