database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-31 15:50:51 +03:00
Code Activity
Files
0b7d39fd5fa32c0dd3bbbdf27a2bc2cbe1bcd096
mariadb/sql
History
unknown 4597814717 Post-merge fixes. 
mysql-test/extra/rpl_tests/rpl_loaddata.test:
  Removing SHOW MASTER STATUS that does not seem to make sense.
mysql-test/extra/rpl_tests/rpl_log.test:
  Correcting test case to sync slave with master.
mysql-test/suite/binlog/r/binlog_unsafe.result:
  Result change.
mysql-test/suite/binlog/t/binlog_unsafe.test:
  Removing unsafe variable from list of safe variables.
mysql-test/suite/rpl/r/rpl_loaddata.result:
  Result change.
mysql-test/suite/rpl/r/rpl_skip_error.result:
  Result change.
mysql-test/suite/rpl/t/rpl_skip_error.test:
  Correcting bad manual+automatic merge. Test is now only relevant for statement-
  based replication.
sql/rpl_rli.cc:
  Correcting automerge undoing previous change of return value.
  Relay_log_info::wait_for_pos() should return -2 when not initialized to work
  correctly.
2008-03-14 17:52:57 +01:00
..
examples
Fix for bug #31207: Test "join_nested" shows different strategy on IA64
2007-10-17 20:08:58 +04:00
share
Bug #32971 No user level error message from slave sql thread when ER_NO_DEFAULT_FOR_FIELD
2008-01-31 14:54:03 +02:00
.cvsignore
…
add_errmsg
…
authors.h
…
client_settings.h
…
CMakeLists.txt
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
2008-02-21 19:53:37 -05:00
contributors.h
…
custom_conf.h
…
derror.cc
Doxygenize comments, a*.cc - field.cc .
2007-10-09 17:56:32 -04:00
des_key_file.cc
Doxygenize comments, a*.cc - field.cc .
2007-10-09 17:56:32 -04:00
discover.cc
Doxygenize comments, a*.cc - field.cc .
2007-10-09 17:56:32 -04:00
event_data_objects.cc
Bug#29830 Test case 'events_scheduling' fails on Mac OS X and Windows.
2007-12-07 19:27:45 -05:00
event_data_objects.h
…
event_db_repository.cc
Bug#32633 Can not create any routine if SQL_MODE=no_engine_substitution
2008-02-07 08:47:39 -02:00
event_db_repository.h
…
event_queue.cc
Fix for bug#22738 Events: After stop and start disabled events could reside in the queue
2008-02-22 16:18:31 +01:00
event_queue.h
…
event_scheduler.cc
Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-main
2007-11-12 21:09:48 +01:00
event_scheduler.h
…
events.cc
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
2008-02-22 16:20:05 +01:00
events.h
…
field_conv.cc
Doxygenization of comments.
2007-10-11 13:29:09 -04:00
field.cc
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
2008-01-22 15:56:15 -07:00
field.h
merge of bug 33256 5.0-opt -> 5.1-opt
2008-01-08 12:27:15 +02:00
filesort.cc
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-01-30 19:00:46 -07:00
frm_crypt.cc
…
gen_lex_hash.cc
Doxygenization of comments.
2007-10-11 13:29:09 -04:00
gstream.cc
Merge mysql.com:/home/hf/work/30286/my41-30286
2007-10-05 16:33:08 +05:00
gstream.h
…
ha_ndbcluster_binlog.cc
Merge quad.:/mnt/raid/alik/MySQL/devel/5.1
2008-02-26 19:34:02 +03:00
ha_ndbcluster_binlog.h
…
ha_ndbcluster_cond.cc
Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
2007-10-04 18:37:49 +02:00
ha_ndbcluster_cond.h
…
ha_ndbcluster_tables.h
…
ha_ndbcluster.cc
Merge quad.:/mnt/raid/alik/MySQL/devel/5.1
2008-02-26 19:34:02 +03:00
ha_ndbcluster.h
Bug #34275 mysqld leak if doing multiple statements within same transaction (or wo/ trans)
2008-02-04 15:40:04 +01:00
ha_partition.cc
A pre-requisite for the fix for Bug#12713 "Error in a stored function
2007-12-20 21:16:55 +03:00
ha_partition.h
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22
2007-09-24 15:33:46 +02:00
handler.cc
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
2008-03-05 10:16:20 +01:00
handler.h
A fix and a test case for Bug#12713 "Error in a stored function called from
2008-02-19 14:43:01 +03:00
hash_filo.cc
…
hash_filo.h
…
hostname.cc
Doxygenization of comments.
2007-10-11 13:29:09 -04:00
init.cc
Doxygenization of comments.
2007-10-11 13:29:09 -04:00
item_buff.cc
Doxygenization of comments.
2007-10-11 13:29:09 -04:00
item_cmpfunc.cc
Fix for Bug#30217: Views: changes in metadata behaviour
2008-02-22 13:30:33 +03:00
item_cmpfunc.h
Fix for Bug#30217: Views: changes in metadata behaviour
2008-02-22 13:30:33 +03:00
item_create.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
2007-12-14 10:52:10 -05:00
item_create.h
…
item_func.cc
BUG#31168: @@hostname does not replicate
2008-03-07 13:59:36 +01:00
item_func.h
BUG#31168: @@hostname does not replicate
2008-03-07 13:59:36 +01:00
item_geofunc.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
2007-12-20 22:11:37 +01:00
item_geofunc.h
Fix for Bug#30217: Views: changes in metadata behaviour
2008-02-22 13:30:33 +03:00
item_row.cc
Fix for Bug#30217: Views: changes in metadata behaviour
2008-02-22 13:30:33 +03:00
item_row.h
Fix for Bug#30217: Views: changes in metadata behaviour
2008-02-22 13:30:33 +03:00
item_strfunc.cc
Fix for Bug#30217: Views: changes in metadata behaviour
2008-02-22 13:30:33 +03:00
item_strfunc.h
Fix for Bug#30217: Views: changes in metadata behaviour
2008-02-22 13:30:33 +03:00
item_subselect.cc
Fix for Bug#30217: Views: changes in metadata behaviour
2008-02-22 13:30:33 +03:00
item_subselect.h
Fix for Bug#30217: Views: changes in metadata behaviour
2008-02-22 13:30:33 +03:00
item_sum.cc
Fix for Bug#30217: Views: changes in metadata behaviour
2008-02-22 13:30:33 +03:00
item_sum.h
Fix for Bug#30217: Views: changes in metadata behaviour
2008-02-22 13:30:33 +03:00
item_timefunc.cc
Fix for Bug#30217: Views: changes in metadata behaviour
2008-02-22 13:30:33 +03:00
item_timefunc.h
Fix for Bug#30217: Views: changes in metadata behaviour
2008-02-22 13:30:33 +03:00
item_xmlfunc.cc
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1
2007-10-30 12:03:34 +04:00
item_xmlfunc.h
Fix for bug #32557: order by updatexml causes assertion in filesort
2007-11-21 16:00:09 +04:00
item.cc
Merge buzz.(none):/home/davi/mysql-5.0-runtime
2008-02-28 20:22:50 -03:00
item.h
Merge buzz.(none):/home/davi/mysql-5.0-runtime
2008-02-28 20:22:50 -03:00
key.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
2007-12-20 22:11:37 +01:00
lex_symbol.h
…
lex.h
…
lock.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
2007-12-20 22:11:37 +01:00
log_event_old.cc
Bug#34655 Compile error
2008-02-28 14:55:46 -03:00
log_event_old.h
BUG#31583 (5.1-telco-6.1 -> 5.1.22. Slave returns Error in unknown event):
2007-12-05 20:00:14 +01:00
log_event.cc
BUG#31168: @@hostname does not replicate
2008-03-07 13:59:36 +01:00
log_event.h
BUG#31168: @@hostname does not replicate
2008-03-07 13:59:36 +01:00
log.cc
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
2008-03-05 10:16:20 +01:00
log.h
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1
2007-10-30 12:03:34 +04:00
Makefile.am
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
2007-12-20 22:11:37 +01:00
matherr.c
…
message.mc
…
mf_iocache.cc
Doxygenization of comments.
2007-10-11 13:29:09 -04:00
my_decimal.cc
Doxygenization of comments.
2007-10-11 13:29:09 -04:00
my_decimal.h
Doxygenize comments.
2007-10-16 16:11:50 -04:00
my_lock.c
…
mysql_priv.h
Merge quad.:/mnt/raid/alik/MySQL/devel/5.1
2008-02-26 19:34:02 +03:00
mysqld_suffix.h
Doxygenize comments.
2007-10-16 16:11:50 -04:00
mysqld.cc
Merge quad.:/mnt/raid/alik/MySQL/devel/5.1
2008-02-26 19:34:02 +03:00
net_serv.cc
Bug#34655 Compile error
2008-02-28 14:55:46 -03:00
nt_servc.cc
Doxygenized comments.
2007-10-11 14:37:45 -04:00
nt_servc.h
Doxygenize comments.
2007-10-16 16:11:50 -04:00
opt_range.cc
Merge station.:/mnt/raid/alik/MySQL/devel/5.1
2007-12-14 16:30:22 +03:00
opt_range.h
Better comments
2007-11-06 21:57:51 +03:00
opt_sum.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
2007-12-20 22:11:37 +01:00
parse_file.cc
Doxygenized comments.
2007-10-11 14:37:45 -04:00
parse_file.h
Doxygenize comments.
2007-10-16 16:11:50 -04:00
partition_element.h
…
partition_info.cc
Merge stella.local:/home2/mydev/mysql-5.1-amain
2007-12-11 21:37:33 +01:00
partition_info.h
BUG#27927:Partition pruning not optimal with TO_DAYS and YEAR functions
2007-09-14 14:18:42 +04:00
password.c
…
procedure.cc
Doxygenized comments.
2007-10-11 14:37:45 -04:00
procedure.h
Doxygenize comments.
2007-10-16 16:11:50 -04:00
protocol.cc
Rename send_ok to my_ok. Similarly to my_error, it only records the status,
2008-02-19 15:45:21 +03:00
protocol.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
2007-12-20 22:11:37 +01:00
records.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
2007-12-14 10:52:10 -05:00
repl_failsafe.cc
Bug#34655 Compile error
2008-02-28 14:55:46 -03:00
repl_failsafe.h
…
rpl_constants.h
…
rpl_filter.cc
…
rpl_filter.h
…
rpl_injector.cc
A fix and a test case for Bug#12713 "Error in a stored function called from
2008-02-19 14:43:01 +03:00
rpl_injector.h
…
rpl_mi.cc
…
rpl_mi.h
…
rpl_record_old.cc
…
rpl_record_old.h
…
rpl_record.cc
Bug #32971 No user level error message from slave sql thread when ER_NO_DEFAULT_FOR_FIELD
2008-01-31 14:54:03 +02:00
rpl_record.h
Bug #32971 No user level error message from slave sql thread when ER_NO_DEFAULT_FOR_FIELD
2008-01-31 14:54:03 +02:00
rpl_reporting.cc
…
rpl_reporting.h
…
rpl_rli.cc
Post-merge fixes.
2008-03-14 17:52:57 +01:00
rpl_rli.h
Patch to eliminate some valgrind warnings in debug printout code.
2008-02-11 14:04:30 +03:00
rpl_tblmap.cc
…
rpl_tblmap.h
…
rpl_utility.cc
Fixing return value.
2008-01-30 17:35:25 +01:00
rpl_utility.h
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
2007-09-17 12:38:22 +02:00
scheduler.cc
…
scheduler.h
Bug#28785 thread-handling not displayed properly in SHOW VARIABLES
2007-11-14 16:12:46 -05:00
set_var.cc
BUG#31168: @@hostname does not replicate
2008-03-07 13:59:36 +01:00
set_var.h
BUG#31168: @@hostname does not replicate
2008-03-07 13:59:36 +01:00
slave.cc
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
2008-03-05 10:16:20 +01:00
slave.h
Merge quad.:/mnt/raid/alik/MySQL/devel/5.0-rt
2008-02-18 18:12:05 +03:00
sp_cache.cc
…
sp_cache.h
…
sp_head.cc
Fix for Bug#30217: Views: changes in metadata behaviour
2008-02-22 13:30:33 +03:00
sp_head.h
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
2008-01-25 10:37:29 -07:00
sp_pcontext.cc
…
sp_pcontext.h
…
sp_rcontext.cc
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-33618
2008-01-23 15:36:57 -07:00
sp_rcontext.h
Bug#33618 (Crash in sp_rcontext)
2008-01-23 13:26:41 -07:00
sp.cc
Rename send_eof() to my_eof() for consistency with my_ok() and my_error()
2008-02-19 15:58:08 +03:00
sp.h
Fix for BUG#24923: Functions with ENUM issues.
2007-10-17 12:13:56 +04:00
spatial.cc
…
spatial.h
…
sql_acl.cc
Rename send_eof() to my_eof() for consistency with my_ok() and my_error()
2008-02-19 15:58:08 +03:00
sql_acl.h
merged the fix for bug 30468 to 5.1-opt
2007-09-27 12:32:59 +03:00
sql_analyse.cc
…
sql_analyse.h
…
sql_array.h
Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-10-18 14:32:43 +04:00
sql_base.cc
A fix and a test case for Bug#12713 "Error in a stored function called from
2008-02-19 14:43:01 +03:00
sql_binlog.cc
Rename send_ok to my_ok. Similarly to my_error, it only records the status,
2008-02-19 15:45:21 +03:00
sql_bitmap.h
Fix Bug#27812 "an ampersand is missed in sql/sql_bitmap.h, line 68"
2008-01-29 14:14:34 +03:00
sql_builtin.cc.in
…
sql_cache.cc
Merge quad.:/mnt/raid/alik/MySQL/devel/5.1
2008-02-01 13:55:39 +03:00
sql_cache.h
Doxygenize comments.
2007-10-16 16:11:50 -04:00
sql_class.cc
Merge quad.:/mnt/raid/alik/MySQL/devel/5.1
2008-02-26 19:34:02 +03:00
sql_class.h
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
2008-03-05 10:16:20 +01:00
sql_client.cc
…
sql_connect.cc
Merge quad.:/mnt/raid/alik/MySQL/devel/5.1
2008-02-26 19:34:02 +03:00
sql_crypt.cc
…
sql_crypt.h
…
sql_cursor.cc
Post-merge fixes for bugs 34587 and 32265.
2008-02-20 23:30:29 -02:00
sql_cursor.h
Doxygenize comments.
2007-10-16 16:11:50 -04:00
sql_db.cc
Rename send_ok to my_ok. Similarly to my_error, it only records the status,
2008-02-19 15:45:21 +03:00
sql_delete.cc
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
2008-03-05 10:16:20 +01:00
sql_derived.cc
Bug#12713 "Error in a stored function called from a SELECT doesn't
2007-12-12 18:21:01 +03:00
sql_do.cc
Rename send_ok to my_ok. Similarly to my_error, it only records the status,
2008-02-19 15:45:21 +03:00
sql_error.cc
Rename send_eof() to my_eof() for consistency with my_ok() and my_error()
2008-02-19 15:58:08 +03:00
sql_error.h
…
sql_handler.cc
Rename send_eof() to my_eof() for consistency with my_ok() and my_error()
2008-02-19 15:58:08 +03:00
sql_help.cc
Rename send_eof() to my_eof() for consistency with my_ok() and my_error()
2008-02-19 15:58:08 +03:00
sql_insert.cc
Rename send_ok to my_ok. Similarly to my_error, it only records the status,
2008-02-19 15:45:21 +03:00
sql_lex.cc
Fix for Bug#30217: Views: changes in metadata behaviour
2008-02-22 13:30:33 +03:00
sql_lex.h
Fix for Bug#30217: Views: changes in metadata behaviour
2008-02-22 13:30:33 +03:00
sql_list.cc
…
sql_list.h
…
sql_load.cc
Rename send_ok to my_ok. Similarly to my_error, it only records the status,
2008-02-19 15:45:21 +03:00
sql_locale.cc
…
sql_manager.cc
…
sql_map.cc
type conversions fixed to avoid warnings on Windows
2007-10-23 14:27:11 +05:00
sql_map.h
…
sql_olap.cc
…
sql_parse.cc
Merge quad.:/mnt/raid/alik/MySQL/devel/5.1
2008-02-26 19:34:02 +03:00
sql_partition.cc
Rename send_ok to my_ok. Similarly to my_error, it only records the status,
2008-02-19 15:45:21 +03:00
sql_partition.h
Bug#30822: ALTER TABLE COALESCE PARTITION causes segmentation fault
2007-11-20 11:21:00 +01:00
sql_plugin.cc
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-build
2008-02-18 23:36:57 +01:00
sql_plugin.h
…
sql_prepare.cc
Bug#28386 the general log is incomplete
2008-02-25 07:48:02 -03:00
sql_profile.cc
Fix a compilation failure of the community tree.
2008-02-19 23:47:15 +03:00
sql_profile.h
Correct complaints of reviewers and clean up test.
2007-12-14 08:57:37 -05:00
sql_rename.cc
Rename send_ok to my_ok. Similarly to my_error, it only records the status,
2008-02-19 15:45:21 +03:00
sql_repl.cc
Rename send_eof() to my_eof() for consistency with my_ok() and my_error()
2008-02-19 15:58:08 +03:00
sql_repl.h
…
sql_select.cc
Fix for Bug#30217: Views: changes in metadata behaviour
2008-02-22 13:30:33 +03:00
sql_select.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
2007-12-20 22:11:37 +01:00
sql_servers.cc
Bug#12713 "Error in a stored function called from a SELECT doesn't
2007-12-12 18:21:01 +03:00
sql_servers.h
…
sql_show.cc
Fix for Bug#30217: Views: changes in metadata behaviour
2008-02-22 13:30:33 +03:00
sql_show.h
…
sql_sort.h
…
sql_state.c
…
sql_string.cc
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2007-12-19 18:51:46 +01:00
sql_string.h
…
sql_table.cc
Rename send_eof() to my_eof() for consistency with my_ok() and my_error()
2008-02-19 15:58:08 +03:00
sql_tablespace.cc
…
sql_test.cc
Fix for Bug#30217: Views: changes in metadata behaviour
2008-02-22 13:30:33 +03:00
sql_trigger.cc
Rename send_ok to my_ok. Similarly to my_error, it only records the status,
2008-02-19 15:45:21 +03:00
sql_trigger.h
Doxygenize comments.
2007-10-16 16:11:50 -04:00
sql_udf.cc
A fix and a test case for Bug#12713 "Error in a stored function called from
2008-02-19 14:43:01 +03:00
sql_udf.h
…
sql_union.cc
A pre-requisite for the fix for Bug#12713 "Error in a stored function
2007-12-20 21:16:55 +03:00
sql_update.cc
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
2008-03-05 10:16:20 +01:00
sql_view.cc
We never check the return value of mysql_frm_type for an error. Do
2008-02-26 16:19:23 +03:00
sql_view.h
Merge buzz.(none):/home/davi/mysql-5.0-runtime
2008-02-21 23:21:52 -02:00
sql_yacc.yy
BUG#31168: @@hostname does not replicate
2008-03-07 13:59:36 +01:00
stacktrace.c
Merge vvaintroub@bk-internal.mysql.com:/home/bk/mysql-5.1-build
2008-02-21 01:53:35 +01:00
stacktrace.h
Merge vvaintroub@bk-internal.mysql.com:/home/bk/mysql-5.1-build
2008-02-21 01:53:35 +01:00
strfunc.cc
…
structs.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
2007-12-14 10:52:10 -05:00
table.cc
Merge station.:/mnt/raid/alik/MySQL/devel/5.1
2007-12-14 16:30:22 +03:00
table.h
Fix for Bug#30217: Views: changes in metadata behaviour
2008-02-22 13:30:33 +03:00
thr_malloc.cc
…
time.cc
…
tzfile.h
…
tztime.cc
Bug#12713 "Error in a stored function called from a SELECT doesn't
2007-12-12 18:21:01 +03:00
tztime.h
Doxygenize comments.
2007-10-16 16:11:50 -04:00
udf_example.c
Merge magare.gmz:/home/kgeorge/mysql/work/B30355-5.0-opt
2007-11-27 17:19:51 +02:00
udf_example.def
Bug #29804 UDF parameters don't contain correct string length
2007-10-17 17:54:11 -04:00
uniques.cc
…
unireg.cc
Merge ibm.:/home/alik/Documents/MySQL/devel/5.1
2008-01-19 22:32:48 +03:00
unireg.h
Doxygenize comments.
2007-10-16 16:11:50 -04:00