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
f29bb17d0df51b150068756d4ff42141e1256550
mariadb/sql
History
unknown 5677612aea Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0


mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/sp-vars.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/information_schema.result:
  Use local
mysql-test/t/information_schema.test:
  Manual merge.
sql/sql_lex.h:
  Manual merge.
2006-07-15 01:04:51 +04:00
..
share
Post-merge fixes.
2006-07-13 17:34:49 +04:00
.cvsignore
…
add_errmsg
…
authors.h
update show authors
2006-05-30 10:22:31 +02:00
client_settings.h
…
CMakeLists.txt
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-06-26 18:45:46 +04: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_scheduler.cc
manual merge
2006-06-20 17:14:36 +02:00
event_scheduler.h
Reorganize, physically the events code
2006-06-08 23:07:11 +02:00
event_timed.cc
After merge fixes.
2006-07-07 03:07:45 +04:00
event_timed.h
forgot to event_timed.h
2006-06-20 17:05:41 +02:00
events_priv.h
Reorganize, physically the events code
2006-06-08 23:07:11 +02:00
events.cc
Another post-merge fix.
2006-07-07 13:49:43 +04:00
events.h
Reorganize, physically the events code
2006-06-08 23:07:11 +02:00
field_conv.cc
Merge bodhi.local:/opt/local/work/tmp_merge
2006-07-15 01:04:51 +04:00
field.cc
Merge chilla.local:/home/mydev/mysql-5.0-bug16218
2006-07-06 16:09:50 +02:00
field.h
Merge chilla.local:/home/mydev/mysql-5.0-bug16218
2006-07-06 16:09:50 +02:00
filesort.cc
Added purecov comment for new, not executed code for my recent changeset
2006-06-28 14:03:08 +03:00
frm_crypt.cc
…
gen_lex_hash.cc
…
gstream.cc
…
gstream.h
…
ha_berkeley.cc
Fixed some issues found by valgrind
2006-06-06 02:47:30 +03:00
ha_berkeley.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-06-04 21:05:22 +03:00
ha_federated.cc
Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1
2006-07-12 10:07:07 +02:00
ha_federated.h
Small fix to mysql-5.1-engines, from merge from BUG #19773
2006-07-10 11:57:29 -07:00
ha_heap.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-06-04 21:05:22 +03:00
ha_heap.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-06-04 21:05:22 +03:00
ha_innodb.cc
Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge
2006-06-23 17:27:54 -04:00
ha_innodb.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-06-04 21:05:22 +03:00
ha_myisam.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-06-04 21:05:22 +03:00
ha_myisam.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-06-04 21:05:22 +03:00
ha_myisammrg.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-06-04 21:05:22 +03:00
ha_myisammrg.h
Merge mysql.com:/home/mydev/mysql-5.0-amerge
2006-06-15 10:58:02 +02:00
ha_ndbcluster_binlog.cc
Bug #20843 tests fails randomly with assertion in completeClusterFailed
2006-07-08 03:26:13 +02:00
ha_ndbcluster_binlog.h
sql_delete.cc:
2006-06-12 14:23:21 +02:00
ha_ndbcluster_tables.h
Bug #17805 Cluster_replication database should be renamed to just cluster
2006-03-01 13:31:21 +01:00
ha_ndbcluster.cc
Post-merge fixes.
2006-07-14 02:07:37 +04:00
ha_ndbcluster.h
Merge dator5.(none):/home/pappa/clean-mysql-5.1
2006-07-01 00:19:23 -04:00
ha_partition.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-07-13 00:18:59 +04:00
ha_partition.h
fixes after merge. Updates to test's results.
2006-07-10 18:41:03 +02:00
handler.cc
fixes after merge. Updates to test's results.
2006-07-10 18:41:03 +02:00
handler.h
Merge gbichot3.local:/home/mysql_src/mysql-5.1-interval-move-next-insert-id
2006-07-09 22:50:02 +02:00
hash_filo.cc
…
hash_filo.h
…
hostname.cc
Final patch to remove the last of the OS2 support.
2006-04-15 18:17:32 -07:00
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 bodhi.local:/opt/local/work/tmp_merge
2006-07-13 22:09:36 +04:00
item_cmpfunc.h
gcc 4.1 linux warning fixes backported from 5.0.
2006-06-28 16:28:29 +03:00
item_create.cc
* Mixed replication mode * :
2006-07-09 17:00:47 +02:00
item_create.h
…
item_func.cc
Merge bodhi.local:/opt/local/work/tmp_merge
2006-07-13 22:09:36 +04:00
item_func.h
Merge bodhi.local:/opt/local/work/tmp_merge
2006-07-13 22:09:36 +04:00
item_geofunc.cc
…
item_geofunc.h
Merge mysql.com:/home/mydev/mysql-4.1-bug14400
2006-07-05 11:20:10 +02:00
item_row.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
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 bodhi.local:/opt/local/work/tmp_merge
2006-07-13 22:09:36 +04:00
item_strfunc.h
post-merge fix
2006-06-14 10:54:56 +05:00
item_subselect.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-06-04 21:05:22 +03:00
item_subselect.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-06-04 21:05:22 +03:00
item_sum.cc
Merge bodhi.local:/opt/local/work/tmp_merge
2006-07-13 22:09:36 +04:00
item_sum.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_timefunc.cc
Merge chilla.local:/home/mydev/mysql-5.0-ateam
2006-07-06 13:18:00 +02:00
item_timefunc.h
Manually merged
2006-06-18 14:56:35 +04:00
item_uniq.cc
…
item_uniq.h
…
item_xmlfunc.cc
Post-merge fixes.
2006-07-14 02:07:37 +04: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
Post-merge fixes.
2006-07-14 02:07:37 +04:00
item.h
Merge bodhi.local:/opt/local/work/tmp_merge
2006-07-15 01:04:51 +04: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
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-05-23 11:25:11 -07:00
lock.cc
Merge mysql.com:/home/mydev/mysql-5.0-tmp_merge
2006-07-04 10:02:11 +02:00
log_event.cc
Post-merge fixes.
2006-07-13 17:34:49 +04:00
log_event.h
Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
2006-07-03 11:35:58 -04:00
log.cc
Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1-new-rpl
2006-07-11 12:17:19 +02:00
log.h
after merge fixes
2006-06-21 14:53:40 +05:00
Makefile.am
add event_timed.h also to the distribution
2006-06-21 08:58:56 +02:00
matherr.c
…
message.mc
Some changes to make it possible to build for Windows with CMake from
2006-03-24 22:50:56 +01:00
mf_iocache.cc
…
my_decimal.cc
…
my_decimal.h
…
my_lock.c
Final patch to remove the last of the OS2 support.
2006-04-15 18:17:32 -07:00
mysql_priv.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-07-13 00:18:59 +04:00
mysqld_suffix.h
…
mysqld.cc
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
2006-07-10 17:20:39 -04:00
net_serv.cc
configure.in, net_serv.cc, compile-netware-END:
2006-06-17 00:30:02 +02:00
nt_servc.cc
…
nt_servc.h
…
opt_range.cc
Merge mysql.com:/home/psergey/tmp_merge-2
2006-07-14 19:10:54 +04:00
opt_range.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
opt_sum.cc
Merge mysql.com:/home/mydev/mysql-4.1-bug11824
2006-07-05 11:11:40 +02:00
parse_file.cc
Merge zim.(none):/home/ian/workspace/mysql-5.0
2006-03-27 19:48:44 -08:00
parse_file.h
Fix for BUG#15921: DROP TRIGGER - can't be drop trigger created
2006-03-28 01:01:51 +04:00
partition_element.h
Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1
2006-06-14 09:12:07 -04:00
partition_info.cc
partition functions to pass create_info, not only max_rows
2006-06-27 22:19:27 +02:00
partition_info.h
partition functions to pass create_info, not only max_rows
2006-06-27 22:19:27 +02:00
password.c
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
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
String::set(double) and set(longlong) -> set_real() and set_int()
2006-06-16 12:17:20 +02:00
protocol.h
Fixes to embedded server to be able to run tests with it
2006-02-24 18:34:15 +02:00
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
…
set_var.cc
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
2006-07-10 17:20:39 -04:00
set_var.h
Fixing usage of my_strndup() to new prototype.
2006-07-07 21:03:19 +02:00
slave.cc
Bug#20850 (Assert during slave shutdown in many rpl_* tests):
2006-07-07 18:31:00 +02:00
slave.h
A fix for Bug#19022 "Memory bug when switching db during trigger execution".
2006-06-28 23:47:45 +04:00
sp_cache.cc
Remove unused variable
2006-03-28 19:34:44 +02:00
sp_cache.h
…
sp_head.cc
Merge bodhi.local:/opt/local/work/tmp_merge
2006-07-15 01:04:51 +04:00
sp_head.h
Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1-new-rpl
2006-07-11 12:17:19 +02:00
sp_pcontext.cc
Fixed BUG#18949: Test case sp-goto is disabled
2006-04-18 11:07:34 +02:00
sp_pcontext.h
Fixed BUG#18949: Test case sp-goto is disabled
2006-04-18 11:07:34 +02:00
sp_rcontext.cc
BUG#18037: Fix stack corruption in THD::rollback_item_tree_changes().
2006-05-15 12:01:55 +02:00
sp_rcontext.h
BUG#18037: Fix stack corruption in THD::rollback_item_tree_changes().
2006-05-15 12:01:55 +02:00
sp.cc
Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1-new-rpl
2006-07-11 12:17:19 +02:00
sp.h
A fix and a test case for
2006-06-27 00:47:52 +04: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 zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
2006-07-10 17:20:39 -04: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 dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1-new-rpl
2006-07-11 12:17:19 +02:00
sql_binlog.cc
fixed BINLOG crashes in case of badly formed statement (Bug #17457)
2006-03-01 12:45:13 +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
WL#3201
2006-04-13 13:49:29 -07:00
sql_cache.cc
Merge mysql.com:/home/alexi/bugs/mysql-5.0-15758-work
2006-04-09 17:48:47 +04:00
sql_cache.h
Fixed compiler warnings from gcc 4.0.2:
2006-02-25 17:46:30 +02:00
sql_class.cc
Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1-new-rpl
2006-07-11 12:17:19 +02:00
sql_class.h
Post-merge fixes.
2006-07-13 17:34:49 +04:00
sql_client.cc
…
sql_crypt.cc
unsigned char -> uchar
2006-06-19 12:45:34 +03:00
sql_crypt.h
…
sql_cursor.cc
Fixed BUG#15758: "Holding adaptive search latch in
2006-04-07 23:58:17 +04:00
sql_cursor.h
…
sql_db.cc
Merge bodhi.local:/opt/local/work/tmp_merge
2006-07-13 11:43:52 +04:00
sql_delete.cc
fixes after merge. Updates to test's results.
2006-07-10 18:41:03 +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 shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-23 18:14:02 +01:00
sql_error.h
fix for bug #17619 Scheduler race conditions
2006-05-22 20:46:13 +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 bk-internal.mysql.com:/home/bk/mysql-5.1
2006-07-13 00:18:59 +04:00
sql_lex.cc
Merge bodhi.local:/opt/local/work/tmp_merge
2006-07-15 01:04:51 +04:00
sql_lex.h
Merge bodhi.local:/opt/local/work/tmp_merge
2006-07-15 01:04:51 +04:00
sql_list.cc
…
sql_list.h
…
sql_load.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-07-13 00:18:59 +04:00
sql_manager.cc
…
sql_manager.h
…
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 bodhi.local:/opt/local/work/tmp_merge
2006-07-15 01:04:51 +04:00
sql_partition.cc
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1
2006-06-28 11:55:15 +05: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
Bug#20168
2006-06-12 06:50:11 -07:00
sql_plugin.h
Bug#20168
2006-06-12 06:50:11 -07:00
sql_prepare.cc
SHOW STATUS does not anymore change local status variables (except com_show_status). Global status variables are still updated.
2006-06-20 13:20:32 +03:00
sql_rename.cc
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525
2006-02-27 20:00:07 +03:00
sql_repl.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_repl.h
…
sql_select.cc
Merge bodhi.local:/opt/local/work/tmp_merge
2006-07-13 11:43:52 +04:00
sql_select.h
gcc 4.1 linux warning fixes backported from 5.0.
2006-06-28 16:28:29 +03:00
sql_show.cc
Merge bodhi.local:/opt/local/work/tmp_merge
2006-07-15 01:04:51 +04:00
sql_show.h
…
sql_sort.h
…
sql_state.c
…
sql_string.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-06-19 13:00:36 +03:00
sql_string.h
String::set(double) and set(longlong) -> set_real() and set_int()
2006-06-16 12:17:20 +02:00
sql_table.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2006-07-13 00:18:59 +04:00
sql_tablespace.cc
Bug#20168
2006-06-12 06:50:11 -07:00
sql_test.cc
Merge mysql.com:/home/my/mysql-5.0
2006-05-04 22:27:12 +03:00
sql_trigger.cc
Merge bodhi.local:/opt/local/work/tmp_merge
2006-07-13 11:43:52 +04:00
sql_trigger.h
After merge fixes for patch solving bug#18437 "Wrong values inserted with a
2006-07-06 13:33:23 +04:00
sql_udf.cc
Merge bodhi.netgear:/opt/local/work/tmp_merge
2006-07-06 22:55:48 +04:00
sql_udf.h
Bug#19904: UDF: not initialized *is_null per row
2006-06-08 13:25:28 -04:00
sql_union.cc
BUG#17138: Crashes in stored procedure
2006-07-01 00:01:37 -04:00
sql_update.cc
Merge gbichot3.local:/home/mysql_src/mysql-5.1-interval-move-next-insert-id
2006-07-09 22:50:02 +02:00
sql_view.cc
Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1-new-rpl
2006-07-11 12:17:19 +02:00
sql_view.h
…
sql_yacc.yy
Merge bodhi.local:/opt/local/work/tmp_merge
2006-07-13 11:43:52 +04:00
stacktrace.c
…
stacktrace.h
…
strfunc.cc
…
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-07-13 00:18:59 +04:00
table.h
Merge bodhi.netgear:/opt/local/work/tmp_merge
2006-07-06 22:55:48 +04:00
thr_malloc.cc
…
time.cc
After merge fixes.
2006-07-06 15:38:47 +02:00
tzfile.h
…
tztime.cc
Merge bodhi.netgear:/opt/local/work/tmp_merge
2006-07-06 22:55:48 +04:00
tztime.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2006-05-02 18:41:42 -04:00
udf_example.cc
Fix small bug in udf_example.cc, it was processing one char too much and thus returning junk
2006-04-28 11:37:20 +02:00
uniques.cc
…
unireg.cc
BUG#16000: .par file not removed plus errors to error log for normal errors
2006-06-20 13:24:30 -04:00
unireg.h
Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was
2006-04-12 23:05:38 +04:00