mariadb/sql
unknown 6b8e2938f2 Merge with 4.0
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c:
  Auto merged
BitKeeper/deleted/.del-mysql.xdc:
  Delete: netware/mysql.xdc
BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716:
  Auto merged
BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e:
  Auto merged
BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_pthread.h:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_init.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_mutex.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
strings/my_vsnprintf.c:
  Auto merged
sql/sql_parse.cc:
  Merge with 4.0 (Ignore not existing tables with DROP TEMPOARAY TABLE on slave)
mysql-test/r/rpl_loaddata.result:
  Auto merged
2003-04-03 21:19:12 +03:00
..
share cp1257.xml, Index.xml: 2003-04-01 19:03:02 +05:00
.cvsignore
add_errmsg
cache_manager.cc
cache_manager.h
convert.cc CONVERT class was removed 2003-03-18 17:01:32 +04:00
custom_conf.h
derror.cc
des_key_file.cc Merge with 4.0.11 2003-02-04 21:52:14 +02:00
field.cc ALTER TABLE didn't remember the exact 2003-03-31 09:19:20 +05:00
field.h More OpenGIS compatibility: 2003-03-27 13:09:09 +04:00
field_conv.cc Merge with 4.0.9 2003-01-18 03:13:37 +02:00
filesort.cc Some optimization in CHARSET_INFO: 2003-04-01 12:45:16 +05:00
frm_crypt.cc
gen_lex_hash.cc merged 2003-03-13 13:44:03 +01:00
gstream.cc postreview fix (SCRUM) 2002-12-28 01:01:05 +02:00
gstream.h Portability fixes 2003-02-27 03:44:44 +02:00
ha_berkeley.cc Preparing to client<->server autoconvert 2003-03-17 13:14:04 +04:00
ha_berkeley.h A lot of portability fixes. 2003-01-05 20:18:49 +02:00
ha_heap.cc ::index_read_last() method has been added 2002-11-28 15:19:42 +04:00
ha_heap.h ::index_read_last() method has been added 2002-11-28 15:19:42 +04:00
ha_innodb.cc Merge bk-internal.mysql.com:/home/bk/mysql-4.1 2003-03-17 15:06:06 +02:00
ha_innodb.h Merge with 4.0.12 2003-03-19 22:25:44 +02:00
ha_isam.cc low-level error messages cleanup 2003-01-28 17:42:08 +01:00
ha_isam.h
ha_isammrg.cc Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes. 2002-11-07 03:54:00 +02:00
ha_isammrg.h
ha_myisam.cc Merge with 4.0 2003-04-03 21:19:12 +03:00
ha_myisam.h SCRUM 2003-01-15 12:11:44 +04:00
ha_myisammrg.cc Merge with 4.0.11 2003-02-04 21:52:14 +02:00
ha_myisammrg.h - HP/UX 11 compile fix: fixed "records_in_range" class definition 2002-12-13 15:42:31 +01:00
handler.cc Merge with 4.0.12 2003-03-19 22:25:44 +02:00
handler.h Merge with 4.0.12 2003-03-19 22:25:44 +02:00
hash_filo.cc
hash_filo.h sql_acl.cc, item.h: 2003-03-07 12:21:32 +04:00
hostname.cc sql_acl.cc, item.h: 2003-03-07 12:21:32 +04:00
init.cc
item.cc Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 2003-03-28 16:58:52 +02:00
item.h Merge bk-internal.mysql.com:/home/bk/mysql-4.1 2003-03-20 02:06:08 +02:00
item_buff.cc stringcmp() and sortcmp() have been unified 2003-03-04 18:01:59 +04:00
item_cmpfunc.cc Fixing crashing bugs as reported in bugs database 2003-03-28 16:57:03 +02:00
item_cmpfunc.h Strings comparison is now done according to "Collating sequences used for 2003-03-19 19:13:28 +04:00
item_create.cc Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 2003-03-21 11:06:15 +04:00
item_create.h Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 2003-03-21 11:06:15 +04:00
item_func.cc IF() and LEAST() now honors coercibility 2003-03-21 18:31:41 +04:00
item_func.h Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 2003-03-21 11:06:15 +04:00
item_row.cc Move tmp_table_used to THD 2003-02-10 17:59:16 +02:00
item_row.h cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation 2003-01-30 14:35:07 +02:00
item_strfunc.cc Merge with 4.0 2003-04-03 21:19:12 +03:00
item_strfunc.h Fixing crashing bugs as reported in bugs database 2003-03-28 16:57:03 +02:00
item_subselect.cc Merge 2003-03-15 14:16:57 +02:00
item_subselect.h cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation 2003-01-30 14:35:07 +02:00
item_sum.cc stringcmp() and sortcmp() have been unified 2003-03-04 18:01:59 +04:00
item_sum.h stringcmp() and sortcmp() have been unified 2003-03-04 18:01:59 +04:00
item_timefunc.cc Strings which appear without charset context, 2003-03-03 10:53:08 +04:00
item_timefunc.h Fixing a bug #195 2003-03-27 16:11:01 +02:00
item_uniq.cc
item_uniq.h Windows compile fixups (To be verified by respective devs) 2003-02-04 18:50:48 -08:00
key.cc Merge with 4.0.12 2003-03-19 22:25:44 +02:00
lex.h lex.h: 2003-03-31 19:53:50 +05:00
lex_symbol.h
lock.cc Merge with 4.0 2003-03-16 19:17:54 +02:00
log.cc Merge with 4.0 2003-04-03 21:19:12 +03:00
log_event.cc Merge with 4.0 2003-04-03 21:19:12 +03:00
log_event.h A better, but larger fix for server_id bug .. 2003-03-05 15:34:58 +02:00
Makefile.am Merge with 4.0.11 2003-02-04 21:52:14 +02:00
matherr.c
mf_iocache.cc Merge with 4.0 2003-03-16 19:17:54 +02:00
mini_client.cc Fixed problem when connecting to user without a password. 2003-02-14 11:47:41 +02:00
mini_client.h
my_lock.c Fixes for Netware 2003-01-28 08:38:28 +02:00
mysql_priv.h Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 2003-03-28 16:18:26 +02:00
mysqld.cc Merge with 4.0 2003-04-03 21:19:12 +03:00
net_serv.cc - fixed C++-style comments in .c files to make IBM compiler happy 2003-03-11 15:37:31 +01:00
nt_servc.cc postreview fix (SCRUM) 2002-12-28 01:01:05 +02:00
nt_servc.h
opt_ft.cc
opt_ft.h
opt_range.cc Merge with 4.0 2003-03-16 19:17:54 +02:00
opt_range.h Merge with 4.0 to get fix for MIN/MAX 2003-02-07 16:38:37 +02:00
opt_sum.cc func_group.result: 2003-02-28 08:53:54 +02:00
password.c After merge fixes 2003-03-20 21:35:03 +02:00
procedure.cc
procedure.h Strings which appear without charset context, 2003-03-03 10:53:08 +04:00
protocol.cc New variable to turn off automatic charset conversion of query results 2003-03-21 15:18:52 +04:00
protocol.h New variable to turn off automatic charset conversion of query results 2003-03-21 15:18:52 +04:00
records.cc Fixed multi-table-delete for InnoDB tables 2003-02-17 02:14:37 +02:00
repl_failsafe.cc Merge bk-internal.mysql.com:/home/bk/mysql-4.1 2003-03-20 02:06:08 +02:00
repl_failsafe.h Merge with 4.0 2003-03-16 19:17:54 +02:00
set_var.cc Some optimization in CHARSET_INFO: 2003-04-01 12:45:16 +05:00
set_var.h CONVERT class was removed 2003-03-18 17:01:32 +04:00
slave.cc Small-and-safe fix for bug #218: "LOAD DATA INFILE IGNORE is well 2003-04-01 18:19:15 +02:00
slave.h Merge with 4.0.12 2003-03-19 22:25:44 +02:00
spatial.cc my_strncasecmp() is not used anymore. Use my_strncoll() instead. 2003-04-01 14:17:28 +05:00
spatial.h SRID support. 2003-03-18 15:30:32 +04:00
sql_acl.cc Merge with 4.0 2003-04-03 21:19:12 +03:00
sql_acl.h Basically minor code optimizations and cleanups 2002-12-05 03:55:29 +03:00
sql_analyse.cc Merge with 4.0 2003-03-16 19:17:54 +02:00
sql_analyse.h sql_acl.cc, item.h: 2003-03-07 12:21:32 +04:00
sql_base.cc Added support for ULONG division with DIV 2003-03-19 21:23:13 +02:00
sql_cache.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 2003-03-28 16:18:26 +02:00
sql_cache.h made variable query_cache_min_res_unit from QUERY_CACHE_MIN_RESULT_DATA_SIZE (SCRUM) 2003-03-02 21:39:03 +02:00
sql_class.cc Fixed problem with const table named with crashed test suite on MacOSX 2003-04-02 13:06:33 +03:00
sql_class.h Fixed problem with const table named with crashed test suite on MacOSX 2003-04-02 13:06:33 +03:00
sql_crypt.cc - renamed "rnd" to "my_rnd" as the name was too generic (and is an exported 2003-03-18 22:14:02 +01:00
sql_crypt.h
sql_db.cc CONVERT class was removed 2003-03-18 17:01:32 +04:00
sql_delete.cc Fixed bug that binary log was not locked during a DELETE FROM TABLE_NAME; 2003-03-24 23:24:45 +02:00
sql_derived.cc After merge fixes 2003-03-17 15:05:04 +02:00
sql_do.cc fixed subselects with temporary tables (SCRUM) 2003-01-25 02:25:52 +02:00
sql_error.cc - fixed comments so mysql_copyright does not eat the whole files 2003-03-25 13:46:10 +01:00
sql_handler.cc Merge with 4.0.11 2003-02-26 01:03:47 +02:00
sql_help.cc Preparing to client<->server autoconvert 2003-03-17 13:14:04 +04:00
sql_insert.cc Merge with 4.0 2003-03-16 19:17:54 +02:00
sql_lex.cc mbcharlen() is now used instead of ismbhead(). The last one has been removed. 2003-04-01 15:52:09 +05:00
sql_lex.h More OpenGIS compatibility: 2003-03-27 13:09:09 +04:00
sql_list.cc
sql_list.h merging 2003-01-25 13:19:46 +02:00
sql_load.cc mbcharlen() is now used instead of ismbhead(). The last one has been removed. 2003-04-01 15:52:09 +05:00
sql_manager.cc Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes. 2002-11-07 03:54:00 +02:00
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc merging 2003-01-25 13:19:46 +02:00
sql_parse.cc Merge with 4.0 2003-04-03 21:19:12 +03:00
sql_prepare.cc - fixed comments so mysql_copyright does not eat the whole files 2003-03-25 13:46:10 +01:00
sql_rename.cc Merge with 4.0 2003-03-16 19:17:54 +02:00
sql_repl.cc Merge bk-internal.mysql.com:/home/bk/mysql-4.1 2003-03-20 02:06:08 +02:00
sql_repl.h Conflicts relsolving 2003-03-11 16:32:17 +04:00
sql_select.cc Fixes to avoid errors from valgrind 2003-03-18 11:17:48 +02:00
sql_select.h Merge bk-internal:/home/bk/mysql-4.1/ 2003-03-14 20:25:50 +01:00
sql_show.cc Merge with 4.0 2003-04-03 21:19:12 +03:00
sql_sort.h Always use USE_STRCOLL code 2003-01-30 11:15:14 +04:00
sql_string.cc sql_string.cc: 2003-04-01 09:28:53 +05:00
sql_string.h SHOW CREATE TABLE didn't display field names in the proper charset 2003-03-18 13:42:45 +04:00
sql_table.cc Merge bk-internal.mysql.com:/home/bk/mysql-4.1 2003-03-17 15:06:06 +02:00
sql_test.cc Fixed bug in allocation memory in key cache. (Memory was not properly aligned which cased core dumps on sparc CPU's) 2003-03-25 02:37:41 +02:00
sql_udf.cc Some optimization in CHARSET_INFO: 2003-04-01 12:45:16 +05:00
sql_udf.h change structure of udf_func and parameter of functions mysql_drop_func and add_func (SCRUM) 2003-01-09 18:09:21 +05:00
sql_union.cc Fixing a bug #195 2003-03-27 16:11:01 +02:00
sql_update.cc After merge fixes 2003-03-20 21:35:03 +02:00
sql_yacc.yy sql_yacc.yy: 2003-03-28 18:18:26 +04:00
stacktrace.c Merge with 4.0 2003-03-16 19:17:54 +02:00
stacktrace.h
structs.h Merge with 4.0.11 tree to get latest bug fixes 2003-02-17 05:43:37 +02:00
table.cc Some optimization in CHARSET_INFO: 2003-04-01 12:45:16 +05:00
table.h Merge with 4.0.11 2003-02-26 01:03:47 +02:00
thr_malloc.cc fixed bug in determinating uncacheable queries 2003-01-30 22:15:44 +02:00
time.cc Fixed problem when connecting to user without a password. 2003-02-14 11:47:41 +02:00
udf_example.cc extended resolve() and reverse_resolve() UDFs for FreeBSD (SCRUM) 2002-12-16 19:09:48 +04:00
uniques.cc New multi-table-update code 2002-11-29 16:40:18 +02:00
unireg.cc More OpenGIS compatibility: 2003-03-27 13:09:09 +04:00
unireg.h Added support for ULONG division with DIV 2003-03-19 21:23:13 +02:00
watchdog_mysqld