mariadb/sql
unknown 4b85d31b2d Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1


include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
2002-11-24 17:35:24 +03:00
..
share error messages fix 2002-11-23 22:11:53 +02:00
.cvsignore
add_errmsg
cache_manager.cc
cache_manager.h
ChangeLog
convert.cc Merge with 4.0.3 2002-08-30 12:40:40 +03:00
custom_conf.h
derror.cc
des_key_file.cc
field.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
field.h Put temporary files in binlog cache when using BEGIN/COMMIT 2002-11-07 04:02:37 +02:00
field_conv.cc Some charset code clean-ups 2002-11-06 17:01:12 +04:00
filesort.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
frm_crypt.cc
gen_lex_hash.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
gstream.cc Some macros to make life easier 2002-11-13 17:58:07 +04:00
gstream.h Fixes and code cleanups after merge with 4.0.3 2002-10-02 13:33:08 +03:00
ha_berkeley.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
ha_berkeley.h Portability fix when using -DBIG_TABLES 2002-11-14 12:21:36 +02:00
ha_heap.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
ha_heap.h auto_increment for heap tables 2002-10-07 17:49:03 +05:00
ha_innodb.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
ha_innodb.h Many files: 2002-10-29 23:16:46 +02:00
ha_isam.cc Portability fix when using -DBIG_TABLES 2002-11-14 12:21:36 +02:00
ha_isam.h Fixed some bugs after last merge 2002-06-20 15:25:02 +03:00
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 Fix some ORDER BY ... DESC problems with InnoDB 2002-09-27 08:23:51 +03:00
ha_myisam.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
ha_myisam.h merge 2002-07-23 20:39:36 +03:00
ha_myisammrg.cc myisammrg::records_in_range 2002-11-17 18:54:23 +01:00
ha_myisammrg.h myisammrg::records_in_range 2002-11-17 18:54:23 +01:00
handler.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
handler.h Merge with 4.0 2002-11-21 15:56:48 +02:00
hash_filo.cc
hash_filo.h Merge with 4.0 2002-11-21 15:56:48 +02:00
hostname.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
init.cc Portability fixes to be able to compile MySQL with VC++ 2002-10-08 22:28:24 +03:00
item.cc Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 2002-11-23 20:32:02 +02:00
item.h fix of selfreference bug 2002-11-24 11:18:32 +02:00
item_buff.cc BINARY charset is now used instead of binary_flag 2002-10-25 13:58:32 +05:00
item_cmpfunc.cc Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 2002-11-23 20:32:02 +02:00
item_cmpfunc.h Fixes after merge with 4.0 2002-11-21 22:25:53 +02:00
item_create.cc One more commit to do the merge of new 4.1 tree 2002-10-06 13:42:16 +04:00
item_create.h One more commit to do the merge of new 4.1 tree 2002-10-06 13:42:16 +04:00
item_func.cc Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 2002-11-23 20:32:02 +02:00
item_func.h Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 2002-11-23 20:32:02 +02:00
item_strfunc.cc Merge mysql.com:/home/pz/mysql/mysql-4.1-root 2002-11-24 17:35:24 +03:00
item_strfunc.h Merge.... 2002-11-24 17:26:26 +03:00
item_subselect.cc prevent using references on sum function (except HAVING clouse of current select) and forward references 2002-11-21 11:01:33 +02:00
item_subselect.h fixed cyclic reference bug 2002-11-14 00:26:18 +02:00
item_sum.cc prevent using references on sum function (except HAVING clouse of current select) and forward references 2002-11-21 11:01:33 +02:00
item_sum.h prevent using references on sum function (except HAVING clouse of current select) and forward references 2002-11-21 11:01:33 +02:00
item_timefunc.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
item_timefunc.h These functions are now UCS2 compatible: 2002-11-12 17:32:36 +04:00
item_uniq.cc
item_uniq.h prevent using references on sum function (except HAVING clouse of current select) and forward references 2002-11-21 11:01:33 +02:00
key.cc my_sortcmp -> my_strnncoll 2002-10-09 16:33:35 +05:00
lex.h Merge.... 2002-11-24 17:26:26 +03:00
lex_symbol.h
lock.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
log.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
log_event.cc Fixes after merge with 4.0 2002-11-21 22:25:53 +02:00
log_event.h Merge with 4.0 2002-11-21 15:56:48 +02:00
Makefile.am add help command on server side 2002-10-28 17:44:19 +04:00
matherr.c
mf_iocache.cc
mini_client.cc Merge.... 2002-11-24 17:26:26 +03:00
mini_client.h New SET syntax & system variables. 2002-07-23 18:31:22 +03:00
my_lock.c
mysql_priv.h Merge mysql.com:/home/pz/mysql/mysql-4.1-root 2002-11-24 17:35:24 +03:00
mysqld.cc Merge.... 2002-11-24 17:26:26 +03:00
net_pkg.cc Portability fixes to be able to compile MySQL with VC++ 2002-10-08 22:28:24 +03:00
net_serv.cc merging 2002-10-04 14:15:59 +03:00
nt_servc.cc Typo fix (duplicate functions body) 2002-11-12 22:11:59 -02:00
nt_servc.h Added optional NT service and fix the TZ variable bug 2002-10-16 21:51:03 -02:00
opt_ft.cc
opt_ft.h
opt_range.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
opt_range.h Merge with 4.0.3 2002-08-30 12:40:40 +03:00
opt_sum.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
password.c SCRUM: Main change for Secure connection handling. Still needs some more coding. Commit 2002-11-24 17:07:53 +03:00
procedure.cc
procedure.h USER(), DATABASE() and CHARSET() functions are now UCS2 compatible 2002-11-11 18:43:33 +04:00
records.cc New SET syntax & system variables. 2002-07-23 18:31:22 +03:00
repl_failsafe.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
repl_failsafe.h New SET syntax & system variables. 2002-07-23 18:31:22 +03:00
set_var.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
set_var.h Merge with 4.0 2002-11-21 15:56:48 +02:00
slave.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
slave.h Merge with 4.0 2002-11-21 15:56:48 +02:00
spatial.cc Spatial code cleanup 2002-08-22 12:21:58 +05:00
spatial.h Fixes and code cleanups after merge with 4.0.3 2002-10-02 13:33:08 +03:00
sql_acl.cc Merge.... 2002-11-24 17:26:26 +03:00
sql_acl.h Merge.... 2002-11-24 17:26:26 +03:00
sql_analyse.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
sql_analyse.h All String->set() now have charset argument 2002-10-30 16:19:43 +04:00
sql_base.cc fixed bug with thd->allow_sum_func value in subselect 2002-11-23 21:55:39 +02:00
sql_cache.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
sql_cache.h new status variable (number of queries deleted because of low memory) 2002-11-17 20:41:25 +02:00
sql_class.cc Fixes after merge with 4.0 2002-11-21 22:25:53 +02:00
sql_class.h Merge mysql.com:/home/pz/mysql/mysql-4.1-root 2002-11-24 17:35:24 +03:00
sql_crypt.cc
sql_crypt.h
sql_db.cc Fixes after merge with 4.0 2002-11-21 22:25:53 +02:00
sql_delete.cc Fixes after merge with 4.0 2002-11-21 22:25:53 +02:00
sql_derived.cc Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 2002-11-16 14:31:48 +02:00
sql_do.cc Fixes and code cleanups after merge with 4.0.3 2002-10-02 13:33:08 +03:00
sql_error.cc protocol merge 2002-11-22 10:20:14 -08:00
sql_handler.cc support for HA_READ_PREFIX_LAST_OR_PREV in headres 2002-10-25 14:09:47 +00:00
sql_help.cc addition correction for 'help' command 2002-10-30 17:38:07 +04:00
sql_insert.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
sql_lex.cc Fixes after merge with 4.0 2002-11-21 22:25:53 +02:00
sql_lex.h Fixes after merge with 4.0 2002-11-21 22:25:53 +02:00
sql_list.cc
sql_list.h Fixes and code cleanups after merge with 4.0.3 2002-10-02 13:33:08 +03:00
sql_load.cc Merge with 4.0 2002-11-21 15:56:48 +02: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 merge 2002-07-29 18:37:15 +03:00
sql_parse.cc Merge.... 2002-11-24 17:26:26 +03:00
sql_prepare.cc client_test.c: 2002-11-22 18:30:55 -08:00
sql_rename.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
sql_repl.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
sql_repl.h Put temporary files in binlog cache when using BEGIN/COMMIT 2002-11-07 04:02:37 +02:00
sql_select.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
sql_select.h fixed cyclic reference bug 2002-11-14 00:26:18 +02:00
sql_show.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
sql_sort.h
sql_string.cc wild_case_compate(&String, &String, escape) doesn't exist anymor 2002-11-14 17:25:34 +04:00
sql_string.h wild_case_compate(&String, &String, escape) doesn't exist anymor 2002-11-14 17:25:34 +04:00
sql_table.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
sql_test.cc Small fix to avoid problems in building with --without-debug 2002-11-07 20:11:55 +02:00
sql_udf.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
sql_udf.h
sql_union.cc lot's of fixes with test cases 2002-11-18 18:28:51 +02:00
sql_update.cc Fixes after merge with 4.0 2002-11-21 22:25:53 +02:00
sql_yacc.yy Merge.... 2002-11-24 17:26:26 +03:00
stacktrace.c merged 2002-11-05 17:10:31 +01:00
stacktrace.h
structs.h Fixes and code cleanups after merge with 4.0.3 2002-10-02 13:33:08 +03:00
table.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
table.h Merge with 4.0 2002-11-21 15:56:48 +02:00
thr_malloc.cc
time.cc Update after last merge. Fixes some wrong test results. 2002-10-03 16:54:26 +03:00
udf_example.cc Update mysql-test results after merge 2002-09-18 02:21:29 +03:00
uniques.cc Fixes and code cleanups after merge with 4.0.3 2002-10-02 13:33:08 +03:00
unireg.cc Put temporary files in binlog cache when using BEGIN/COMMIT 2002-11-07 04:02:37 +02:00
unireg.h Merge with 4.0.4 2002-10-02 17:55:12 +03:00
watchdog_mysqld