mariadb/sql
unknown a858d8e84a Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2007-02-16 09:02:02 -07:00
..
examples After merge fix 2007-02-03 09:26:11 +01:00
share
.cvsignore
add_errmsg
client_settings.h
CMakeLists.txt
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
field.cc Merge mysql.com:/home/ram/work/b19690/b19690.4.1 2007-01-31 10:07:56 +04:00
field.h Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 2007-02-13 23:35:06 +01:00
field_conv.cc Bug #22344: InnoDB keys act strange on datetime vs timestamp comparison 2007-02-06 11:08:57 +02:00
filesort.cc Merge olga.mysql.com:/home/igor/dev-opt/mysql-4.1-opt-bug24653 2007-01-25 21:01:28 -08:00
frm_crypt.cc
gen_lex_hash.cc gen_lex_hash.cc: 2007-01-31 00:06:42 +01:00
gstream.cc
gstream.h
ha_archive.cc
ha_archive.h
ha_berkeley.cc
ha_berkeley.h
ha_blackhole.cc
ha_blackhole.h
ha_federated.cc
ha_federated.h
ha_heap.cc
ha_heap.h
ha_innodb.cc
ha_innodb.h Applied innodb-5.0-ss1230 snapshot 2007-01-21 17:58:02 -07:00
ha_myisam.cc After merge fix (WL#3567). 2007-01-31 18:32:53 +04:00
ha_myisam.h
ha_myisammrg.cc After merge fix (WL#3567). 2007-01-31 18:32:53 +04:00
ha_myisammrg.h
ha_ndbcluster.cc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2007-02-08 00:00:14 +07:00
ha_ndbcluster.h NdbScanOperation.hpp, NdbScanOperation.cpp, ha_ndbcluster.cc: 2007-02-07 11:36:34 +01:00
handler.cc another valgrind error fix for 4.1(backport from 5.0) 2007-02-02 17:18:42 +04:00
handler.h
hash_filo.cc
hash_filo.h
hostname.cc
init.cc Merge mysql.com:/home/ram/work/b19690/b19690.4.1 2007-01-31 10:07:56 +04:00
item.cc Merge mysql.com:/home/hf/work/20691/my50-20691 2007-02-13 01:23:23 +04:00
item.h Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 2007-01-26 16:36:50 +04:00
item_buff.cc
item_cmpfunc.cc Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 2007-02-16 09:02:02 -07:00
item_cmpfunc.h Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 2007-02-16 09:02:02 -07:00
item_create.cc
item_create.h
item_func.cc Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt 2007-01-26 16:28:32 +04:00
item_func.h
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc
item_strfunc.h
item_subselect.cc Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 2007-02-16 09:02:02 -07:00
item_subselect.h Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 2007-02-16 09:02:02 -07:00
item_sum.cc after-merge fix. 2007-01-31 11:14:32 +04:00
item_sum.h
item_timefunc.cc Merge 192.168.0.10:mysql/mysql-5.0-maint 2007-02-06 14:48:22 +01:00
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 Avoid problem with "noinst_HEADERS" being sucked into "mysqld_LDADD" if openssl_libs and yassl_libs are empty strings 2007-02-07 15:11:03 +01:00
matherr.c
message.mc
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-02-14 10:47:39 -05:00
mysqld.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 2007-02-06 14:45:08 +01:00
mysqld.cc.rej Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2007-01-22 03:33:59 +02:00
mysqld_suffix.h
net_serv.cc Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943 2007-01-29 14:33:53 +01:00
nt_servc.cc
nt_servc.h
opt_range.cc valgrind error fix 2007-02-12 19:28:49 +04:00
opt_range.h
opt_sum.cc Merge olga.mysql.com:/home/igor/dev-opt/mysql-4.1-opt-bug24987 2007-01-30 13:14:52 -08:00
parse_file.cc
parse_file.h
password.c
procedure.cc
procedure.h
protocol.cc
protocol.h
records.cc
repl_failsafe.cc Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943 2007-01-29 14:33:53 +01:00
repl_failsafe.h
set_var.cc Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943 2007-01-29 16:19:59 +01:00
set_var.h Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-m,c-gca 2007-01-26 14:47:35 -05:00
slave.cc Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 2007-02-05 10:20:47 +04:00
slave.h
sp.cc
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc Bug#12976 (stored procedures local variables of type bit) 2007-02-06 16:01:22 -07:00
sp_head.h
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h
sql_acl.cc
sql_acl.h
sql_analyse.cc Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 2007-02-06 17:18:43 +04:00
sql_analyse.h
sql_array.h
sql_base.cc BUG#25575: ERROR 1052 (Column in from clause is ambiguous) with sub-join 2007-01-31 16:04:38 +02:00
sql_bitmap.h
sql_cache.cc Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0 2007-01-25 20:10:40 +03:00
sql_cache.h
sql_class.cc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-24 09:13:47 +07:00
sql_class.h Manual merge. 2007-01-15 13:10:07 +03:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc
sql_delete.cc Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 2007-02-01 11:07:17 +02:00
sql_derived.cc
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc
sql_help.cc
sql_insert.cc Bug#23170: LAST_INSERT_ID isn't reset to 0 in INSERT .. SELECT when no rows were 2007-02-09 22:25:09 +03:00
sql_lex.cc Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 2007-02-16 09:02:02 -07:00
sql_lex.h Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 2007-02-16 09:02:02 -07:00
sql_list.cc
sql_list.h Manual merge. 2007-01-15 13:10:07 +03:00
sql_load.cc
sql_locale.cc
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 2007-02-06 14:45:08 +01:00
sql_prepare.cc Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint 2007-02-13 09:56:56 +01:00
sql_rename.cc
sql_repl.cc Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943 2007-01-29 14:33:53 +01:00
sql_repl.h
sql_select.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 2007-02-13 23:35:06 +01:00
sql_select.h
sql_show.cc Bug#24630 Subselect query crashes mysqld 2007-02-12 16:06:14 +04:00
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h
sql_table.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 2007-01-26 16:36:50 +04:00
sql_test.cc
sql_trigger.cc
sql_trigger.h
sql_udf.cc
sql_udf.h
sql_union.cc
sql_update.cc Fixed bug #25931. 2007-02-07 14:41:57 -08:00
sql_view.cc sql_view.cc: 2007-02-11 22:52:12 +03:00
sql_view.h
sql_yacc.yy Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 2007-02-16 09:02:02 -07:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h
table.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 2007-02-13 23:35:06 +01:00
table.h Bug#24630 Subselect query crashes mysqld 2007-02-12 16:06:14 +04:00
thr_malloc.cc
time.cc
tzfile.h
tztime.cc
tztime.h
udf_example.c
udf_example.def
uniques.cc
unireg.cc Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 2007-02-12 14:49:34 +01:00
unireg.h
watchdog_mysqld