database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-19 01:41:20 +03:00
Code
mariadb/sql
History
unknown 82ad1db0af Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my50-bug22860 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my51-bug22860


BitKeeper/etc/collapsed:
  auto-union
sql/mysqld.cc:
  Auto merged
2006-11-11 08:58:24 -05:00
..
examples
Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2
2006-10-16 17:39:38 +10:00
share
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
2006-10-24 17:00:23 +04:00
.cvsignore
…
add_errmsg
…
authors.h
errmsg.txt:
2006-09-07 13:52:30 +10:00
client_settings.h
…
CMakeLists.txt
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
2006-09-23 06:06:06 +02:00
contributors.h
…
custom_conf.h
…
derror.cc
…
des_key_file.cc
…
discover.cc
sql/Makefile.am: better mysqld dependencies
2006-05-30 18:21:03 +02:00
event_data_objects.cc
Remove direct mapping of enum interval_type to mysql.event.interval_field
2006-10-10 17:59:46 +02:00
event_data_objects.h
WL#3337 (Event scheduler new architecture)
2006-08-17 14:22:59 +02:00
event_db_repository.cc
Remove direct mapping of enum interval_type to mysql.event.interval_field
2006-10-10 17:59:46 +02:00
event_db_repository.h
WL#3337 (Event scheduler new architecture)
2006-08-28 10:27:42 +02:00
event_queue.cc
Fix an assert on AIX 5.2, 64bit. COND_queue_state wasn't
2006-09-14 23:25:59 +02:00
event_queue.h
WL#3337 (Event scheduler new architecture)
2006-09-12 12:26:12 +02:00
event_scheduler.cc
WL#3337 (Event scheduler new architecture)
2006-09-12 12:26:12 +02:00
event_scheduler.h
WL#3337 (Event scheduler new architecture)
2006-09-12 12:26:12 +02:00
events.cc
WL#3337 (Event scheduler new architecture)
2006-09-12 12:26:12 +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
After merge fix
2006-10-03 16:00:09 +05:00
field.cc
Merge polly.local:/tmp/maint/bug11655/my51-bug11655
2006-10-12 12:36:13 +04:00
field.h
Merge siva.hindu.god:/usr/home/tim/m/bk/50
2006-09-29 18:04:34 -06:00
filesort.cc
Added a missing breakpoint. This could cause
2006-10-03 12:44:59 +03:00
frm_crypt.cc
…
gen_lex_hash.cc
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint-gca
2006-08-23 18:37:04 -04:00
gstream.cc
…
gstream.h
…
ha_ndbcluster_binlog.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
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
…
ha_ndbcluster.cc
post merge fixes (from merging test fixes from bug 19914)
2006-10-25 20:37:10 +10: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
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
2006-10-18 15:17:47 +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
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
2006-11-02 17:27:42 -05:00
handler.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-02 03:24:11 +03: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
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-10-19 16:43:46 +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
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
2006-08-17 22:30:32 +02:00
item_create.h
Merge bodhi.local:/opt/local/work/tmp_merge
2006-07-26 23:33:25 +04:00
item_func.cc
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug10963/my50-bug10963
2006-11-08 10:12:06 -05: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
Fix for the failing gis.test
2006-08-18 22:29:35 +05:00
item_geofunc.h
Merge mysql.com:/home/mydev/mysql-4.1-bug14400
2006-07-05 11:20:10 +02:00
item_row.cc
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge
2006-08-30 03:00:19 +04:00
item_row.h
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
2006-06-04 18:52:22 +03:00
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 bk-internal:/home/bk/mysql-4.1-maint
2006-09-28 18:11:29 -07:00
item_subselect.h
Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
2006-07-30 00:33:24 +04:00
item_sum.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-02 03:24:11 +03: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 polly.local:/tmp/maint/bug11655/my51-bug11655
2006-10-12 12:36:13 +04: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#20854 XML functions: wrong result in ExtractValue
2006-09-14 11:47:19 +05:00
item_xmlfunc.h
BUG#18198
2006-09-26 02:25:23 -04:00
item.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2006-10-02 22:53:10 +04:00
item.h
BUG#18198: Partition function handling
2006-09-30 17:38:15 -04:00
key.cc
Fix for bug#20670 "UPDATE using key and invoking trigger that modifies
2006-09-21 13:39:29 +04:00
lex_symbol.h
…
lex.h
Bug#18888 Trying to overwrite sql/lex_hash.h during build
2006-10-26 19:11:09 +02:00
lock.cc
Fix for Bug #17544 "Cannot do atomic log rotate",
2006-10-13 17:26:46 +04:00
log_event.cc
log_event.cc, sql_class.cc:
2006-10-13 03:32:38 +02:00
log_event.h
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
2006-10-06 15:31:05 +02:00
log.cc
fix test failures in the runtime tree
2006-10-25 12:54:59 +04: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
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-02 17:51:59 -05:00
matherr.c
…
message.mc
make dist changes for Cmake build
2006-09-01 10:32:12 +02:00
mf_iocache.cc
…
my_decimal.cc
…
my_decimal.h
Bug#16172 DECIMAL data type processed incorrectly
2006-08-08 16:03:42 +05:00
my_lock.c
…
mysql_priv.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-02 03:24:11 +03:00
mysqld_suffix.h
…
mysqld.cc
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my50-bug22860
2006-11-11 08:58:24 -05:00
net_serv.cc
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-05 16:46:55 -04:00
nt_servc.cc
…
nt_servc.h
…
opt_range.cc
Fix for bug #23762: partition.test fails (partition_hash, partition_pruning as well)
2006-11-02 17:11:53 +04: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
…
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
This is a cleanup of warnings that windows is complaining about.
2006-08-23 15:12:42 -07:00
partition_info.cc
Merge dator5.(none):/home/pappa/clean-mysql-5.1
2006-10-16 15:40:40 -04:00
partition_info.h
BUG#18198: Partition function handling
2006-10-02 15:52:29 -04:00
password.c
…
procedure.cc
…
procedure.h
String::set(double) and set(longlong) -> set_real() and set_int()
2006-06-16 12:17:20 +02:00
protocol.cc
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge
2006-08-30 03:00:19 +04:00
protocol.h
…
records.cc
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
2006-06-04 18:52:22 +03:00
repl_failsafe.cc
…
repl_failsafe.h
…
rpl_filter.cc
Fixes for Windows compilation failures.
2006-07-07 16:14:07 +04:00
rpl_filter.h
Fixes for Windows compilation failures.
2006-07-07 16:14:07 +04:00
rpl_injector.cc
Merge mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2
2006-06-23 15:05:15 +02:00
rpl_injector.h
Merge mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2
2006-06-23 15:05:15 +02:00
rpl_rli.h
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
2006-06-07 23:58:08 +04:00
rpl_tblmap.cc
…
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
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
2006-11-02 01:08:39 +03:00
set_var.h
WL#3337 (Event scheduler new architecture)
2006-09-01 13:08:44 +02:00
slave.cc
Merge mysql.com:/usr/home/ram/work/mysql-5.0-maint
2006-11-07 12:12:59 +04:00
slave.h
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
2006-09-29 17:01:16 -06:00
sp_cache.cc
…
sp_cache.h
…
sp_head.cc
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime
2006-10-23 12:35:56 +04:00
sp_head.h
Post-merge fixes.
2006-08-30 23:09:47 +04:00
sp_pcontext.cc
…
sp_pcontext.h
…
sp_rcontext.cc
Bug#8153 (Stored procedure with subquery and continue handler, wrong result)
2006-08-02 22:18:49 -07:00
sp_rcontext.h
Bug#8153 (Stored procedure with subquery and continue handler, wrong result)
2006-08-02 22:18:49 -07:00
sp.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-02 17:51:59 -05:00
sp.h
Bug#21039 Transaction cache not flushed after SELECT CREATE
2006-07-26 12:40:26 +02:00
spatial.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-06-04 21:05:22 +03:00
spatial.h
gcc 4.1 linux warning fixes backported from 5.0.
2006-06-28 16:28:29 +03:00
sql_acl.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
2006-10-13 08:57:15 -04: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
String::set(double) and set(longlong) -> set_real() and set_int()
2006-06-16 12:17:20 +02:00
sql_array.h
…
sql_base.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-10-23 12:06:59 +04:00
sql_binlog.cc
BUG#19459 (BINLOG RBR command does not lock tables correctly causing
2006-10-06 10:17:02 +02:00
sql_bitmap.h
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
2006-06-04 18:52:22 +03:00
sql_builtin.cc.in
…
sql_cache.cc
This patch updates to remove most global hton needs. Cleans up wrong message in partition.
2006-09-30 18:31:13 -07:00
sql_cache.h
BUG#21051: RESET QUERY CACHE very slow when query_cache_type=0
2006-08-22 11:47:52 +04:00
sql_class.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-02 17:51:59 -05:00
sql_class.h
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
2006-11-02 01:08:39 +03:00
sql_client.cc
…
sql_crypt.cc
unsigned char -> uchar
2006-06-19 12:45:34 +03:00
sql_crypt.h
…
sql_cursor.cc
Merge fix.
2006-09-30 19:08:13 -07:00
sql_cursor.h
…
sql_db.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
2006-10-13 08:57:15 -04:00
sql_delete.cc
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
2006-11-02 17:27:42 -05:00
sql_derived.cc
…
sql_do.cc
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
2006-06-04 18:52:22 +03:00
sql_error.cc
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge
2006-08-30 03:00:19 +04:00
sql_error.h
Cleanup patch.
2006-08-17 18:13:45 +02:00
sql_handler.cc
Merge mysql.com:/home/mydev/mysql-5.0-tmp_merge
2006-07-04 10:02:11 +02:00
sql_help.cc
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
2006-06-04 18:52:22 +03:00
sql_insert.cc
Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
2006-10-10 21:59:23 +02:00
sql_lex.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
2006-11-01 16:20:15 +03:00
sql_lex.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
2006-11-01 16:20:15 +03: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
Fix compile errors in VC++ 7.0
2006-08-21 16:21:48 +04:00
sql_manager.cc
Removed bdb test cases.
2006-08-10 18:29:25 -07:00
sql_map.cc
…
sql_map.h
…
sql_olap.cc
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
2006-06-04 18:52:22 +03:00
sql_parse.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-02 17:51:59 -05:00
sql_partition.cc
Merge dator5.(none):/home/pappa/clean-mysql-5.1
2006-10-16 15:40:40 -04:00
sql_partition.h
Merge dator5.(none):/home/pappa/clean-mysql-5.1
2006-10-16 15:40:40 -04:00
sql_plugin.cc
Bug#20615
2006-09-25 11:48:51 -07:00
sql_plugin.h
converting plugin states to bitmask to simplify testing.
2006-09-06 10:22:59 +02:00
sql_prepare.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-02 17:51:59 -05: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 perch.ndb.mysql.com:/home/jonas/src/50-work
2006-09-04 14:08:15 +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 bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-02 17:51:59 -05: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 bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-02 17:51:59 -05:00
sql_show.h
WL#3337 (Events new architecture)
2006-06-28 14:22:14 +02:00
sql_sort.h
…
sql_state.c
…
sql_string.cc
Merge salvation.intern.azundris.com:/home/tnurnberg/21913/my50-21913
2006-09-05 22:55:55 +02:00
sql_string.h
Bug#19006: 4.0 valgrind problems (in test func_str)
2006-07-01 14:31:52 -04:00
sql_table.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-02 17:51:59 -05: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
WL#3337 (Event scheduler new architecture)
2006-09-12 12:26:12 +02:00
sql_trigger.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-02 17:51:59 -05: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
Merge bodhi.local:/opt/local/work/tmp_merge
2006-08-12 21:06:51 +04:00
sql_udf.h
Fix compiler warnings in sql_udf.h: ISO C++ forbids casting
2006-07-09 13:03:51 +04:00
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 bk-internal.mysql.com:/home/bk/mysql-4.1
2006-11-02 01:08:39 +03:00
sql_view.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-02 17:51:59 -05: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 bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-02 17:51:59 -05: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
Remove direct mapping of enum interval_type to mysql.event.interval_field
2006-10-10 17:59:46 +02:00
structs.h
WL#3146 "less locking in auto_increment":
2006-07-09 17:52:19 +02:00
table.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-11-02 17:51:59 -05: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 polly.local:/tmp/maint/bug11655/my51-bug11655
2006-10-12 12:36:13 +04:00
tzfile.h
…
tztime.cc
Cleanup patch.
2006-08-17 18:13:45 +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/hf/mysql-5.0.mrg
2006-10-12 15:42:05 +05:00
unireg.h
Merge sunlight.local:/local_work/leak_fix_orig
2006-08-09 02:49:29 +04:00