mariadb/sql
unknown 2b3e560622 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/t/type_decimal.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
2007-10-29 15:40:41 +04:00
..
examples
share Merge gleb.loc:/home/uchum/work/bk/5.0-opt 2007-10-26 18:05:46 +05:00
.cvsignore
add_errmsg
authors.h
client_settings.h
CMakeLists.txt Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 2007-08-29 22:29:58 +02:00
contributors.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
event_data_objects.cc Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
event_data_objects.h Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
event_db_repository.cc Manual merge of parallel development in separate team trees. 2007-08-22 17:13:42 +02:00
event_db_repository.h Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
event_queue.cc Manual merge of parallel development in separate team trees. 2007-08-22 17:13:42 +02:00
event_queue.h Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
event_scheduler.cc Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
event_scheduler.h Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
events.cc Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
events.h Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
field.cc Merge magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt 2007-10-23 11:44:14 +03:00
field.h Merge magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt 2007-10-23 11:44:14 +03:00
field_conv.cc Fix doxygen warnings. 2007-08-16 21:14:47 +04:00
filesort.cc Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 2007-10-23 15:52:27 +04:00
frm_crypt.cc
gen_lex_hash.cc
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 whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 2007-09-12 14:02:27 +02:00
ha_ndbcluster.h WL#3732 Information schema optimization 2007-08-03 03:14:05 +05:00
ha_ndbcluster_binlog.cc Bug #11313 confusing/erroneous 4006 message 2007-09-07 11:15:07 +02: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:/windows/Linux_space/MySQL/mysql-5.0-ndb 2007-09-13 10:00:14 +02:00
ha_ndbcluster_cond.h
ha_ndbcluster_tables.h
ha_partition.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.1 2007-10-23 19:08:21 +05: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 Fixed bug #31310. 2007-10-09 01:07:15 +05:00
handler.h Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format. 2007-09-07 18:41:49 +05:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge gleb.loc:/home/uchum/work/bk/5.0-opt 2007-10-26 18:05:46 +05:00
item.h Merge polly.(none):/home/kaa/src/opt/bug28550/my50-bug28550 2007-10-21 21:49:30 +04:00
item_buff.cc
item_cmpfunc.cc Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-10-13 09:13:00 +03:00
item_cmpfunc.h merge of the fix for bug 27802 & 27216 to 5.1-opt 2007-09-26 19:06:54 +03:00
item_create.cc Manual merge of 5.0-runtime to 5.1-runtime 2007-10-16 20:47:08 -06:00
item_create.h Fix doxygen warnings. 2007-08-15 17:43:08 +04:00
item_func.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 2007-10-29 15:40:41 +04:00
item_func.h Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 2007-10-29 15:40:41 +04:00
item_geofunc.cc Merge mysql.com:/home/hf/work/31155/my50-31155 2007-10-12 15:33:26 +05:00
item_geofunc.h Merge mysql.com:/home/hf/work/31155/my50-31155 2007-10-12 15:33:26 +05:00
item_row.cc
item_row.h
item_strfunc.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 2007-10-11 16:13:14 +05:00
item_strfunc.h Merge polly.(none):/home/kaa/src/opt/bug28550/my50-bug28550 2007-10-21 21:49:30 +04:00
item_subselect.cc Manual merge of parallel development in separate team trees. 2007-08-22 17:13:42 +02:00
item_subselect.h
item_sum.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 2007-10-29 14:53:42 +04:00
item_sum.h
item_timefunc.cc Merge magare.gmz:/home/kgeorge/mysql/work/B31221-5.0-gca-opt 2007-10-18 15:57:59 +03:00
item_timefunc.h Merge mysql.com:/home/gluh/MySQL/Merge/5.1 2007-10-23 19:08:21 +05:00
item_xmlfunc.cc Fix for bug #31438: updatexml still crashes 2007-10-08 16:52:15 +05:00
item_xmlfunc.h
key.cc Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
lex.h
lex_symbol.h
lock.cc Merge moksha.local:/Users/davi/mysql/push/bugs/25164-5.0 2007-08-27 10:19:58 -03:00
log.cc Bug#21557 entries in the general query log truncated at 1000 characters. 2007-10-18 15:45:07 -03:00
log.h Bug#21557 entries in the general query log truncated at 1000 characters. 2007-10-18 15:45:07 -03:00
log_event.cc Bug#21557 entries in the general query log truncated at 1000 characters. 2007-10-18 15:45:07 -03:00
log_event.h Merge sita.local:/Users/tsmith/m/bk/maint/51-target22 2007-08-29 15:28:38 -06:00
log_event_old.cc Post-merge fixes, and disable buggy test case on embedded 2007-08-29 16:58:00 -06:00
log_event_old.h Merge sita.local:/Users/tsmith/m/bk/maint/51-target22 2007-08-29 15:28:38 -06:00
Makefile.am Makefile.am: 2007-09-26 18:47:55 +02:00
matherr.c
message.mc
mf_iocache.cc
my_decimal.cc Merge sin.intern.azundris.com:/home/tnurnberg/31227/50-31227 2007-10-05 09:47:14 +02:00
my_decimal.h
my_lock.c
mysql_priv.h Merge polly.(none):/home/kaa/src/opt/bug29131/my50-bug29131 2007-10-29 10:25:48 +03:00
mysqld.cc Fixed compile warnings introduced by the patch for bug #29131. 2007-10-29 11:52:44 +03:00
mysqld_suffix.h
net_serv.cc Fix broken compilation. 2007-10-15 15:49:16 +04:00
nt_servc.cc
nt_servc.h
opt_range.cc type conversions fixed to get rid of warnings 2007-10-23 16:32:05 +05:00
opt_range.h
opt_sum.cc Merge magare.gmz:/home/kgeorge/mysql/work/B30715-merged-5.0-opt 2007-10-24 11:50:09 +03:00
parse_file.cc Slow query log to file now displays queries with microsecond precission 2007-07-30 11:33:50 +03:00
parse_file.h
partition_element.h
partition_info.cc Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03: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
procedure.h
protocol.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.1 2007-10-23 19:08:21 +05:00
protocol.h
records.cc
repl_failsafe.cc Renaming MASTER_INFO to Master_info in order to follow the coding 2007-08-16 08:52:50 +02: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
rpl_injector.h
rpl_mi.cc Renaming MASTER_INFO to Master_info in order to follow the coding 2007-08-16 08:52:50 +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 Merge sita.local:/Users/tsmith/m/bk/maint/51-target22 2007-08-29 15:28:38 -06:00
rpl_record.h Merge sita.local:/Users/tsmith/m/bk/maint/51-target22 2007-08-29 15:28:38 -06: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 Renaming RELAY_LOG_INFO and st_relay_log_info to follow coding standards 2007-08-16 07:37:50 +02:00
rpl_rli.h Minor fix to let the build proceed. 2007-08-17 13:22:31 +02:00
rpl_tblmap.cc
rpl_tblmap.h
rpl_utility.cc Merge sita.local:/Users/tsmith/m/bk/maint/51-target22 2007-08-29 15:28:38 -06:00
rpl_utility.h Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 2007-09-04 12:25:54 -06:00
scheduler.cc
scheduler.h
set_var.cc Merge polly.(none):/home/kaa/src/opt/bug29131/my51-bug29131 2007-10-29 10:31:26 +03:00
set_var.h Fix for bug #29131: SHOW VARIABLES reports variable 'log' but SET 2007-10-25 14:02:27 +04:00
slave.cc Merge sita.local:/Users/tsmith/m/bk/maint/51-target22 2007-08-29 15:28:38 -06:00
slave.h Merge sita.local:/Users/tsmith/m/bk/maint/51-target22 2007-08-29 15:28:38 -06:00
sp.cc Fix for BUG#24923: Functions with ENUM issues. 2007-10-17 12:13:56 +04: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 Merge moksha.com.br:/Users/davi/mysql/bugs/21557-5.1 2007-10-18 15:47:22 -03:00
sp_head.h Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-runtime 2007-10-16 15:43:16 -06:00
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc Merge moonbone.local:/mnt/gentoo64/work/24989-bug-5.0-opt-mysql 2007-08-02 18:42:56 +04:00
sp_rcontext.h Bug#24989: The DEADLOCK error is improperly handled by InnoDB. 2007-07-30 17:14:34 +04:00
spatial.cc Merge gleb.loc:/home/uchum/work/bk/5.0-opt 2007-07-07 20:14:06 +05:00
spatial.h
sql_acl.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.1 2007-10-23 19:08:21 +05: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 Fix doxygen warnings. 2007-08-15 17:43:08 +04:00
sql_analyse.h Fix doxygen warnings. 2007-08-15 17:43:08 +04:00
sql_array.h
sql_base.cc Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-10-26 12:47:59 +02:00
sql_binlog.cc Renaming RELAY_LOG_INFO and st_relay_log_info to follow coding standards 2007-08-16 07:37:50 +02:00
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc Bug#30710 query_cache.test fails on embedded - per-column privs test 2007-10-16 14:42:42 +02:00
sql_cache.h Merge adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269 2007-08-17 17:26:38 +02:00
sql_class.cc Merge gleb.loc:/home/uchum/work/bk/5.0-opt 2007-10-26 18:05:46 +05:00
sql_class.h Merge gleb.loc:/home/uchum/work/bk/5.0-opt 2007-10-26 18:05:46 +05:00
sql_client.cc
sql_connect.cc Fix for BUG#20023: mysql_change_user() resets the value 2007-10-10 17:57:01 +04:00
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc WL#4030 (Deprecate RENAME DATABASE: replace with ALTER DATABASE <name> 2007-09-10 16:10:37 -06:00
sql_delete.cc Add comments, tidy up sql_delete.cc to refer to thd->row_count_func 2007-10-15 16:42:41 +04:00
sql_derived.cc
sql_do.cc
sql_error.cc WL#3984 (Revise locking of mysql.general_log and mysql.slow_log) 2007-07-27 00:31:06 -06:00
sql_error.h
sql_handler.cc Merge moksha.com.br:/Users/davi/mysql/bugs/post-rename-5.0 2007-10-12 10:56:50 -03:00
sql_help.cc Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
sql_insert.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.1 2007-10-23 19:08:21 +05:00
sql_lex.cc Fix for bug #29444: crash with partition refering to table in create-select 2007-10-09 19:16:39 +05:00
sql_lex.h Merge mysql.com:/home/gluh/MySQL/Merge/5.1 2007-10-23 19:08:21 +05:00
sql_list.cc
sql_list.h
sql_load.cc (Pushing for Andrei) 2007-07-30 19:02: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 mysql.com:/home/gluh/MySQL/Merge/5.1 2007-10-23 19:08:21 +05:00
sql_partition.cc Fix for bug #29444: crash with partition refering to table in create-select 2007-10-09 19:16:39 +05:00
sql_partition.h
sql_plugin.cc fix undefined variable which can lead to crash 2007-10-04 17:34:28 -07:00
sql_plugin.h
sql_prepare.cc Bug#21557 entries in the general query log truncated at 1000 characters. 2007-10-18 15:45:07 -03:00
sql_rename.cc WL#3984 (Revise locking of mysql.general_log and mysql.slow_log) 2007-07-27 00:31:06 -06:00
sql_repl.cc after merge fix 2007-10-10 14:22:21 +05:00
sql_repl.h Renaming MASTER_INFO to Master_info in order to follow the coding 2007-08-16 08:52:50 +02:00
sql_select.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.1 2007-10-23 19:08:21 +05:00
sql_select.h Merge magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt 2007-10-23 11:44:14 +03:00
sql_servers.cc Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
sql_servers.h
sql_show.cc Bug#31633 Information schema = NULL queries crash the server 2007-10-23 13:20:51 +05:00
sql_show.h WL#3732 Information schema optimization 2007-08-03 03:14:05 +05:00
sql_sort.h Fixed bug #25798. 2007-07-01 15:33:28 -07:00
sql_state.c
sql_string.cc Merge trift2.:/MySQL/M51/target-5.1.22 2007-08-22 16:08:55 +02:00
sql_string.h
sql_table.cc Merge magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt 2007-10-23 11:44:14 +03:00
sql_tablespace.cc
sql_test.cc Fixes Bug#30127: --debug-info no longer prints memory usage in mysql 2007-08-01 22:59:05 +03:00
sql_trigger.cc Fixed whitespace 2007-09-04 16:40:27 -06:00
sql_trigger.h Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 2007-07-16 23:31:36 +04:00
sql_udf.cc Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-runtime 2007-10-16 15:43:16 -06:00
sql_udf.h Remove typedef st_table_list TABLE_LIST and always use name 'TABLE_LIST'. 2007-07-06 16:18:49 +04:00
sql_union.cc Merge moonbone.local:/mnt/gentoo64/work/24989-bug-5.0-opt-mysql 2007-08-02 18:42:56 +04:00
sql_update.cc type conversions fixed to avoid warnings on Windows 2007-10-23 14:27:11 +05:00
sql_view.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 2007-10-04 14:23:55 +05:00
sql_view.h
sql_yacc.yy Merge gleb.loc:/home/uchum/work/bk/5.0-opt 2007-10-26 18:05:46 +05:00
stacktrace.c Merge ymer.(none):/usr/local/mysql/mysql-5.0-engines 2007-07-07 07:48:43 +02:00
stacktrace.h
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 Slow query log to file now displays queries with microsecond precission 2007-07-30 11:33:50 +03:00
table.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.1 2007-10-23 19:08:21 +05:00
table.h merge of the fix for bug 27802 & 27216 to 5.1-opt 2007-09-26 19:06:54 +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 Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
tztime.h Bug#28641 CREATE EVENT with '2038.01.18 03:00:00' let server crash. 2007-07-25 09:43:49 +02:00
udf_example.c Bug #29804 UDF parameters don't contain correct string length 2007-10-17 17:54:11 -04:00
udf_example.def Bug #29804 UDF parameters don't contain correct string length 2007-10-17 17:54:11 -04:00
uniques.cc Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-opt 2007-07-04 11:46:45 +03:00
unireg.cc Merge magare.gmz:/home/kgeorge/mysql/work/B29325-5.0-opt 2007-07-11 11:57:49 +03:00
unireg.h Merge trift2.:/MySQL/M51/target-5.1.22 2007-08-22 16:08:55 +02:00