mariadb/sql
unknown 7c5cd4125d merge with 4.0 to get windows fixes
VC++Files/client/mysqlclient.dsp:
  Auto merged
VC++Files/innobase/innobase.dsp:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/include/log0log.h:
  Auto merged
innobase/include/log0log.ic:
  Auto merged
innobase/include/mtr0mtr.h:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
innobase/que/que0que.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
tools/mysqlmanager.c:
  Auto merged
2004-05-27 00:30:28 +03:00
..
examples
share
.cvsignore
add_errmsg
client_settings.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc After merge fixes 2004-05-24 14:42:34 +03:00
field.cc Support for character set conversion in binary protocol: another go 2004-05-25 02:03:49 +04:00
field.h
field_conv.cc
filesort.cc Changed prototype of killed_ptr() to make it more portable 2004-05-26 19:12:49 +03:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_berkeley.cc
ha_berkeley.h
ha_heap.cc
ha_heap.h
ha_innodb.cc Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' 2004-05-19 16:38:12 +03:00
ha_innodb.h
ha_isam.cc
ha_isam.h
ha_isammrg.cc
ha_isammrg.h
ha_myisam.cc Changed prototype of killed_ptr() to make it more portable 2004-05-26 19:12:49 +03:00
ha_myisam.h
ha_myisammrg.cc
ha_myisammrg.h
ha_ndbcluster.cc Fix after running on a 4-node system. 2004-05-26 14:22:49 +02:00
ha_ndbcluster.h Fixed prototype of get_error_message to use String to return error message 2004-05-24 12:35:39 +02:00
handler.cc Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-05-25 12:25:22 +02:00
handler.h Fixed prototype of get_error_message to use String to return error message 2004-05-24 12:35:39 +02:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Support for character set conversion in binary protocol: another go 2004-05-25 02:03:49 +04:00
item.h Support for character set conversion in binary protocol: another go 2004-05-25 02:03:49 +04: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 Merge with 4.0, mainly to get changes to windows project files 2004-05-20 00:54:52 +03:00
item_strfunc.h
item_subselect.cc
item_subselect.h
item_sum.cc
item_sum.h
item_timefunc.cc Support for character set conversion in binary protocol: another go 2004-05-25 02:03:49 +04:00
item_timefunc.h
item_uniq.cc
item_uniq.h
key.cc
lex.h
lex_symbol.h
lock.cc Support for character set conversion in binary protocol: another go 2004-05-25 02:03:49 +04:00
log.cc
log_event.cc merge with 4.0 to get windows fixes 2004-05-27 00:30:28 +03:00
log_event.h
Makefile.am Merge with 4.0, mainly to get changes to windows project files 2004-05-20 00:54:52 +03:00
matherr.c
mf_iocache.cc
my_lock.c
mysql_priv.h Support for character set conversion in binary protocol: another go 2004-05-25 02:03:49 +04:00
mysqld.cc VC++ portability fix 2004-05-26 21:45:58 +03:00
mysqld_suffix.h New MYSQL_SERVER_SUFFIX usage (for easier compilation) 2004-05-25 02:28:44 +03:00
net_serv.cc
nt_servc.cc
nt_servc.h
opt_range.cc Support for character set conversion in binary protocol: another go 2004-05-25 02:03:49 +04:00
opt_range.h
opt_sum.cc
password.c
procedure.cc
procedure.h
protocol.cc Support for character set conversion in binary protocol: another go 2004-05-25 02:03:49 +04:00
protocol.h Support for character set conversion in binary protocol: another go 2004-05-25 02:03:49 +04:00
protocol_cursor.cc
records.cc
repl_failsafe.cc
repl_failsafe.h
set_var.cc Merge with 4.0 to get fixes for Windows project files 2004-05-25 02:47:25 +03:00
set_var.h
slave.cc Merge with 4.0 to get fixes for Windows project files 2004-05-25 02:47:25 +03:00
slave.h
spatial.cc
spatial.h
sql_acl.cc Fix for bug which caused grant.test fail on darwin7.3. We were converting db and table 2004-05-22 23:41:58 +04:00
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_base.cc
sql_bitmap.h Changed prototype of killed_ptr() to make it more portable 2004-05-26 19:12:49 +03:00
sql_cache.cc Fix for bug which caused grant.test fail on darwin7.3. We were converting db and table 2004-05-22 23:41:58 +04:00
sql_cache.h
sql_class.cc Support for character set conversion in binary protocol: another go 2004-05-25 02:03:49 +04:00
sql_class.h Changed prototype of killed_ptr() to make it more portable 2004-05-26 19:12:49 +03:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_db.cc Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-05-24 14:49:47 +05:00
sql_delete.cc
sql_derived.cc
sql_do.cc
sql_error.cc
sql_handler.cc Merge with 4.0, mainly to get changes to windows project files 2004-05-20 00:54:52 +03:00
sql_help.cc
sql_insert.cc Changed prototype of killed_ptr() to make it more portable 2004-05-26 19:12:49 +03:00
sql_lex.cc Fix for bug which caused temp_table.test fail on Darwin 7.3 2004-05-24 15:48:19 +04:00
sql_lex.h Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-05-24 21:01:35 +05:00
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 Support for character set conversion in binary protocol: another go 2004-05-25 02:03:49 +04:00
sql_prepare.cc changed comment for LONG_DATA_COMMAND 2004-05-25 19:52:05 +04:00
sql_rename.cc
sql_repl.cc
sql_repl.h
sql_select.cc 1. Some optimization when conversion is not needed. 2004-05-25 15:54:03 +05:00
sql_select.h
sql_show.cc 1. Some optimization when conversion is not needed. 2004-05-25 15:54:03 +05:00
sql_sort.h
sql_state.c
sql_string.cc sql_string.h: 2004-05-25 16:05:33 +05:00
sql_string.h sql_string.h: 2004-05-25 16:05:33 +05:00
sql_table.cc Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-05-25 12:25:22 +02:00
sql_test.cc
sql_udf.cc
sql_udf.h
sql_union.cc asserting table->file->enable_indexes() in union re-execution 2004-05-21 09:31:28 +02:00
sql_update.cc
sql_yacc.yy Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-05-24 21:01:35 +05:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h
table.cc
table.h
thr_malloc.cc
time.cc Support for character set conversion in binary protocol: another go 2004-05-25 02:03:49 +04:00
udf_example.cc
uniques.cc
unireg.cc
unireg.h
watchdog_mysqld