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
d6b1188f895a689f4ee1a3039a1e4e8b9494a2c7
mariadb/sql
History
unknown d6b1188f89 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


client/mysqldump.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
mysql-test/r/mysqldump.result:
  Manual merge, merge tree 5.0->5.1
mysql-test/r/rpl_view.result:
  Manual merge, merge tree 5.0->5.1
mysql-test/t/mysqldump.test:
  Manual merge, merge tree 5.0->5.1
mysql-test/t/rpl_view.test:
  Manual merge, merge tree 5.0->5.1
2006-09-21 00:53:47 +02:00
..
examples
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-05 17:44:08 -04:00
share
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-09-14 23:53:35 +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-21 00:23:20 +02:00
contributors.h
Added new show contributors command.
2006-05-02 17:53:26 -07:00
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
WL#3337 (Event scheduler new architecture)
2006-08-28 10:27:42 +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 unused artifacts
2006-09-01 14:25:29 +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
ws fix
2006-09-12 17:48:26 +02:00
field_conv.cc
Merge bodhi.local:/opt/local/work/tmp_merge
2006-07-15 01:04:51 +04:00
field.cc
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
2006-09-19 13:47:15 +02:00
field.h
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
2006-09-19 13:47:15 +02:00
filesort.cc
This is a cleanup of warnings that windows is complaining about.
2006-08-23 15:12:42 -07: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 changes the order of the universe, black is now the new white.
2006-09-15 10:28:00 -07:00
ha_ndbcluster_binlog.h
This changes the order of the universe, black is now the new white.
2006-09-15 10:28:00 -07:00
ha_ndbcluster_tables.h
…
ha_ndbcluster.cc
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
2006-09-15 10:48:30 -07:00
ha_ndbcluster.h
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1
2006-08-22 20:55:28 +02:00
ha_partition.cc
This changes the order of the universe, black is now the new white.
2006-09-15 10:28:00 -07:00
ha_partition.h
Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt
2006-08-26 06:14:05 -04:00
handler.cc
This changes the order of the universe, black is now the new white.
2006-09-15 10:28:00 -07:00
handler.h
Add support for Falcon, so that partitioning can be tested.
2006-09-07 12:35:52 -07:00
hash_filo.cc
…
hash_filo.h
…
hostname.cc
…
init.cc
…
item_buff.cc
Fix for bug#19667 group by a decimal expression yields wrong result
2006-06-15 16:24:02 +05:00
item_cmpfunc.cc
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 12:57:20 +02:00
item_cmpfunc.h
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 12:57:20 +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 bk-internal:/home/bk/mysql-5.0
2006-09-18 19:01:07 +04:00
item_func.h
Merge bk-internal:/home/bk/mysql-5.0
2006-09-18 19:01:07 +04: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 maint1.mysql.com:/data/localhome/cmiller/bug15583/my51-bug15583
2006-09-13 15:13:52 +02:00
item_strfunc.h
Merge maint2.mysql.com:/data/localhome/tsmith/bk/g51
2006-09-04 23:05:17 +02:00
item_subselect.cc
Merge moonbone.local:/work/tmp_merge-5.0-mysql
2006-08-29 18:58:50 +04: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 baker@bk-internal.mysql.com:/home/bk/mysql-5.1
2006-09-15 10:48:30 -07:00
item_sum.h
Merge bodhi.local:/opt/local/work/tmp_merge
2006-08-12 21:06:51 +04:00
item_timefunc.cc
Merge moonbone.local:/work/tmp_merge-5.0-mysql
2006-08-29 18:58:50 +04:00
item_timefunc.h
Manually merged
2006-06-18 14:56:35 +04:00
item_uniq.cc
…
item_uniq.h
…
item_xmlfunc.cc
Bug#20795: extractvalue() won't accept names containing a dot (.)
2006-07-25 18:46:43 +05:00
item_xmlfunc.h
BUG#18198: Many strange partition functions were allowed, now only strictly allowed functions are ok
2006-05-31 13:32:14 -04:00
item.cc
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 12:57:20 +02:00
item.h
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 12:57:20 +02:00
key.cc
Bug#20086: Can't get data from key partitioned tables with VARCHAR key
2006-06-21 13:00:19 +05:00
lex_symbol.h
…
lex.h
WL#3337 (Event scheduler new architecture)
2006-09-12 12:26:12 +02:00
lock.cc
Fix for bug#19403/12212 "Crash that happens during removing of database name
2006-08-21 19:02:11 +04:00
log_event.cc
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
2006-09-21 00:23:20 +02:00
log_event.h
Merge romeo.(none):/home/bkroot/mysql-5.1-wl3228
2006-08-21 10:54:41 +02:00
log.cc
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
2006-09-21 00:23:20 +02:00
log.h
Post-merge fixes:
2006-09-13 15:37:35 -06:00
Makefile.am
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
2006-09-21 00:23:20 +02: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 mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
2006-09-21 00:23:20 +02:00
mysqld_suffix.h
…
mysqld.cc
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
2006-09-21 00:23:20 +02: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
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 12:57:20 +02:00
opt_range.h
merge fixes
2006-09-18 12:14:27 +02:00
opt_sum.cc
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 12:57:20 +02:00
parse_file.cc
…
parse_file.h
…
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
This changes the order of the universe, black is now the new white.
2006-09-15 10:28:00 -07:00
partition_info.h
partition functions to pass create_info, not only max_rows
2006-06-27 22:19:27 +02: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
fix for bug #17619 Scheduler race conditions
2006-05-22 20:46:13 +02:00
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 baker@bk-internal.mysql.com:/home/bk/mysql-5.1
2006-09-15 10:48:30 -07:00
set_var.h
WL#3337 (Event scheduler new architecture)
2006-09-01 13:08:44 +02:00
slave.cc
Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-50
2006-08-23 16:03:57 -06:00
slave.h
Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50
2006-09-13 09:03:52 +02:00
sp_cache.cc
…
sp_cache.h
…
sp_head.cc
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
2006-09-21 00:23:20 +02: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 maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50
2006-09-13 09:03:52 +02: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 maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50
2006-09-13 09:03:52 +02:00
sql_acl.h
Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge
2006-05-11 11:28:56 +04:00
sql_analyse.cc
String::set(double) and set(longlong) -> set_real() and set_int()
2006-06-16 12:17:20 +02: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 lamia.home:/home/timka/mysql/src/5.0-bug-21774-sm
2006-09-13 15:22:50 +03:00
sql_binlog.cc
…
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 changes the order of the universe, black is now the new white.
2006-09-15 10:28:00 -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 mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
2006-09-21 00:23:20 +02:00
sql_class.h
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
2006-09-15 01:26:28 +02:00
sql_client.cc
…
sql_crypt.cc
unsigned char -> uchar
2006-06-19 12:45:34 +03:00
sql_crypt.h
…
sql_cursor.cc
…
sql_cursor.h
…
sql_db.cc
WL#3337 (Event scheduler new architecture)
2006-08-17 14:22:59 +02:00
sql_delete.cc
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 12:57:20 +02: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:/users/lthalmann/bkroot/mysql-5.1-new-rpl
2006-09-21 00:23:20 +02:00
sql_lex.cc
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 12:57:20 +02:00
sql_lex.h
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 12:57:20 +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
Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50
2006-09-13 09:03:52 +02: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 mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-21 00:53:47 +02:00
sql_partition.cc
This changes the order of the universe, black is now the new white.
2006-09-15 10:28:00 -07:00
sql_partition.h
partition functions to pass create_info, not only max_rows
2006-06-27 22:19:27 +02:00
sql_plugin.cc
This changes the order of the universe, black is now the new white.
2006-09-15 10:28:00 -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 neptunus.(none):/home/msvensson/mysql/bug21813/my50-bug21813
2006-08-30 17:25:56 +02:00
sql_rename.cc
Bug#18775 - Temporary table from alter table visible to other threads
2006-08-02 17:57:06 +02: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 maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50
2006-09-13 09:03:52 +02:00
sql_select.cc
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 12:57:20 +02:00
sql_select.h
BUG#14940 "MySQL choose wrong index", v.2
2006-07-28 21:27:01 +04:00
sql_show.cc
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
2006-09-21 00:23:20 +02: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
This changes the order of the universe, black is now the new white.
2006-09-15 10:28:00 -07:00
sql_tablespace.cc
Bug#20168
2006-06-12 06:50:11 -07:00
sql_test.cc
WL#3337 (Event scheduler new architecture)
2006-09-12 12:26:12 +02:00
sql_trigger.cc
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge
2006-08-30 03:00:19 +04:00
sql_trigger.h
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge
2006-08-30 03:00:19 +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
BUG#17138: Crashes in stored procedure
2006-07-01 00:01:37 -04:00
sql_update.cc
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 12:57:20 +02:00
sql_view.cc
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge
2006-08-30 03:00:19 +04:00
sql_view.h
Merge sunlight.local:/local_work/leak_fix_orig
2006-08-09 02:49:29 +04:00
sql_yacc.yy
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
2006-09-21 00:23:20 +02:00
stacktrace.c
Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx
2006-09-07 00:59:08 +02:00
stacktrace.h
Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx
2006-09-07 00:59:08 +02:00
strfunc.cc
…
structs.h
WL#3146 "less locking in auto_increment":
2006-07-09 17:52:19 +02:00
table.cc
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
2006-09-15 10:48:30 -07: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
Bug#20729: Bad date_format() call makes mysql server crash
2006-07-11 13:06:29 -04:00
tzfile.h
…
tztime.cc
Cleanup patch.
2006-08-17 18:13:45 +02:00
tztime.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2006-05-02 18:41:42 -04:00
udf_example.c
Fix a compilation failiure on QNX
2006-08-02 13:25:13 +04:00
uniques.cc
…
unireg.cc
Merge bk-internal:/home/bk/mysql-5.1
2006-07-19 08:57:52 +02:00
unireg.h
Merge sunlight.local:/local_work/leak_fix_orig
2006-08-09 02:49:29 +04:00