mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
unknown 7412f0fa0c After merge fixes 
Removed compiler warnings
Fixed clashing function name in maria
Disable maria tests from MySQL level for now


BitKeeper/deleted/.del-ha_maria.cc:
  Rename: libmysqld/ha_maria.cc -> BitKeeper/deleted/.del-ha_maria.cc
BitKeeper/etc/ignore:
  added libmysqld/ha_maria.cc
  ---
  added storage/maria/unittest/maria_control unittest/maria_control
  ---
  added *.Tpo
  ---
  added unittest/page_cache_test_file_1
  ---
  added unittest/pagecache_debug.log
  ---
  added unittest/mysys/mf_pagecache_consist_1k-t-big unittest/mysys/mf_pagecache_consist_1kHC-t-big unittest/mysys/mf_pagecache_consist_1kRD-t-big unittest/mysys/mf_pagecache_consist_1kWR-t-big unittest/mysys/mf_pagecache_consist_64k-t-big unittest/mysys/mf_pagecache_consist_64kHC-t-big unittest/mysys/mf_pagecache_consist_64kRD-t-big unittest/mysys/mf_pagecache_consist_64kWR-t-big
  ---
  added unittest/mysys/mf_pagecache_single_64k-t-big
Makefile.am:
  Don't run 'test-unit' by default (takes too long time)
client/mysqldump.c:
  Fixed compiler warning
include/lf.h:
  Remove compiler warnings about not used require_pins constant
include/pagecache.h:
  LSN should be of type ulonglong
  (This fixes some compiler warnings)
mysql-test/r/events_logs_tests.result:
  Make test predictable
mysql-test/r/view.result:
  Make test results predictable
mysql-test/t/disabled.def:
  Disable maria tests for a while
mysql-test/t/events_logs_tests.test:
  Make test predictable
mysql-test/t/view.test:
  Make test results predictable
mysys/lf_alloc-pin.c:
  #warning ->QQ
mysys/lf_hash.c:
  #warning ->QQ
  Removed compiler warnings
mysys/mf_pagecache.c:
  Removed compiler warnings
mysys/my_rename.c:
  Removed compiler warnings
plugin/daemon_example/daemon_example.c:
  Remove compiler warning
sql/ha_ndbcluster.cc:
  Remove compiler warning
sql/udf_example.c:
  Remove compiler warning
storage/maria/lockman.c:
  Changed #warnings to QQ comment
  Removed compiler warnings
storage/maria/ma_blockrec.c:
  Removed compiler warnings
storage/maria/ma_check.c:
  After merge fixes
storage/maria/ma_key.c:
  After merge fixes
storage/maria/ma_packrec.c:
  After merge fixes
storage/maria/ma_rkey.c:
  After merge fixes
storage/maria/ma_sort.c:
  After merge fixes
storage/maria/ma_sp_defs.h:
  Rename clashing function name
storage/maria/ma_sp_key.c:
  Rename clashing function name
storage/maria/ma_test_all.res:
  New test results
storage/maria/ma_unique.c:
  Fixed compiler warning
storage/maria/tablockman.c:
  #warning -> QQ
storage/maria/tablockman.h:
  #warning -> QQ
storage/maria/trnman.c:
  #warning -> QQ
storage/maria/unittest/lockman2-t.c:
  Removed compiler warnings
storage/maria/unittest/ma_control_file-t.c:
  Removed warning for 'maria_control' file not found
storage/maria/unittest/trnman-t.c:
  Removed compiler warnings
storage/ndb/src/mgmapi/mgmapi.cpp:
  Remove compiler warnings
unittest/mysys/mf_pagecache_consist.c:
  Removed compiler warnings
unittest/mysys/my_atomic-t.c:
  Removed compiler warnings
2007-01-26 13:32:02 +02:00
..
examples
share Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2006-12-04 19:11:55 +01:00
.cvsignore
add_errmsg
authors.h
client_settings.h
CMakeLists.txt
contributors.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
event_data_objects.cc Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
event_data_objects.h Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02:00
event_db_repository.cc Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02:00
event_db_repository.h
event_queue.cc Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02:00
event_queue.h
event_scheduler.cc Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
event_scheduler.h
events.cc Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02:00
events.h
field.cc Merge mysql.com:/home/hf/work/22372/my50-22372 2006-12-07 09:27:47 +04:00
field.h Merge mysql.com:/home/hf/work/22372/my50-22372 2006-12-07 09:27:47 +04:00
field_conv.cc Merge 192.168.0.5:mysql/mysql-5.1-maint 2006-11-29 23:53:07 +01:00
filesort.cc Merge with new version 2007-01-23 21:13:26 +02:00
frm_crypt.cc
gen_lex_hash.cc Merge with new version 2007-01-23 21:13:26 +02:00
gstream.cc
gstream.h
ha_ndbcluster.cc After merge fixes 2007-01-26 13:32:02 +02:00
ha_ndbcluster.h bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: only check pk if it is updated 2006-11-30 23:10:11 +01:00
ha_ndbcluster_binlog.cc Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema 2006-12-01 15:49:07 +01:00
ha_ndbcluster_binlog.h Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema 2006-12-01 15:49:07 +01:00
ha_ndbcluster_tables.h Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema 2006-12-01 15:49:07 +01:00
ha_partition.cc Removed compiler warnings 2006-11-27 18:16:08 +02:00
ha_partition.h Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
handler.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2006-12-04 19:11:55 +01:00
handler.h Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean 2006-12-20 00:00:46 +01:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2006-12-04 19:11:55 +01:00
item.h Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt 2006-11-29 11:48:44 +01:00
item_buff.cc
item_cmpfunc.cc Merge bk@192.168.21.1:mysql-5.1-opt 2006-12-06 12:56:11 +04:00
item_cmpfunc.h Merge mysql.com:/home/hf/work/mysql-5.0.clean 2006-11-08 19:09:39 +04:00
item_create.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2006-12-04 19:11:55 +01:00
item_create.h Bug#21114 (Foreign key creation fails to table with name format) 2006-11-02 11:01:53 -07:00
item_func.cc Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean 2006-12-20 00:00:46 +01:00
item_func.h Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean 2006-12-20 00:00:46 +01:00
item_geofunc.cc
item_geofunc.h Bug#21114 (Foreign key creation fails to table with name format) 2006-11-02 11:01:53 -07:00
item_row.cc
item_row.h
item_strfunc.cc Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 2006-12-01 13:02:54 +01:00
item_strfunc.h Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2006-11-16 10:06:36 -07:00
item_subselect.cc Merge bk-internal:/home/bk/mysql-5.1 2006-11-28 17:14:16 +01:00
item_subselect.h Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt 2006-11-29 11:48:44 +01:00
item_sum.cc Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 2006-12-01 13:02:54 +01:00
item_sum.h Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt 2006-11-29 11:48:44 +01:00
item_timefunc.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2006-12-04 19:11:55 +01:00
item_timefunc.h Merge bk@192.168.21.1:mysql-5.0-opt 2006-11-17 10:30:16 +04:00
item_uniq.cc
item_uniq.h
item_xmlfunc.cc Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
item_xmlfunc.h
key.cc Added --debug-info to most clients to detect memory leaks in mysql-test-run 2006-11-21 22:32:58 +02:00
lex.h Merge alik.:/mnt/raid/alik/MySQL/devel/5.1 2006-11-07 16:24:35 +03:00
lex_symbol.h Bug#21114 (Foreign key creation fails to table with name format) 2006-11-02 11:01:53 -07:00
lock.cc
log.cc Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean 2006-12-20 00:00:46 +01:00
log.h Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 2006-12-01 11:35:05 +08:00
log_event.cc Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
log_event.h Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
Makefile.am Merge mysql.com:/home/kent/bk/mysql-5.0-build 2006-11-29 14:35:59 +01:00
matherr.c
message.mc
mf_iocache.cc
my_decimal.cc Merge mysql.com:/home/hf/work/mysql-5.0.clean 2006-11-08 19:09:39 +04:00
my_decimal.h Merge mysql.com:/home/hf/work/mysql-5.0.clean 2006-11-08 19:09:39 +04:00
my_lock.c
mysql_priv.h Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean 2006-12-20 00:00:46 +01:00
mysqld.cc Merge with new version 2007-01-23 21:13:26 +02:00
mysqld.cc.rej Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 2006-11-16 14:38:45 +02:00
mysqld_suffix.h
net_serv.cc Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
nt_servc.cc
nt_servc.h
opt_range.cc Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 2006-12-01 13:02:54 +01:00
opt_range.h
opt_sum.cc
parse_file.cc
parse_file.h Removed compiler warnings 2006-11-27 18:16:08 +02:00
partition_element.h
partition_info.cc Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
partition_info.h
password.c Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
procedure.cc
procedure.h
protocol.cc Merge mysql.com:/home/hf/work/mysql-5.0-mrg 2006-11-17 18:27:28 +04:00
protocol.h Merge mysql.com:/home/hf/work/mysql-4.1-mrg 2006-11-16 23:16:44 +04:00
records.cc Merge mysql.com:/home/hf/work/mysql-5.0.clean 2006-11-08 19:09:39 +04:00
repl_failsafe.cc Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02:00
repl_failsafe.h
rpl_filter.cc
rpl_filter.h
rpl_injector.cc Fixing problem in injector code making NDB tests fire an assertion. 2006-11-13 15:42:01 +01:00
rpl_injector.h Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
rpl_mi.cc
rpl_mi.h
rpl_rli.cc Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02:00
rpl_rli.h Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 2006-11-03 21:11:58 +01:00
rpl_tblmap.cc Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02:00
rpl_tblmap.h
rpl_utility.cc Removed compiler warnings 2006-11-27 18:16:08 +02:00
rpl_utility.h
set_var.cc merge of recent MyISAM changes into Maria. 2006-12-20 18:58:35 +01:00
set_var.h
slave.cc Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
slave.h
sp.cc Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
sp.h
sp_cache.cc Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
sp_cache.h
sp_head.cc Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
sp_head.h
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h
sql_acl.cc Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_base.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2006-12-04 19:11:55 +01:00
sql_binlog.cc Removed compiler warnings 2006-11-27 18:16:08 +02:00
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 2006-12-01 13:02:54 +01:00
sql_cache.h
sql_class.cc Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836 2006-12-05 10:32:16 -05:00
sql_class.h Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean 2006-12-20 00:00:46 +01:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
sql_delete.cc Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
sql_derived.cc
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
sql_help.cc
sql_insert.cc Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
sql_lex.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2006-12-04 19:11:55 +01:00
sql_lex.h Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2006-12-04 19:11:55 +01:00
sql_list.cc
sql_list.h
sql_load.cc Merge mysql.com:/home/hf/work/22372/my50-22372 2006-12-07 09:27:47 +04:00
sql_locale.cc
sql_manager.cc
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean 2006-12-20 00:00:46 +01:00
sql_parse.cc.rej
sql_partition.cc Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
sql_partition.h
sql_plugin.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-30 23:27:16 +02:00
sql_plugin.h
sql_prepare.cc Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
sql_rename.cc Merge mysql.com:/home/my/mysql-5.0 2006-11-30 22:38:12 +02:00
sql_repl.cc Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 2006-12-01 11:35:05 +08:00
sql_repl.h
sql_select.cc Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean 2006-12-20 00:00:46 +01:00
sql_select.h Merge mysql.com:/home/hf/work/mysql-5.0.clean 2006-11-08 19:09:39 +04:00
sql_show.cc Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 2006-12-01 21:12:13 +01:00
sql_show.h bug #21495 Alter table from x engine to ndb and back can cause issue with drop DB:disable distributed drop database if a database contains local tables 2006-11-15 11:13:49 +01:00
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt 2006-11-29 11:48:44 +01:00
sql_table.cc Additional fix for bug#22369 2006-12-07 13:57:39 +01:00
sql_tablespace.cc
sql_test.cc Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean 2006-12-20 00:00:46 +01:00
sql_trigger.cc Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 2006-12-01 13:02:54 +01:00
sql_trigger.h
sql_udf.cc
sql_udf.h
sql_union.cc Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
sql_update.cc Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
sql_view.cc Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +02:00
sql_view.h
sql_yacc.yy Additional fix for bug#22369 2006-12-07 13:57:39 +01:00
stacktrace.c
stacktrace.h
strfunc.cc Merge mysql.com:/home/my/mysql-5.0 2006-11-22 14:11:36 +02:00
structs.h
table.cc Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 2006-12-01 21:12:13 +01:00
table.cc.rej
table.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-29 22:54:11 +02:00
thr_malloc.cc
time.cc Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1 2006-11-10 15:05:38 +03:00
tzfile.h
tztime.cc Merge mysql.com:/home/my/mysql-5.0 2006-11-30 22:38:12 +02:00
tztime.h
udf_example.c After merge fixes 2007-01-26 13:32:02 +02:00
udf_example.def Add the two new functions to udf_example.def so they will be exported by dll's 2006-11-16 16:19:29 +01:00
uniques.cc Merge with new version 2007-01-23 21:13:26 +02:00
unireg.cc Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean 2006-12-20 00:00:46 +01:00
unireg.h