mariadb/sql
unknown a451de2f59 Merge host.loc:/home/uchum/work/mysql-5.1
into  host.loc:/home/uchum/work/5.1-opt


client/mysqltest.c:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
2008-03-27 15:54:45 +04:00
..
examples Fix for bug #31207: Test "join_nested" shows different strategy on IA64 2007-10-17 20:08:58 +04:00
share A patch for Bug#21854: Problems with CREATE TRIGGER without 2008-03-21 18:34:12 +03: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 Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
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 Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
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 Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
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 Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
events.cc Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2008-02-22 16:20:05 +01:00
events.h Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
field.cc Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1 2008-03-14 11:13:54 -07:00
field.h Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1 2008-03-14 11:13:54 -07:00
field_conv.cc Doxygenization of comments. 2007-10-11 13:29:09 -04:00
filesort.cc Merge kaamos.(none):/data/src/mysql-5.1 2008-03-12 11:19:46 +03: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.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_ndbcluster_binlog.cc Merge quad.:/mnt/raid/alik/MySQL/devel/5.1 2008-02-26 19:34:02 +03:00
ha_ndbcluster_binlog.h Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 2007-09-11 16:17:28 +02:00
ha_ndbcluster_cond.cc Merge mysql.com:/misc/mysql/34749/50-34749 2008-03-10 07:07:56 +01:00
ha_ndbcluster_cond.h Merge mysql.com:/misc/mysql/34749/50-34749 2008-03-10 07:07:56 +01:00
ha_ndbcluster_tables.h
ha_partition.cc Valgrind warnings found after bug#32943 and after merge from -main 2008-03-17 15:56:53 +01: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-14 18:32:01 +01:00
handler.h merge bug 26461 to 5.1-opt 2008-03-23 14:29:35 +02: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.cc Merge host.loc:/home/uchum/work/mysql-5.1 2008-03-27 15:54:45 +04:00
item.h Merge kaamos.(none):/data/src/mysql-5.1 2008-03-12 11:19:46 +03:00
item_buff.cc Doxygenization of comments. 2007-10-11 13:29:09 -04:00
item_cmpfunc.cc Merge kaamos.(none):/data/src/mysql-5.1 2008-03-12 11:19:46 +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 mysql.com:/home/bar/mysql-work/mysql-5.0.b27580v2 2008-03-07 15:28:51 +04:00
item_create.h Fix doxygen warnings. 2007-08-15 17:43:08 +04:00
item_func.cc Merge stella.local:/home2/mydev/mysql-5.1-amain 2008-03-26 10:27:00 +01:00
item_func.h Merge stella.local:/home2/mydev/mysql-5.1-amain 2008-03-26 10:27:00 +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 Merge host.loc:/home/uchum/work/PA/5.0-opt-34763 2008-03-20 00:30:37 +04:00
item_subselect.h Fix for Bug#30217: Views: changes in metadata behaviour 2008-02-22 13:30:33 +03:00
item_sum.cc Merge kaamos.(none):/data/src/opt/bug34512/my51 2008-03-19 16:31:26 +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
key.cc Bug#34358: Cannot find specified bit row in partitioned table 2008-02-07 15:09:59 +01:00
lex.h
lex_symbol.h
lock.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 2007-12-20 22:11:37 +01:00
log.cc Merge host.loc:/home/uchum/work/mysql-5.1 2008-03-27 15:54:45 +04:00
log.h Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-10-30 12:03:34 +04:00
log_event.cc Merge stella.local:/home2/mydev/mysql-5.1-amain 2008-03-26 10:27:00 +01:00
log_event.h BUG#31168: @@hostname does not replicate 2008-03-07 13:59:36 +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
Makefile.am Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 2007-12-20 22:11:37 +01:00
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 host.loc:/home/uchum/work/mysql-5.1 2008-03-27 15:54:45 +04:00
mysqld.cc Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1 2008-03-18 13:51:17 +03:00
mysqld_suffix.h Doxygenize comments. 2007-10-16 16:11:50 -04: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 Bug#35305: partition_symlink test failures 2008-03-17 16:11:26 +01:00
partition_info.h Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1 2008-03-14 11:13:54 -07:00
password.c
procedure.cc Doxygenized comments. 2007-10-11 14:37:45 -04:00
procedure.h Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt 2008-03-21 17:48:28 +02: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 Merge stella.local:/home2/mydev/mysql-5.0-axmrg 2008-03-20 11:33:34 +01:00
repl_failsafe.h Renaming MASTER_INFO to Master_info in order to follow the coding 2007-08-16 08:52:50 +02:00
rpl_constants.h
rpl_filter.cc Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
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 Bug #31326: No compile check of order of initializations 2007-12-14 15:21:37 +02:00
rpl_mi.h Renaming MASTER_INFO to Master_info in order to follow the coding 2007-08-16 08:52:50 +02:00
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_record_old.cc Renaming RELAY_LOG_INFO and st_relay_log_info to follow coding standards 2007-08-16 07:37:50 +02:00
rpl_record_old.h Renaming RELAY_LOG_INFO and st_relay_log_info to follow coding standards 2007-08-16 07:37:50 +02:00
rpl_reporting.cc
rpl_reporting.h
rpl_rli.cc Merge stella.local:/home2/mydev/mysql-5.1-amain 2008-03-26 10:27:00 +01:00
rpl_rli.h BUG#13861 - START SLAVE UNTIL may stop 1 evnt too late if 2008-02-27 21:46:06 +04: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 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 2008-03-14 18:32:01 +01:00
set_var.h Eliminating compiler warnings. 2008-03-25 15:20:42 +01:00
slave.cc Merge stella.local:/home2/mydev/mysql-5.1-amain 2008-03-26 10:27:00 +01:00
slave.h BUG#13861 - START SLAVE UNTIL may stop 1 evnt too late if 2008-02-22 19:07:07 +04:00
sp.cc Merge kaamos.(none):/data/src/mysql-5.1 2008-03-12 11:19:46 +03:00
sp.h Fix for BUG#24923: Functions with ENUM issues. 2007-10-17 12:13:56 +04:00
sp_cache.cc Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
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 Bug#8759 (Stored Procedures: SQLSTATE '00000' should be illegal) 2008-03-21 12:08:04 -06:00
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
spatial.cc
spatial.h
sql_acl.cc Merge host.loc:/home/uchum/work/mysql-5.1 2008-03-27 15:54:45 +04:00
sql_acl.h Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt 2008-03-21 17:48:28 +02:00
sql_analyse.cc Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt 2008-03-21 17:48:28 +02:00
sql_analyse.h Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt 2008-03-21 17:48:28 +02:00
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 Merge host.loc:/home/uchum/work/mysql-5.1 2008-03-27 15:54:45 +04: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 adventure.(none):/home/thek/Development/cpp/bug25132/my50-bug25132 2008-03-10 16:46:38 +01:00
sql_cache.h Doxygenize comments. 2007-10-16 16:11:50 -04:00
sql_class.cc Post-merge fixes for Bug 35103 2008-03-17 16:39:09 -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 Fix for Bug#33507: Event scheduler creates more threads 2008-03-12 17:44:40 +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 Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt 2008-03-21 17:48:28 +02:00
sql_delete.cc Merge host.loc:/home/uchum/work/mysql-5.1 2008-03-27 15:54:45 +04: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 BUG#34768 - nondeterministic INSERT using LIMIT logged in stmt mode if 2008-03-18 20:25:34 +04: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 Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt 2008-03-21 17:48:28 +02: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 host.loc:/home/uchum/work/mysql-5.1 2008-03-27 15:54:45 +04:00
sql_partition.cc Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines 2008-03-07 13:46:29 -08: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 pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1 2008-03-14 11:13:54 -07:00
sql_plugin.h
sql_prepare.cc Merge host.loc:/home/uchum/work/mysql-5.1 2008-03-27 15:54:45 +04: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 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl 2008-03-14 18:38:54 +01:00
sql_select.cc Merge host.loc:/home/uchum/work/5.0-opt 2008-03-27 00:51:29 +04: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 Merge mysql.com:/home/svoj/devel/mysql/BUG34790/mysql-5.1-engines 2008-03-21 12:46:01 +04:00
sql_servers.h
sql_show.cc Merge host.loc:/home/uchum/work/mysql-5.1 2008-03-27 15:54:45 +04:00
sql_show.h
sql_sort.h
sql_state.c
sql_string.cc Bug#23924 general_log truncates queries with character set introducers. 2008-02-29 17:56:50 +04:00
sql_string.h Bug#23924 general_log truncates queries with character set introducers. 2008-02-29 17:56:50 +04:00
sql_table.cc Merge host.loc:/home/uchum/work/mysql-5.1 2008-03-27 15:54:45 +04: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 host.loc:/home/uchum/work/mysql-5.1 2008-03-27 15:54:45 +04: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 Merge stella.local:/home2/mydev/mysql-5.1-amain 2008-03-26 10:27:00 +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 Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
structs.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 2007-12-14 10:52:10 -05:00
table.cc Merge stella.local:/home2/mydev/mysql-5.1-amain 2007-12-17 09:02:24 +01:00
table.h Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt 2008-03-12 13:56:50 +03:00
thr_malloc.cc
time.cc re-push of Bug 29536 for 5.1.22: timestamp inconsistent in replication around 1970 2007-08-27 12:33:57 +03:00
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 Fix for Bug#34274: Invalid handling of 'DEFAULT 0' 2008-03-22 11:32:24 +03:00
unireg.h Merge kaamos.(none):/data/src/opt/bug31236/my51-bug31236 2008-02-20 00:37:51 +03:00