database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-29 21:42:28 +03:00
Code
mariadb/sql
History
unknown 0e88bff6cb Merge mysql.com:/home/mydev/mysql-4.1-bug5390 
into  mysql.com:/home/mydev/mysql-5.0-bug5390


mysql-test/r/lock.result:
  Auto merged
mysql-test/t/lock.test:
  Auto merged
sql/lock.cc:
  BUG#5390 - problems with merge tables
  Manual merge
sql/table.h:
  BUG#5390 - problems with merge tables
  Manual merge
2006-02-06 15:15:44 +01:00
..
examples
documenting HA_STATUS_xxx flags
2005-11-26 08:54:13 +01:00
share
Merge mysql.com:/extern/mysql/bk/mysql-5.0
2006-01-19 11:48:07 +01:00
.cvsignore
…
add_errmsg
…
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
a fix (bug #7589: Decimal types are ignored when updating data from another column).
2005-09-21 14:32:19 +05:00
field.cc
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
2006-01-30 17:03:09 +03:00
field.h
merged
2006-01-03 18:12:03 +01: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
a fix (#10742: Can't compile "sql_lex.cc" on AIX 5.2).
2005-05-19 18:56:01 +05:00
gstream.cc
fixes for windows 64-bit compiler warnings
2005-06-13 12:41:15 +02:00
gstream.h
…
ha_archive.cc
Complaint from a user who was getting sick of repairing their tables do to their lousy setup (their words). All crashed archive tables will now be repaired on open.
2006-01-24 21:43:41 -08:00
ha_archive.h
This patch add support for storing Geometry types to Archive, Innodb, NDB, and BDB.
2005-10-24 23:20:39 -07:00
ha_berkeley.cc
BUG#6554 Problem Building MySql on Fedora Core 3
2006-01-16 12:17:30 +01:00
ha_berkeley.h
Fixes during review of new code
2005-11-03 22:42:25 +02:00
ha_blackhole.cc
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-10-02 20:13:18 -07:00
ha_blackhole.h
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-08-26 15:56:52 +03:00
ha_federated.cc
BUG# 14768
2006-01-27 15:43:44 -08:00
ha_federated.h
BUG# 14768
2006-01-27 15:43:44 -08:00
ha_heap.cc
Post-merge fixes.
2006-02-03 00:07:36 +03:00
ha_heap.h
Merge mysql.com:/opt/local/work/mysql-4.1-root
2006-02-02 18:17:18 +03:00
ha_innodb.cc
Fixed: BUG#15653, BUG#16157, BUG#16229, BUG#16298, BUG#16387, BUG#16582.
2006-01-31 21:41:48 +03:00
ha_innodb.h
Fixed: BUG#15653, BUG#16157, BUG#16229, BUG#16298, BUG#16387, BUG#16582.
2006-01-31 21:41:48 +03:00
ha_myisam.cc
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
ha_myisam.h
A fix and a test case for Bug#10760 and complementary cleanups.
2005-07-19 22:21:12 +04:00
ha_myisammrg.cc
Inefficient usage of String::append() fixed.
2005-11-20 20:47:07 +02:00
ha_myisammrg.h
A fix and a test case for Bug#10760 and complementary cleanups.
2005-07-19 22:21:12 +04:00
ha_ndbcluster.cc
Merge mysql.com:/home/jimw/my/mysql-5.0-14212
2006-01-06 08:34:55 -08:00
ha_ndbcluster.h
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-10-03 21:09:01 -07:00
handler.cc
Merge mysql.com:/home/jimw/my/mysql-5.0-14212
2006-01-06 08:34:55 -08:00
handler.h
documenting HA_STATUS_xxx flags
2005-11-26 08:54:13 +01:00
hash_filo.cc
a compiler must see '#pragma implementation' *before*
2005-06-05 19:38:52 +02:00
hash_filo.h
forgotten s/__GNUC__/USE_PRAGMA_INTERFACE/ causes compilation faliures
2005-05-27 14:15:08 +02:00
hostname.cc
Backport of JimW's localhost patch to 4.1 tree.
2005-09-02 17:07:05 -07:00
init.cc
Fixes during review of new pushed code
2005-08-12 13:54:42 +03:00
item_buff.cc
sql_select.cc:
2005-07-25 12:57:23 -07:00
item_cmpfunc.cc
Merge mysql.com:/opt/local/work/mysql-4.1-12734
2006-01-14 19:12:07 +03:00
item_cmpfunc.h
Merge mysql.com:/opt/local/work/mysql-4.1-12734
2006-01-14 19:12:07 +03:00
item_create.cc
Fixed BUG#12963, BUG#13000: wrong VIEW creation with DAYNAME(),
2005-09-14 20:25:00 +04:00
item_create.h
Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs.
2005-08-25 17:34:34 +04:00
item_func.cc
Merging
2006-01-21 18:50:06 +04: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
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02:00
item_row.cc
Fixed bug #12762:
2005-10-15 14:32:37 -07:00
item_row.h
Name resolution context added (BUG#6443)
2005-07-01 07:05:42 +03:00
item_strfunc.cc
Merge mysql.com:/opt/local/work/mysql-4.1-root
2006-01-11 17:49:56 +03: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 rurik.mysql.com:/home/igor/mysql-5.0
2005-11-22 23:00:57 -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
Merge rurik.mysql.com:/home/igor/mysql-5.0
2005-12-02 20:42:36 -08:00
item_sum.h
item_sum.h, item.cc:
2005-12-11 22:21:19 -08:00
item_timefunc.cc
Merge mysql.com:/opt/local/work/mysql-4.1-root
2006-02-02 18:17:18 +03:00
item_timefunc.h
Merge mysql.com:/home/mysql_src/mysql-4.1-gca
2005-11-10 15:13:12 +01:00
item_uniq.cc
Merge with 4.1
2005-06-07 00:31:53 +03:00
item_uniq.h
Inefficient usage of String::append() fixed.
2005-11-20 20:47:07 +02:00
item.cc
Fix for the following bugs:
2006-01-24 20:15:12 +03:00
item.h
Fix for the following bugs:
2006-01-24 20:15:12 +03:00
key.cc
Inefficient usage of String::append() fixed.
2005-11-20 20:47:07 +02:00
lex_symbol.h
…
lex.h
Background:
2005-11-17 11:11:48 +01:00
lock.cc
Merge mysql.com:/home/mydev/mysql-4.1-bug5390
2006-02-06 15:15:44 +01:00
log_event.cc
merged
2006-01-06 18:26:59 +01:00
log_event.h
Fixes during review of pushed code
2005-10-27 15:15:01 +03:00
log.cc
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
2005-11-21 21:15:48 +02:00
Makefile.am
Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause
2006-01-11 02:07:40 +03:00
matherr.c
…
mf_iocache.cc
…
my_decimal.cc
Fix for bug #13573 (wrong data inserted for too big decimals)
2005-10-15 21:57:32 +05: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
Merge mysql.com:/home/mydev/mysql-5.0
2005-12-27 10:31:00 +01:00
mysqld_suffix.h
…
mysqld.cc
Fix option type error, crashes on 64-bit big endian.
2006-01-19 15:36:41 +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
merged
2006-01-06 18:26:59 +01:00
opt_range.h
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
opt_sum.cc
Fixed bug #16016: MIN/MAX optimization was not applied to views.
2006-01-06 22:28:26 -08:00
parse_file.cc
Review fixes of new pushed code
2006-01-06 00:47:49 +02:00
parse_file.h
Inefficient usage of String::append() fixed.
2005-11-20 20:47:07 +02:00
password.c
Merge mysql.com:/opt/local/work/mysql-4.1-root
2006-01-11 17:49:56 +03:00
procedure.cc
Merge with 4.1
2005-06-07 00:31:53 +03:00
procedure.h
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02:00
protocol.cc
Merge mysql.com:/opt/local/work/mysql-4.1-15613
2006-01-19 14:01:20 +03:00
protocol.h
Fix for BUG#13549 "Server crash with nested stored procedures
2005-11-23 00:50:37 +02:00
records.cc
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2005-10-27 23:43:20 +03:00
repl_failsafe.cc
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
repl_failsafe.h
pthread_handler_decl() changed to be ctags-friendly
2005-10-08 16:39:55 +02:00
set_var.cc
Applied patch recieved from Marko:
2006-01-18 15:02:03 +03:00
set_var.h
WL#2971 "change log-bin-trust-routine-creators=0 to apply only to functions".
2005-11-10 17:50:51 +01:00
slave.cc
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
slave.h
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +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
BUG#12228: Post review fixes: Added test case, code cleanup.
2005-08-10 21:17:02 +00:00
sp_head.cc
Fixed BUG#15737: Stored procedure optimizer bug with LEAVE
2006-01-25 15:11:49 +01:00
sp_head.h
Fixed BUG#15737: Stored procedure optimizer bug with LEAVE
2006-01-25 15:11:49 +01:00
sp_pcontext.cc
Patch for WL#2894: Make stored routine variables work
2005-12-07 17:01:17 +03:00
sp_pcontext.h
Merge mysql.com:/extern/mysql/bk/mysql-5.0
2006-01-16 15:37:25 +01:00
sp_rcontext.cc
Post-review fix for BUG#15011.
2006-02-01 16:00:11 +01:00
sp_rcontext.h
Patch for WL#2894: Make stored routine variables work
2005-12-07 17:01:17 +03:00
sp.cc
Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause
2006-01-11 02:07:40 +03: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
Merging
2006-01-21 18:50:06 +04:00
sql_acl.cc
Merge mysql.com:/extern/mysql/bk/mysql-5.0
2006-01-18 17:09:23 +01:00
sql_acl.h
WL#2486 - natural/using joins according to SQL:2003
2005-11-30 21:27:11 +02:00
sql_analyse.cc
Inefficient usage of String::append() fixed.
2005-11-20 20:47:07 +02:00
sql_analyse.h
Merge from 4.1
2005-05-26 21:01:55 +02:00
sql_array.h
Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs.
2005-08-25 17:34:34 +04:00
sql_base.cc
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2006-01-12 20:28:23 +02:00
sql_bitmap.h
Bug#10932 - Building server with key limit of 128, makes test cases fail
2005-07-19 14:13:56 +02:00
sql_cache.cc
Merge mysql.com:/opt/local/work/mysql-4.1-7209-new
2006-01-04 17:49:45 +03:00
sql_cache.h
Fix for BUG#13549 "Server crash with nested stored procedures
2005-11-23 00:50:37 +02:00
sql_class.cc
Merge mysql.com:/opt/local/work/mysql-4.1-root
2006-02-02 18:17:18 +03:00
sql_class.h
Remove unused class member as suggested by Guilhem.
2005-12-14 13:51:11 +01:00
sql_client.cc
…
sql_crypt.cc
a compiler must see '#pragma implementation' *before*
2005-06-05 19:38:52 +02:00
sql_crypt.h
Add ifdefs to control when "#pragma implementation" should be used
2005-05-26 12:09:14 +02:00
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 msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15302/my50-bug15302
2006-01-31 15:14:46 +01:00
sql_delete.cc
Merge mysql.com:/home/mydev/mysql-5.0
2005-12-27 10:31:00 +01:00
sql_derived.cc
support of view underlying tables and SP functions security check added (BUG#9505) (WL#2787)
2005-10-28 00:18:23 +03:00
sql_do.cc
Name resolution context added (BUG#6443)
2005-07-01 07:05:42 +03:00
sql_error.cc
Additional fix for BUG#7049, after review.
2005-10-17 15:07:47 +02:00
sql_error.h
…
sql_handler.cc
Changed condition similar to code in 4.1.
2006-01-16 23:15:00 +02:00
sql_help.cc
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
sql_insert.cc
merged
2006-01-06 18:26:59 +01:00
sql_lex.cc
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2006-02-02 21:23:36 -08:00
sql_lex.h
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2006-02-02 21:23:36 -08:00
sql_list.cc
a compiler must see '#pragma implementation' *before*
2005-06-05 19:38:52 +02:00
sql_list.h
WL#2486 - Natural/using join according to SQL:2003.
2005-11-28 21:57:50 +02:00
sql_load.cc
BUG#5390 - problems with merge tables
2005-12-20 16:35:05 +01:00
sql_manager.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-10-12 00:59:52 +03:00
sql_manager.h
…
sql_map.cc
WL#2286 - Compile MySQL w/YASSL support
2005-06-22 14:08:28 +05:00
sql_map.h
Add ifdefs to control when "#pragma implementation" should be used
2005-05-26 12:09:14 +02:00
sql_olap.cc
Implementation of WL#2486 -
2005-08-12 17:57:19 +03:00
sql_parse.cc
BUG#15699 importing the fix from 5.0
2006-01-26 12:49:55 +02:00
sql_prepare.cc
Fixes after manual merge
2006-02-02 23:56:08 -08:00
sql_rename.cc
Changes in get_table_type() and mysql_frm_type(). The main problem was
2005-11-03 16:10:11 +02:00
sql_repl.cc
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
sql_repl.h
…
sql_select.cc
Fixes after manual merge
2006-02-02 23:56:08 -08:00
sql_select.h
Merge mysql.com:/opt/local/work/mysql-4.1-root
2006-02-02 18:17:18 +03:00
sql_show.cc
information_schema_db.result, information_schema.result:
2006-01-28 19:44:51 -06: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
Merge mysql.com:/opt/local/work/mysql-4.1-root
2006-01-17 00:44:43 +03:00
sql_test.cc
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
sql_trigger.cc
Fix for the following bugs:
2006-01-24 20:15:12 +03:00
sql_trigger.h
Fix for the following bugs:
2006-01-24 20:15:12 +03:00
sql_udf.cc
Always initialize THD::thread_stack: it's used in
2005-11-23 21:18:10 +03:00
sql_udf.h
Name resolution context added (BUG#6443)
2005-07-01 07:05:42 +03:00
sql_union.cc
A fix and a test case for Bug#12736 "Server crash during a select".
2005-10-13 11:53:00 +04:00
sql_update.cc
Merge mysql.com:/opt/local/work/mysql-4.1-root
2006-02-02 18:17:18 +03:00
sql_view.cc
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
2005-12-02 21:20:25 +02:00
sql_view.h
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-11-03 16:43:05 +02:00
sql_yacc.yy
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2006-01-31 15:51:55 +03:00
stacktrace.c
…
stacktrace.h
…
strfunc.cc
…
structs.h
Inefficient usage of String::append() fixed.
2005-11-20 20:47:07 +02:00
table.cc
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-19 12:12:47 +01:00
table.h
Merge mysql.com:/home/mydev/mysql-4.1-bug5390
2006-02-06 15:15:44 +01:00
thr_malloc.cc
…
time.cc
Fixes during review of new pushed code
2005-07-31 12:49:55 +03:00
tzfile.h
…
tztime.cc
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-12-13 18:44:20 +02:00
tztime.h
Fixes during review of new pushed code
2005-07-31 12:49:55 +03:00
udf_example.cc
…
uniques.cc
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
unireg.cc
A fix and a test case for Bug#14210 "Simple query with > operator on
2005-11-03 14:20:13 +03:00
unireg.h
Merge mysql.com:/home/mydev/mysql-5.0
2005-12-06 08:19:23 +01:00
watchdog_mysqld
…