database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-04-28 06:45:23 +03:00
Code
mariadb/sql
History
unknown 0040aff931 BUG#5390 - problems with merge tables 
Problem #1: INSERT...SELECT, Version for 5.1.
Extended the unique table check by a check of lock data.
Merge sub-tables cannot be detected by doing name checks only.


mysql-test/r/create.result:
  BUG#5390 - problems with merge tables
  Removed a duplicate test.
mysql-test/r/merge.result:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT
  Added test results.
mysql-test/t/create.test:
  BUG#5390 - problems with merge tables
  Removed a duplicate test.
mysql-test/t/merge.test:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT
  Added tests.
sql/lock.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.1.
  Added a new function to find a duplicate lock in a list of tables.
sql/mysql_priv.h:
  Problem #1: INSERT...SELECT, Version for 5.1.
  Added the thread handle to unique_table().
  Added a declaration for the new function.
sql/sql_base.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.1.
  Added the thread handle to unique_table().
  Added a call to the new mysql_lock_have_duplicate(),
  which needs the thread handle, to unique_table().
sql/sql_delete.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.1.
  Added the thread handle to unique_table().
sql/sql_insert.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.1.
  Added the thread handle to unique_table().
sql/sql_load.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.1.
  Added the thread handle to unique_table().
sql/sql_parse.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.1.
  Added the thread handle to unique_table().
sql/sql_update.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.1.
  Added the thread handle to unique_table().
  Replaced a call to find_table_in_local_list() by
  the newly extended unique_table().
2005-12-22 13:48:00 +01:00
..
share
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
.cvsignore
…
add_errmsg
…
authors.h
Finalize storage engine plugins
2005-12-21 10:18:40 -08:00
client_settings.h
…
custom_conf.h
…
derror.cc
…
des_key_file.cc
Many files:
2005-09-30 14:03:55 +02:00
discover.cc
…
field_conv.cc
Fix for bug#11491 Misleading error message if not NULL column set to NULL,
2005-12-01 15:30:11 +04:00
field.cc
Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984
2005-12-09 15:14:19 +03:00
field.h
Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984
2005-12-09 15:14:19 +03:00
filesort.cc
Move handling of suffix_length from strnxfrm_bin() to filesort to ensure proper sorting of all kind of binary objects
2005-10-14 00:04:52 +03:00
frm_crypt.cc
…
gen_lex_hash.cc
…
gstream.cc
…
gstream.h
…
ha_archive.cc
Finalize storage engine plugins
2005-12-21 10:18:40 -08:00
ha_archive.h
Table definition cache, part 2
2005-11-23 22:45:02 +02:00
ha_berkeley.cc
Merge xiphis.org:/home/antony/work2/mysql-5.1
2005-12-21 10:26:39 -08:00
ha_berkeley.h
Merge mysql.com:/home/jimw/my/mysql-5.1-14880
2005-12-05 18:09:42 -08:00
ha_blackhole.cc
Finalize storage engine plugins
2005-12-21 10:18:40 -08:00
ha_blackhole.h
BUG#15406: Adding support for transactions to blackhole.
2005-12-02 01:11:49 +01:00
ha_federated.cc
Merge xiphis.org:/home/antony/work2/mysql-5.1
2005-12-21 10:26:39 -08:00
ha_federated.h
Table definition cache, part 2
2005-11-23 22:45:02 +02:00
ha_heap.cc
Finalize storage engine plugins
2005-12-21 10:18:40 -08:00
ha_heap.h
Table definition cache, part 2
2005-11-23 22:45:02 +02:00
ha_innodb.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
ha_innodb.h
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
ha_myisam.cc
Merge xiphis.org:/home/antony/work2/mysql-5.1
2005-12-21 10:26:39 -08:00
ha_myisam.h
Table definition cache, part 2
2005-11-23 22:45:02 +02:00
ha_myisammrg.cc
Finalize storage engine plugins
2005-12-21 10:18:40 -08:00
ha_myisammrg.h
Table definition cache, part 2
2005-11-23 22:45:02 +02:00
ha_ndbcluster.cc
Merge xiphis.org:/home/antony/work2/mysql-5.1
2005-12-21 10:26:39 -08:00
ha_ndbcluster.h
Made set_part_info a handler method and not a ha_partition method only
2005-11-25 09:11:52 +01:00
ha_partition.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
ha_partition.h
Finalize storage engine plugins
2005-12-21 10:18:40 -08:00
handler.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
handler.h
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
handlerton-win.cc
Makefile.am:
2005-11-26 05:35:37 +01:00
handlerton.cc.in
Make storage engines "pluggable", handlerton work
2005-11-07 16:25:06 +01:00
hash_filo.cc
…
hash_filo.h
…
hostname.cc
Backport of JimW's localhost patch to 4.1 tree.
2005-09-02 17:07:05 -07:00
init.cc
…
item_buff.cc
…
item_cmpfunc.cc
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-12 11:57:07 -08:00
item_cmpfunc.h
Fix bug #15268 Unchecked null value caused server crash
2005-12-09 23:01:52 +03:00
item_create.cc
Adding XPath support: ExtractValue and UpdateXML functions.
2005-12-21 17:13:52 +04:00
item_create.h
Adding XPath support: ExtractValue and UpdateXML functions.
2005-12-21 17:13:52 +04:00
item_func.cc
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-12 11:57:07 -08:00
item_func.h
Patch for WL#2894: Make stored routine variables work
2005-12-07 17:01:17 +03:00
item_geofunc.cc
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2005-10-31 11:54:36 +02:00
item_geofunc.h
…
item_row.cc
Fixed bug #12762:
2005-10-15 14:32:37 -07:00
item_row.h
…
item_strfunc.cc
Merge rurik.mysql.com:/home/igor/mysql-5.0
2005-12-02 20:42:36 -08:00
item_strfunc.h
BUG#9535 Warning for "create table t as select uuid();"
2005-12-07 15:45:31 +01:00
item_subselect.cc
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-12 11:57:07 -08:00
item_subselect.h
A fix and a test case for Bug#12736 "Server crash during a select".
2005-10-13 11:53:00 +04:00
item_sum.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
item_sum.h
item_sum.h, item.cc:
2005-12-11 22:21:19 -08:00
item_timefunc.cc
Merge mysql.com:/home/my/mysql-5.1
2005-11-23 22:58:53 +02:00
item_timefunc.h
Table definition cache, part 2
2005-11-23 22:45:02 +02:00
item_uniq.cc
Table definition cache, part 2
2005-11-23 22:45:02 +02:00
item_uniq.h
Inefficient usage of String::append() fixed.
2005-11-20 20:47:07 +02:00
item_xmlfunc.cc
Adding XPath support: ExtractValue and UpdateXML functions.
2005-12-21 17:13:52 +04:00
item_xmlfunc.h
Adding XPath support: ExtractValue and UpdateXML functions.
2005-12-21 17:13:52 +04:00
item.cc
sql_trigger.cc, item.cc:
2005-12-19 17:36:20 +01:00
item.h
Adding XPath support: ExtractValue and UpdateXML functions.
2005-12-21 17:13:52 +04:00
key.cc
Merge mysql.com:/home/my/mysql-5.1
2005-11-23 22:58:53 +02:00
lex_symbol.h
…
lex.h
Adding XPath support: ExtractValue and UpdateXML functions.
2005-12-21 17:13:52 +04:00
lock.cc
BUG#5390 - problems with merge tables
2005-12-22 13:48:00 +01:00
log_event.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
log_event.h
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
log.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
log.h
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
Makefile.am
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
matherr.c
…
mf_iocache.cc
…
my_decimal.cc
Moved long running query to type_newdecimal-big.test
2005-11-23 20:16:06 +02:00
my_decimal.h
Fix for bug #13573 (wrong data inserted for too big decimals)
2005-10-15 21:57:32 +05:00
my_lock.c
…
mysql_priv.h
BUG#5390 - problems with merge tables
2005-12-22 13:48:00 +01:00
mysqld_suffix.h
…
mysqld.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
net_serv.cc
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-12 17:00:50 -07:00
nt_servc.cc
…
nt_servc.h
…
opt_range.cc
Merge mysql.com:/home/mydev/mysql-5.0-bug10932
2005-12-06 08:31:38 +01:00
opt_range.h
BUG#121915: Merge 4.1->5.0
2005-10-19 01:52:06 +04:00
opt_sum.cc
Merge
2005-10-06 10:54:07 +02:00
parse_file.cc
Merge mysql.com:/home/my/mysql-5.1
2005-11-23 22:58:53 +02:00
parse_file.h
Inefficient usage of String::append() fixed.
2005-11-20 20:47:07 +02:00
password.c
Reviewing new pushed code
2005-10-12 00:58:22 +03:00
procedure.cc
…
procedure.h
…
protocol.cc
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
2005-11-23 00:58:13 +02:00
protocol.h
Fix for BUG#13549 "Server crash with nested stored procedures
2005-11-23 00:50:37 +02:00
records.cc
Many files:
2005-12-01 13:34:48 +01:00
repl_failsafe.cc
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-11-23 14:57:00 +02:00
repl_failsafe.h
pthread_handler_decl() changed to be ctags-friendly
2005-10-08 16:39:55 +02:00
rpl_filter.cc
Fix for BUG#15018 "valgrind error in Rpl_filter (uninitalized memory - could crash)".
2005-11-17 15:58:55 +01:00
rpl_filter.h
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
rpl_rli.h
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
rpl_tblmap.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
rpl_tblmap.h
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
set_var.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
set_var.h
Finalize storage engine plugins
2005-12-21 10:18:40 -08:00
slave.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
slave.h
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
sp_cache.cc
Fix use of "%*s" *printf() specifiers that were really meant to be
2005-10-06 17:37:24 -07:00
sp_cache.h
…
sp_head.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
sp_head.h
Merge mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-12-12 14:59:14 +03:00
sp_pcontext.cc
Patch for WL#2894: Make stored routine variables work
2005-12-07 17:01:17 +03:00
sp_pcontext.h
Patch for WL#2894: Make stored routine variables work
2005-12-07 17:01:17 +03:00
sp_rcontext.cc
Patch for WL#2894: Make stored routine variables work
2005-12-07 17:01:17 +03:00
sp_rcontext.h
Patch for WL#2894: Make stored routine variables work
2005-12-07 17:01:17 +03:00
sp.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
sp.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-12-07 12:47:25 +03:00
spatial.cc
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
2005-11-21 21:15:48 +02:00
spatial.h
fix --ansi --pedantic compilation failure
2005-11-04 16:17:43 +03:00
sql_acl.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
sql_acl.h
Merge mysql.com:/home/timka/mysql/src/5.0-2486
2005-12-07 10:47:43 +02:00
sql_analyse.cc
Inefficient usage of String::append() fixed.
2005-11-20 20:47:07 +02:00
sql_analyse.h
…
sql_array.h
…
sql_base.cc
BUG#5390 - problems with merge tables
2005-12-22 13:48:00 +01:00
sql_binlog.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
sql_bitmap.h
…
sql_cache.cc
Merge xiphis.org:/home/antony/work2/mysql-5.1
2005-12-21 10:26:39 -08:00
sql_cache.h
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-11-23 14:57:00 +02:00
sql_class.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
sql_class.h
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
sql_client.cc
…
sql_crypt.cc
…
sql_crypt.h
…
sql_cursor.cc
A fix for Bug#14845 "mysql_stmt_fetch returns MYSQL_NO_DATA when
2005-11-19 19:00:02 +03:00
sql_cursor.h
A fix and a test case for Bug#6513 "Test Suite: Values inserted by using
2005-09-22 02:11:21 +04:00
sql_db.cc
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-12 11:57:07 -08:00
sql_delete.cc
BUG#5390 - problems with merge tables
2005-12-22 13:48:00 +01:00
sql_derived.cc
Table definition cache, part 2
2005-11-23 22:45:02 +02:00
sql_do.cc
…
sql_error.cc
Additional fix for BUG#7049, after review.
2005-10-17 15:07:47 +02:00
sql_error.h
…
sql_handler.cc
Table definition cache, part 2
2005-11-23 22:45:02 +02:00
sql_help.cc
Merge mysql.com:/home/my/mysql-5.0
2005-11-05 01:32:55 +02:00
sql_insert.cc
BUG#5390 - problems with merge tables
2005-12-22 13:48:00 +01:00
sql_lex.cc
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-12 11:57:07 -08:00
sql_lex.h
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
sql_list.cc
…
sql_list.h
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
sql_load.cc
BUG#5390 - problems with merge tables
2005-12-22 13:48:00 +01:00
sql_manager.cc
Make storage engines "pluggable", handlerton work
2005-11-07 16:25:06 +01:00
sql_manager.h
Make storage engines "pluggable", handlerton work
2005-11-07 16:25:06 +01:00
sql_map.cc
Bug fix for bug #15843 "Added mmap support in myisam creates compile problem
2005-12-19 14:16:21 +01:00
sql_map.h
…
sql_olap.cc
…
sql_parse.cc
BUG#5390 - problems with merge tables
2005-12-22 13:48:00 +01:00
sql_partition.cc
Merge xiphis.org:/home/antony/work2/mysql-5.1
2005-12-21 10:26:39 -08:00
sql_plugin.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
sql_plugin.h
Finalize storage engine plugins
2005-12-21 10:18:40 -08:00
sql_prepare.cc
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-12 11:57:07 -08:00
sql_rename.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
sql_repl.cc
Merge mysql.com:/home/mysql_src/mysql-5.0
2005-11-18 16:38:01 +01:00
sql_repl.h
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
sql_select.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
sql_select.h
Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984
2005-12-09 15:14:19 +03:00
sql_show.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
sql_show.h
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
sql_sort.h
…
sql_state.c
…
sql_string.cc
Inefficient usage of String::append() fixed.
2005-11-20 20:47:07 +02:00
sql_string.h
Netware specific changes.
2005-12-14 01:21:56 +02:00
sql_table.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
sql_test.cc
Table definition cache, part 2
2005-11-23 22:45:02 +02:00
sql_trigger.cc
sql_trigger.cc, item.cc:
2005-12-19 17:36:20 +01:00
sql_trigger.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-12-07 12:47:25 +03:00
sql_udf.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
sql_udf.h
…
sql_union.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
sql_update.cc
BUG#5390 - problems with merge tables
2005-12-22 13:48:00 +01:00
sql_view.cc
Merge xiphis.org:/home/antony/work2/mysql-5.1
2005-12-21 10:26:39 -08:00
sql_view.h
Finalize storage engine plugins
2005-12-21 10:18:40 -08:00
sql_yacc.yy
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
stacktrace.c
…
stacktrace.h
…
strfunc.cc
…
structs.h
Merge mysql.com:/home/my/mysql-5.1
2005-11-23 22:58:53 +02:00
table.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
table.h
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
thr_malloc.cc
…
time.cc
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
tzfile.h
…
tztime.cc
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-12-13 19:46:35 +02:00
tztime.h
…
udf_example.cc
…
uniques.cc
…
unireg.cc
Finalize storage engine plugins
2005-12-21 10:18:40 -08:00
unireg.h
Merge mysql.com:/home/mydev/mysql-5.0-bug10932
2005-12-06 08:31:38 +01:00
watchdog_mysqld
…