mariadb/sql
unknown 187cfae6e2 Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


mysql-test/r/insert.result:
  Auto merged
mysql-test/t/insert.test:
  Auto merged
sql/field.cc:
  Auto merged
2007-12-01 15:37:25 +03:00
..
examples Fix for bug #31207: Test "join_nested" shows different strategy on IA64 2007-10-17 20:08:58 +04:00
share Fixed bug #27695. 2007-09-13 18:41:50 +05:00
.cvsignore
add_errmsg
client_settings.h
CMakeLists.txt
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
field.cc Fixed the floating point number tests on Windows. 2007-12-01 15:25:24 +03:00
field.h
field_conv.cc
filesort.cc
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_archive.cc
ha_archive.h
ha_berkeley.cc
ha_berkeley.h
ha_blackhole.cc
ha_blackhole.h
ha_federated.cc
ha_federated.h
ha_heap.cc
ha_heap.h
ha_innodb.cc Bug #20358: InnoDB hang on the adaptive hash index latch in btr0sea.c 2007-10-02 23:47:30 -06:00
ha_innodb.h Bug #20358: InnoDB hang on the adaptive hash index latch in btr0sea.c 2007-10-02 23:47:30 -06:00
ha_myisam.cc compiler warnings fixed. 2007-11-10 21:39:30 +04:00
ha_myisam.h
ha_myisammrg.cc
ha_myisammrg.h
ha_ndbcluster.cc Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 2007-09-12 14:01:51 +02:00
ha_ndbcluster.h
ha_ndbcluster_cond.cc bug#27494 An invalid subselect crashes mysql server: Added check for missing arguments 2007-09-13 09:47:21 +02:00
ha_ndbcluster_cond.h
handler.cc
handler.h
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base 2007-10-18 16:39:55 -06:00
item.h
item_buff.cc
item_cmpfunc.cc Merge mysql.com:/home/ram/work/mysql-5.0-maint 2007-10-29 13:42:02 +04:00
item_cmpfunc.h Merge mysql.com:/home/ram/work/mysql-5.0-maint 2007-10-29 13:42:02 +04:00
item_create.cc
item_create.h
item_func.cc Bug #29804 UDF parameters don't contain correct string length 2007-10-17 17:54:11 -04:00
item_func.h
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc
item_strfunc.h Fix for bug #31349: ERROR 1062 (23000): Duplicate entry '' for key 'group_key' 2007-10-19 14:54:05 +05:00
item_subselect.cc
item_subselect.h
item_sum.cc Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion 2007-10-11 17:20:34 +05:00
item_sum.h
item_timefunc.cc manual merge. 2007-11-10 18:27:57 +04:00
item_timefunc.h Fix for bug #31249: Assertion `!table || (!table->write_set || 2007-10-09 14:37:21 +05:00
item_uniq.cc
item_uniq.h
key.cc
lex.h
lex_symbol.h
lock.cc
log.cc
log_event.cc
log_event.h
Makefile.am
matherr.c
message.mc
mf_iocache.cc
my_decimal.cc Bug#31227: memory overrun with decimal (6,6) and zerofill and group_concat 2007-10-05 09:38:57 +02:00
my_decimal.h
my_lock.c
mysql_priv.h Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base 2007-10-18 16:39:55 -06:00
mysqld.cc Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 2007-10-12 11:30:53 +02:00
mysqld_suffix.h
net_serv.cc
nt_servc.cc
nt_servc.h
opt_range.cc Fix for bug #31207: Test "join_nested" shows different strategy on IA64 2007-10-17 20:08:58 +04:00
opt_range.h
opt_sum.cc
parse_file.cc
parse_file.h
password.c
procedure.cc
procedure.h
protocol.cc
protocol.h
records.cc Fix for bug #31207: Test "join_nested" shows different strategy on IA64 2007-10-17 20:08:58 +04:00
repl_failsafe.cc
repl_failsafe.h
set_var.cc Merge mysql.com:/home/ram/work/mysql-5.0-maint 2007-10-24 21:57:51 +05:00
set_var.h Merge mysql.com:/home/ram/work/b31615/b31615.4.1 2007-10-23 16:04:32 +05:00
slave.cc
slave.h
sp.cc Bug#28318 CREATE FUNCTION (UDF) requires a schema 2007-10-09 20:46:33 -03:00
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc Bug#28318 CREATE FUNCTION (UDF) requires a schema 2007-10-09 20:46:33 -03:00
sp_head.h Bug#28318 CREATE FUNCTION (UDF) requires a schema 2007-10-09 20:46:33 -03:00
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h
sql_acl.cc Merge polly.(none):/home/kaa/src/maint/bug31207/my50-bug31174 2007-10-18 13:47:35 +04:00
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_array.h Fix for bug #31207: Test "join_nested" shows different strategy on IA64 2007-10-17 20:08:58 +04:00
sql_base.cc Bug#31409 RENAME TABLE causes server crash or deadlock when used with HANDLER statements 2007-10-09 12:02:59 -03:00
sql_bitmap.h
sql_cache.cc
sql_cache.h
sql_class.cc Bug #31517: Potential crash due to access of NULL thd in mark_transaction_to_rollback() 2007-10-10 14:00:57 -06:00
sql_class.h
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc
sql_delete.cc
sql_derived.cc
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc Bug#31409 RENAME TABLE causes server crash or deadlock when used with HANDLER statements 2007-10-12 10:55:46 -03:00
sql_help.cc Fix for bug #31207: Test "join_nested" shows different strategy on IA64 2007-10-17 20:08:58 +04:00
sql_insert.cc
sql_lex.cc
sql_lex.h
sql_list.cc
sql_list.h
sql_load.cc
sql_locale.cc
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc Bug#28318 (CREATE FUNCTION (UDF) requires a schema) -- part II 2007-10-15 19:15:38 -06:00
sql_prepare.cc
sql_rename.cc
sql_repl.cc
sql_repl.h
sql_select.cc Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 2007-11-17 19:13:27 +01:00
sql_select.h
sql_show.cc Bug#27747 database metadata doesn't return sufficient column default info 2007-09-20 13:54:46 +05:00
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h
sql_table.cc Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 2007-10-26 15:37:38 +05:00
sql_test.cc
sql_trigger.cc
sql_trigger.h
sql_udf.cc Implementing code review comments 2007-10-16 11:16:31 -06:00
sql_udf.h
sql_union.cc
sql_update.cc
sql_view.cc
sql_view.h
sql_yacc.yy Fixed broken call to my_error 2007-10-16 14:27:20 -06:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 2007-10-26 15:37:38 +05:00
table.cc
table.h
thr_malloc.cc
time.cc
tzfile.h
tztime.cc
tztime.h
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
unireg.cc compiler warnings fixed. 2007-11-10 21:39:30 +04:00
unireg.h
watchdog_mysqld