mariadb/sql
unknown 45031a4454 Merge mysql.com:/home/mydev/mysql-4.1-4100
into mysql.com:/home/mydev/mysql-5.0-5000


include/my_sys.h:
  Auto merged
myisam/myisampack.c:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
2005-04-28 19:34:05 +02:00
..
examples Merge 2005-04-28 10:58:24 +02:00
share Post-review fixes of the patch for BUG#8408: Stored procedure crash if function contains SHOW 2005-04-27 16:35:49 +02:00
.cvsignore
add_errmsg
client_settings.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
field.cc Bit type: fix for create_field::create_field(). 2005-04-14 14:32:25 +05:00
field.h Bit type: fix for create_field::create_field(). 2005-04-14 14:32:25 +05:00
field_conv.cc Bit type support for non-MyISAM tables. 2005-04-12 12:27:43 +05:00
filesort.cc Moved some old test and added a new test to only be run with mysql-test-run --big 2005-04-07 19:24:14 +03:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_berkeley.cc BUG#9714 libsupc++ problem 2005-04-27 11:25:08 +02:00
ha_berkeley.h
ha_blackhole.cc BUG#9714 libsupc++ problem 2005-04-27 11:25:08 +02:00
ha_blackhole.h
ha_federated.cc BUG#9714 libsupc++ problem 2005-04-27 11:25:08 +02:00
ha_federated.h
ha_heap.cc BUG#9714 libsupc++ problem 2005-04-27 11:25:08 +02:00
ha_heap.h
ha_innodb.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-04-27 18:28:57 +02:00
ha_innodb.h Many files: 2005-04-20 19:27:46 +03:00
ha_myisam.cc BUG#9714 libsupc++ problem 2005-04-27 11:25:08 +02:00
ha_myisam.h
ha_myisammrg.cc Merge mysql.com:/home/mydev/mysql-4.1-4100 2005-04-28 19:34:05 +02:00
ha_myisammrg.h
ha_ndbcluster.cc Merge neptunus.(none):/home/msvensson/mysql/bug9714 2005-04-27 12:30:11 +02:00
ha_ndbcluster.h Merge 2005-04-22 17:38:28 +02:00
handler.cc Merge 2005-04-28 10:58:24 +02:00
handler.h Many files: 2005-04-20 19:27:46 +03:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge neptunus.(none):/home/msvensson/mysql/bug9714 2005-04-27 12:30:11 +02:00
item.h Merge rurik.mysql.com:/home/igor/mysql-5.0 2005-04-15 22:35:29 -07:00
item_buff.cc
item_cmpfunc.cc Merge 2005-04-01 10:13:37 +02:00
item_cmpfunc.h
item_create.cc Merge mdk10.(none):/home/reggie/bk/mysql-4.1 2005-04-11 09:29:49 -05:00
item_create.h
item_func.cc Post-review fixes of the patch for BUG#8408: Stored procedure crash if function contains SHOW 2005-04-27 16:35:49 +02:00
item_func.h Merge mysql.com:/usr/local/bk/mysql-5.0 2005-04-27 14:10:33 +02:00
item_geofunc.cc
item_geofunc.h
item_row.cc Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902) 2005-04-01 15:04:50 +03:00
item_row.h
item_strfunc.cc
item_strfunc.h
item_subselect.cc postmerge 4.1->5.0 fixes 2005-04-01 02:14:30 +03:00
item_subselect.h subselect.result, subselect.test: 2005-04-15 22:08:34 -07:00
item_sum.cc BUG#9714 libsupc++ problem 2005-04-27 11:25:08 +02:00
item_sum.h XID SQL syntax 2005-04-04 00:50:05 +02:00
item_timefunc.cc Merge mysql.com:/home/dlenev/src/mysql-4.1-bg10040 2005-04-25 11:35:30 +04:00
item_timefunc.h
item_uniq.cc
item_uniq.h
key.cc
lex.h
lex_symbol.h
lock.cc Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock 2005-04-27 22:58:11 +02:00
log.cc Fixes for BUG#10039 "MEMORY engine is reported as HEAP", 2005-04-23 00:05:05 +02:00
log_event.cc
log_event.h
Makefile.am Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902) 2005-04-01 15:04:50 +03:00
matherr.c
mf_iocache.cc
my_decimal.cc Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902) 2005-04-01 15:04:50 +03:00
my_decimal.h
my_lock.c
mysql_priv.h Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock 2005-04-27 22:58:11 +02:00
mysqld.cc ha_innodb.cc, mysqld.cc: 2005-04-27 13:36:58 +03:00
mysqld_suffix.h
net_serv.cc
nt_servc.cc
nt_servc.h
opt_range.cc BUG#10037: A proper fix: Add 0.01 to cost of 'range' scans, don't add 0.01 to cost of the 'index' scan. 2005-04-26 01:56:10 +04:00
opt_range.h
opt_sum.cc
parse_file.cc
parse_file.h
password.c
procedure.cc
procedure.h
protocol.cc Bug#8861 2005-04-21 15:36:10 +01:00
protocol.h BUG#9391 mysqlshow prints incorrect "rows" information 2005-04-13 12:22:20 +02:00
protocol_cursor.cc
records.cc Moved some old test and added a new test to only be run with mysql-test-run --big 2005-04-07 19:24:14 +03:00
repl_failsafe.cc
repl_failsafe.h
set_var.cc Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-04-26 17:57:15 +03:00
set_var.h
slave.cc
slave.h
sp.cc Fix for bug #9566 "explicit LOCK TABLE and store procedures result in 2005-04-07 01:40:29 +04:00
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-04-22 10:51:04 +04:00
sp_head.h
sp_pcontext.cc Fixed BUG#9073: Able to declare two handlers for same condition in same scope 2005-04-08 19:58:04 +02:00
sp_pcontext.h Fixed BUG#9856: Stored procedures: crash if handler for sqlexception, not found. 2005-04-13 16:57:49 +02:00
sp_rcontext.cc Fixed BUG#9598: stored procedure call within stored procedure 2005-04-14 14:52:35 +02:00
sp_rcontext.h Fixed BUG#9598: stored procedure call within stored procedure 2005-04-14 14:52:35 +02:00
spatial.cc
spatial.h
sql_acl.cc
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_base.cc information_schema.result, information_schema.test: 2005-04-13 23:06:37 -07:00
sql_bitmap.h
sql_cache.cc
sql_cache.h
sql_class.cc mysql-test/r/flush_block_commit.result 2005-04-12 23:08:19 +02:00
sql_class.h Merge 2005-04-05 13:23:11 +02:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_db.cc BUG#9455 mysqladmin status crash the server 2005-04-14 11:56:13 +02:00
sql_delete.cc Merge 2005-04-16 17:58:11 +02:00
sql_derived.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2005-04-01 13:02:29 +03:00
sql_do.cc
sql_error.cc Fixed BUG#9004: Inconsistent behaviour of SP re. warnings 2005-04-22 12:53:48 +02:00
sql_error.h Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902) 2005-04-01 15:04:50 +03:00
sql_handler.cc
sql_help.cc
sql_insert.cc Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock 2005-04-27 22:58:11 +02:00
sql_lex.cc BUG#9922 - INSERT SELECT with UNIONs allows concurrent INSERTs 2005-04-15 19:20:15 +02:00
sql_lex.h Fix for bug #9486 "Can't perform multi-update in stored procedure". 2005-04-15 20:31:47 +04:00
sql_list.cc
sql_list.h
sql_load.cc Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902) 2005-04-01 15:04:50 +03:00
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc Post-review fixes of the patch for BUG#8408: Stored procedure crash if function contains SHOW 2005-04-27 16:35:49 +02:00
sql_prepare.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-04-22 10:51:04 +04:00
sql_rename.cc
sql_repl.cc sql_repl.cc: 2005-04-27 03:18:54 +03:00
sql_repl.h
sql_select.cc Merge rurik.mysql.com:/home/igor/mysql-5.0 2005-04-20 16:39:31 -07:00
sql_select.h BUG#9103 merge to 5.0 2005-04-20 12:09:56 +04:00
sql_show.cc Fix for BUG#9439: 2005-04-16 23:35:39 +04:00
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h
sql_table.cc Bug#9102 - Stored proccedures: function which returns blob causes crash 2005-04-19 09:09:25 +01:00
sql_test.cc
sql_trigger.cc
sql_trigger.h
sql_udf.cc Merge xiphis.org:/var/db/bk/work-acurtis/bug6776.1 2005-04-09 00:36:08 +01:00
sql_udf.h
sql_union.cc merge 4.1->5.0 2005-03-31 10:39:48 +03:00
sql_update.cc Fix for bug #9486 "Can't perform multi-update in stored procedure". 2005-04-15 20:31:47 +04:00
sql_view.cc Fix for BUG#10107: Memory leak in view over subquery: 2005-04-23 06:55:43 +04:00
sql_view.h
sql_yacc.yy Fixed BUG#8408: Stored procedure crash if function contains SHOW 2005-04-26 17:31:59 +02:00
stacktrace.c Step 2 of the switch to support configuration with NPTL: 2005-04-20 20:38:57 +02:00
stacktrace.h Step 2 of the switch to support configuration with NPTL: 2005-04-20 20:38:57 +02:00
strfunc.cc
structs.h
table.cc Bit type support for non-MyISAM tables. 2005-04-12 12:27:43 +05:00
table.h Bug#7806 - insert on duplicate key and auto-update of timestamp 2005-04-22 17:13:18 +02:00
thr_malloc.cc
time.cc Don't use -lsupc++ with gcc 3.3 and below as this gives linking problems when linking staticly 2005-04-04 16:43:25 +03:00
tzfile.h
tztime.cc
tztime.h
udf_example.cc
uniques.cc
unireg.cc Fix for bug #9571: Primary key creation causes server crash. 2005-04-05 13:40:34 +05:00
unireg.h
watchdog_mysqld