mariadb/sql
unknown e9c1e75b48 Merge 4.1 -> 5.0
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
VC++Files/sql/mysqld.dsp:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.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_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
tests/client_test.c:
  Auto merged
2004-05-07 18:52:06 +02:00
..
examples
share Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
.cvsignore
add_errmsg
client_settings.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
field.cc Merge with 4.0.19 2004-05-05 17:05:24 +03:00
field.h
field_conv.cc
filesort.cc
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_berkeley.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
ha_berkeley.h Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
ha_heap.cc
ha_heap.h
ha_innodb.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
ha_innodb.h Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
ha_isam.cc
ha_isam.h
ha_isammrg.cc
ha_isammrg.h caching of queries with isammerge tables forbiden using general way 2004-05-05 21:21:41 +03:00
ha_myisam.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
ha_myisam.h
ha_myisammrg.cc
ha_myisammrg.h
ha_ndbcluster.cc
ha_ndbcluster.h
handler.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
handler.h Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
item.h Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
item_buff.cc
item_cmpfunc.cc
item_cmpfunc.h Fixed (portability) bug in handler.h, and tried to silence cast warnings on some platforms. 2004-05-06 19:55:12 +02:00
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 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 2004-05-05 21:24:45 +03:00
item_strfunc.h
item_subselect.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
item_subselect.h Fixed (portability) bug in handler.h, and tried to silence cast warnings on some platforms. 2004-05-06 19:55:12 +02:00
item_sum.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
item_sum.h Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
item_timefunc.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
item_timefunc.h
item_uniq.cc
item_uniq.h
key.cc
lex.h Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
lex_symbol.h
lock.cc
log.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
log_event.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
log_event.h
Makefile.am Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
matherr.c
mf_iocache.cc
my_lock.c
mysql_priv.h Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
mysqld.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
net_serv.cc
nt_servc.cc
nt_servc.h
opt_range.cc
opt_range.h
opt_sum.cc
password.c
procedure.cc
procedure.h
protocol.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
protocol.h
protocol_cursor.cc
records.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
repl_failsafe.cc
repl_failsafe.h
set_var.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
set_var.h
slave.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
slave.h Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sp.cc
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc
sp_head.h
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h Fixed (portability) bug in handler.h, and tried to silence cast warnings on some platforms. 2004-05-06 19:55:12 +02:00
sql_acl.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sql_acl.h Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sql_analyse.cc
sql_analyse.h
sql_base.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sql_bitmap.h
sql_cache.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sql_cache.h
sql_class.cc
sql_class.h Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_db.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sql_delete.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sql_derived.cc
sql_do.cc
sql_error.cc
sql_handler.cc
sql_help.cc
sql_insert.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sql_lex.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sql_lex.h Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sql_list.cc
sql_list.h
sql_load.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sql_prepare.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sql_rename.cc
sql_repl.cc
sql_repl.h
sql_select.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sql_select.h Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sql_show.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sql_sort.h
sql_state.c
sql_string.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sql_string.h
sql_table.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sql_test.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sql_udf.cc
sql_udf.h
sql_union.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sql_update.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sql_yacc.yy Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h Merge with 4.0.19 2004-05-05 17:05:24 +03:00
table.cc Merge with 4.0.19 2004-05-05 17:05:24 +03:00
table.h Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
thr_malloc.cc
time.cc
udf_example.cc
uniques.cc
unireg.cc
unireg.h
watchdog_mysqld