mariadb/sql
unknown 0a1381e05b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4089


mysql-test/r/bdb.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
sql/handler.h:
  Auto merged
2004-06-29 13:51:35 +05:00
..
examples
share
.cvsignore
add_errmsg
client_settings.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
field.cc Merge with 4.0 to get the latest bug patches to 4.1 2004-06-25 20:13:05 +03:00
field.h Merge with 4.0 to get the latest bug patches to 4.1 2004-06-25 20:13:05 +03:00
field_conv.cc
filesort.cc Added missing root user to mysql.user on windows. (Bug #4242) 2004-06-25 18:49:36 +03:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_berkeley.cc after merge fixed 2004-06-26 14:21:32 +02:00
ha_berkeley.h portability fix 2004-06-27 20:30:48 +02:00
ha_heap.cc
ha_heap.h Added missing root user to mysql.user on windows. (Bug #4242) 2004-06-25 18:49:36 +03:00
ha_innodb.cc
ha_innodb.h Added missing root user to mysql.user on windows. (Bug #4242) 2004-06-25 18:49:36 +03:00
ha_isam.cc
ha_isam.h Added missing root user to mysql.user on windows. (Bug #4242) 2004-06-25 18:49:36 +03:00
ha_isammrg.cc
ha_isammrg.h Added missing root user to mysql.user on windows. (Bug #4242) 2004-06-25 18:49:36 +03:00
ha_myisam.cc Added missing root user to mysql.user on windows. (Bug #4242) 2004-06-25 18:49:36 +03:00
ha_myisam.h Added missing root user to mysql.user on windows. (Bug #4242) 2004-06-25 18:49:36 +03:00
ha_myisammrg.cc
ha_myisammrg.h Added missing root user to mysql.user on windows. (Bug #4242) 2004-06-25 18:49:36 +03:00
ha_ndbcluster.cc
ha_ndbcluster.h Added missing root user to mysql.user on windows. (Bug #4242) 2004-06-25 18:49:36 +03:00
handler.cc Merge with 4.0 to get the latest bug patches to 4.1 2004-06-25 20:13:05 +03:00
handler.h Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-29 13:51:35 +05:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc
item.h unused field removed 2004-06-28 20:01:11 +03:00
item_buff.cc
item_cmpfunc.cc
item_cmpfunc.h
item_create.cc
item_create.h
item_func.cc
item_func.h
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc
item_strfunc.h
item_subselect.cc
item_subselect.h
item_sum.cc
item_sum.h
item_timefunc.cc
item_timefunc.h
item_uniq.cc
item_uniq.h
key.cc
lex.h
lex_symbol.h
lock.cc
log.cc
log_event.cc
log_event.h
Makefile.am tell make how to create mysql_tzinfo_to_sql.cc 2004-06-27 20:17:32 +02:00
matherr.c
mf_iocache.cc
my_lock.c
mysql_priv.h Merge bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-25 21:56:42 +03:00
mysqld.cc BUG#4276 - socket path too long 2004-06-26 19:37:48 +02:00
mysqld_suffix.h
net_serv.cc
nt_servc.cc
nt_servc.h
opt_range.cc merged 2004-06-25 23:20:46 +02:00
opt_range.h
opt_sum.cc
password.c
procedure.cc
procedure.h
protocol.cc
protocol.h
protocol_cursor.cc
records.cc Added missing root user to mysql.user on windows. (Bug #4242) 2004-06-25 18:49:36 +03:00
repl_failsafe.cc
repl_failsafe.h
set_var.cc
set_var.h
slave.cc
slave.h
spatial.cc
spatial.h
sql_acl.cc
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_base.cc Merge with 4.0 to get the latest bug patches to 4.1 2004-06-25 20:13:05 +03:00
sql_bitmap.h
sql_cache.cc
sql_cache.h
sql_class.cc
sql_class.h
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_db.cc
sql_delete.cc
sql_derived.cc
sql_do.cc
sql_error.cc
sql_handler.cc After merge fixes 2004-06-25 21:56:23 +03:00
sql_help.cc
sql_insert.cc After merge fixes 2004-06-25 21:56:23 +03:00
sql_lex.cc
sql_lex.h
sql_list.cc
sql_list.h
sql_load.cc
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc removed using lex->select_lex.options is SHOW TABLE [STATUS] commands (BUG#4288) 2004-06-27 00:34:05 +02:00
sql_prepare.cc
sql_rename.cc
sql_repl.cc
sql_repl.h
sql_select.cc after merge fixed 2004-06-26 14:21:32 +02:00
sql_select.h
sql_show.cc
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h
sql_table.cc Added missing my_time.c file to mysqlclient project 2004-06-28 00:42:02 +03:00
sql_test.cc
sql_udf.cc
sql_udf.h
sql_union.cc
sql_update.cc
sql_yacc.yy removed using lex->select_lex.options is SHOW TABLE [STATUS] commands (BUG#4288) 2004-06-27 00:34:05 +02:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h
table.cc
table.h
thr_malloc.cc
time.cc
tzfile.h
tztime.cc memory leak in tz code closed 2004-06-27 01:32:52 +02:00
tztime.h Removed mysql_tzinfo_to_sql dependancy on sql/mysql_priv.h for circumventing 2004-06-25 21:04:48 +04:00
udf_example.cc
uniques.cc
unireg.cc
unireg.h
watchdog_mysqld