database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity
Files
24bbc92bddaa4e7e99c6e6d3c1e50d05f87e6507
mariadb/sql
History
unknown 24bbc92bdd Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  mysql.com:/home/my/mysql-5.1


BUILD/SETUP.sh:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
sql/log_event.cc:
  Manual merge
sql/sql_binlog.cc:
  Manual merge
2006-11-27 14:07:52 +02:00
..
examples
Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2
2006-10-16 17:39:38 +10:00
share
Bug#21114 (Foreign key creation fails to table with name format)
2006-11-02 11:01:53 -07:00
.cvsignore
…
add_errmsg
…
authors.h
errmsg.txt:
2006-09-07 13:52:30 +10:00
client_settings.h
…
CMakeLists.txt
Refactoring: Moved master info functionality into rpl_mi.cc to
2006-10-31 16:51:51 +01:00
contributors.h
…
custom_conf.h
…
derror.cc
…
des_key_file.cc
…
discover.cc
…
event_data_objects.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +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
WL#3337 (Event scheduler new architecture)
2006-09-12 12:26:12 +02:00
event_scheduler.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
event_scheduler.h
WL#3337 (Event scheduler new architecture)
2006-09-12 12:26:12 +02:00
events.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
events.h
Fix for bug#22662 Inconsistent values displayed for event_scheduler
2006-09-25 17:22:23 +02:00
field_conv.cc
Added --debug-info to most clients to detect memory leaks in mysql-test-run
2006-11-21 22:32:58 +02:00
field.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
field.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-21 23:12:45 +02:00
filesort.cc
Merge mysql.com:/home/my/mysql-5.0
2006-11-22 14:11:36 +02:00
frm_crypt.cc
…
gen_lex_hash.cc
…
gstream.cc
…
gstream.h
…
ha_ndbcluster_binlog.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
ha_ndbcluster_binlog.h
This patch makes ndbcluster_hton not static. I have a second patch for ndbcluster_hton to be static, but I want to talk to Jonas first.
2006-10-01 11:17:59 -07:00
ha_ndbcluster_tables.h
Added --debug-info to most clients to detect memory leaks in mysql-test-run
2006-11-21 22:32:58 +02:00
ha_ndbcluster.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
ha_ndbcluster.h
Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
2006-10-25 18:41:17 +10:00
ha_partition.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
ha_partition.h
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
2006-10-18 15:17:47 +02:00
handler.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
handler.h
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
2006-11-07 06:59:51 +01:00
hash_filo.cc
…
hash_filo.h
…
hostname.cc
…
init.cc
…
item_buff.cc
Bug#22138: Unhandled NULL caused server crash
2006-10-11 19:44:12 +04:00
item_cmpfunc.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
item_cmpfunc.h
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-10-19 16:43:46 +02:00
item_create.cc
Bug#21114 (Foreign key creation fails to table with name format)
2006-11-02 11:01:53 -07: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
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
item_func.h
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-11-06 20:42:28 -05: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 zippy.cornsilk.net:/home/cmiller/work/mysql/bug10963/my50-bug10963
2006-11-08 10:12:06 -05:00
item_strfunc.h
BUG#18198
2006-09-26 02:25:23 -04:00
item_subselect.cc
Merge mysql.com:/home/my/mysql-5.0
2006-11-22 14:11:36 +02:00
item_subselect.h
…
item_sum.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-21 23:12:45 +02:00
item_sum.h
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime
2006-10-23 12:35:56 +04:00
item_timefunc.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
2006-11-27 14:07:52 +02:00
item_timefunc.h
Bug#21811 Odd casting with date + INTERVAL arithmetic
2006-10-02 12:37:01 +02:00
item_uniq.cc
…
item_uniq.h
…
item_xmlfunc.cc
Bug#22823 gt and lt operators appear to be reversed in ExtractValue() command
2006-10-23 14:17:57 +05:00
item_xmlfunc.h
BUG#18198
2006-09-26 02:25:23 -04:00
item.cc
Merge mysql.com:/usr/home/bar/mysql-5.0.b21505
2006-11-09 14:46:01 +04:00
item.h
Merge mysql.com:/usr/home/bar/mysql-5.0.b21505
2006-11-09 14:46:01 +04:00
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_symbol.h
Bug#21114 (Foreign key creation fails to table with name format)
2006-11-02 11:01:53 -07:00
lex.h
Merge alik.:/mnt/raid/alik/MySQL/devel/5.1
2006-11-07 16:24:35 +03:00
lock.cc
Fix for Bug #17544 "Cannot do atomic log rotate",
2006-10-13 17:26:46 +04:00
log_event.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
2006-11-27 14:07:52 +02:00
log_event.h
Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
2006-11-14 13:04:40 +02:00
log.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
log.h
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
2006-10-24 17:00:23 +04:00
Makefile.am
Remove compiler warnings
2006-11-20 22:42:06 +02: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.1-marvel
2006-11-27 14:07:52 +02:00
mysqld_suffix.h
…
mysqld.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
2006-11-27 14:07:52 +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
net_serv.cc
Merge mysql.com:/home/my/mysql-5.0
2006-11-22 14:11:36 +02:00
nt_servc.cc
…
nt_servc.h
…
opt_range.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
opt_range.h
Fix for bug #23762: partition.test fails (partition_hash, partition_pruning as well)
2006-11-02 17:11:53 +04:00
opt_sum.cc
Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge
2006-10-18 18:51:39 +10:00
parse_file.cc
Bug#21370: View renaming lacks tablename_to_filename encoding
2006-10-16 22:42:03 +05:00
parse_file.h
Fix for bug#15228 "'invalid access to non-static data member'
2006-10-20 15:47:52 +04:00
partition_element.h
…
partition_info.cc
Fixed a lot of compiler warnings (Mainly in mysqld and instance manager)
2006-11-01 19:41:09 +02:00
partition_info.h
BUG#18198: Partition function handling
2006-10-02 15:52:29 -04:00
password.c
…
procedure.cc
…
procedure.h
…
protocol.cc
Fixed a lot of compiler warnings (Mainly in mysqld and instance manager)
2006-11-01 19:41:09 +02:00
protocol.h
…
records.cc
…
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
…
rpl_mi.cc
Refactoring: Moved master info functionality into rpl_mi.cc to
2006-10-31 16:51:51 +01:00
rpl_mi.h
Refactoring: Moved master info functionality into rpl_mi.cc to
2006-10-31 16:51:51 +01:00
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
WL#3259 (RBR with more columns on slave than master):
2006-09-13 19:25:12 +02:00
rpl_utility.h
WL#3259 (RBR with more columns on slave than master):
2006-09-13 19:25:12 +02:00
set_var.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
set_var.h
…
slave.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
slave.h
Refactoring: Moved master info functionality into rpl_mi.cc to
2006-10-31 16:51:51 +01:00
sp_cache.cc
…
sp_cache.h
…
sp_head.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
sp_head.h
…
sp_pcontext.cc
…
sp_pcontext.h
…
sp_rcontext.cc
…
sp_rcontext.h
…
sp.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-02 17:51:59 -05:00
sp.h
…
spatial.cc
…
spatial.h
…
sql_acl.cc
Merge mysql.com:/home/my/mysql-5.0
2006-11-22 14:11:36 +02:00
sql_acl.h
…
sql_analyse.cc
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305
2006-09-28 14:33:39 -04:00
sql_analyse.h
…
sql_array.h
…
sql_base.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
sql_binlog.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
2006-11-27 14:07:52 +02:00
sql_bitmap.h
…
sql_builtin.cc.in
…
sql_cache.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
sql_cache.h
…
sql_class.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
sql_class.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
2006-11-27 14:07:52 +02:00
sql_client.cc
…
sql_crypt.cc
…
sql_crypt.h
…
sql_cursor.cc
Merge fix.
2006-09-30 19:08:13 -07:00
sql_cursor.h
…
sql_db.cc
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
2006-11-16 14:38:45 +02:00
sql_delete.cc
Merge mysql.com:/home/my/mysql-5.0
2006-11-22 14:11:36 +02:00
sql_derived.cc
…
sql_do.cc
…
sql_error.cc
…
sql_error.h
…
sql_handler.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
sql_help.cc
…
sql_insert.cc
Fixed a lot of compiler warnings (Mainly in mysqld and instance manager)
2006-11-01 19:41:09 +02:00
sql_lex.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
2006-11-27 14:07:52 +02:00
sql_lex.h
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
2006-11-16 14:38:45 +02:00
sql_list.cc
…
sql_list.h
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 12:57:20 +02:00
sql_load.cc
BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID.
2006-10-06 13:34:07 +04:00
sql_locale.cc
…
sql_manager.cc
…
sql_map.cc
…
sql_map.h
…
sql_olap.cc
…
sql_parse.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
2006-11-27 14:07:52 +02:00
sql_parse.cc.rej
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
2006-10-17 19:54:44 +03:00
sql_partition.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
sql_partition.h
Merge dator5.(none):/home/pappa/clean-mysql-5.1
2006-10-16 15:40:40 -04:00
sql_plugin.cc
Fixed a lot of compiler warnings (Mainly in mysqld and instance manager)
2006-11-01 19:41:09 +02:00
sql_plugin.h
converting plugin states to bitmask to simplify testing.
2006-09-06 10:22:59 +02:00
sql_prepare.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
sql_rename.cc
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
2006-10-24 17:00:23 +04:00
sql_repl.cc
Merge mysql.com:/home/my/mysql-5.0
2006-11-22 14:11:36 +02:00
sql_repl.h
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
2006-09-28 14:09:31 +05:00
sql_select.cc
Merge mysql.com:/home/my/mysql-5.0
2006-11-22 14:11:36 +02:00
sql_select.h
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-10-19 16:43:46 +02:00
sql_show.cc
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
2006-11-07 19:26:31 +01:00
sql_show.h
…
sql_sort.h
…
sql_state.c
…
sql_string.cc
Merge mysql.com:/usr/home/bar/mysql-5.0.b18908
2006-11-01 16:48:03 +04:00
sql_string.h
Merge mysql.com:/usr/home/bar/mysql-5.0.b18908
2006-11-01 16:48:03 +04:00
sql_table.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
2006-11-27 14:07:52 +02:00
sql_tablespace.cc
This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch).
2006-09-30 12:49:46 -07:00
sql_test.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
sql_trigger.cc
Fixed a LOT of compiler warnings
2006-11-27 01:47:38 +02:00
sql_trigger.h
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg20670-2
2006-09-29 18:26:30 +04:00
sql_udf.cc
…
sql_udf.h
…
sql_union.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-02 17:51:59 -05:00
sql_update.cc
Merge mysql.com:/home/my/mysql-5.0
2006-11-22 14:11:36 +02:00
sql_view.cc
Remove compiler warnings
2006-11-20 22:42:06 +02:00
sql_view.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
2006-10-13 08:57:15 -04:00
sql_yacc.yy
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
2006-11-16 14:38:45 +02:00
stacktrace.c
Merge polly.local:/tmp/maint/bug23256/mysql-4.1-maint
2006-10-20 14:32:31 +04:00
stacktrace.h
Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx
2006-09-07 00:59:08 +02:00
strfunc.cc
Merge mysql.com:/home/my/mysql-5.0
2006-11-22 14:11:36 +02:00
structs.h
…
table.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
2006-11-27 14:07:52 +02:00
table.cc.rej
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
2006-10-17 19:54:44 +03:00
table.h
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
2006-09-21 00:23:20 +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-22 14:11:36 +02:00
tztime.h
…
udf_example.c
Fix for bug #19121: Windows incompatible udf_example
2006-09-22 14:42:43 +02:00
udf_example.def
Fix for bug #19121: Windows incompatible udf_example
2006-09-22 14:42:43 +02:00
uniques.cc
…
unireg.cc
Merge mysql.com:/home/my/mysql-5.0
2006-11-22 14:11:36 +02:00
unireg.h
…