database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-27 05:41:41 +03:00
Code Activity
Files
cd80d12035bded8cc59eb2b0c7760e15eaffbeb6
mariadb/sql
History
unknown 74214b8635 Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge


configure.in:
  Auto merged
man/Makefile.am:
  Auto merged
mysys/my_bitmap.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_locale.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Manual merge.
sql/sql_select.cc:
  Manual merge.
2006-07-29 13:43:34 +04:00
..
examples
Fix for bug #15558: truncate doesn't clear table on archive storage engine tables.
2006-05-18 17:10:58 +05:00
share
errmsg.txt:
2006-07-16 01:18:08 +04: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
Bug#17226: Variable set in cursor on first iteration is assigned
2006-06-30 18:14:22 +04:00
field.cc
Merge siva.hindu.god:/usr/home/tim/m/bk/global-41
2006-07-26 13:30:03 -06:00
field.h
Bug #21135 Crash in test "func_time"
2006-07-19 15:55:04 +02: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
Manually merged
2006-06-17 02:57:50 +04:00
ha_archive.h
Dean noticed that constant flush calls caused the archive stream file to flush empty buffers. This patch removes that behavior.
2006-04-20 18:23:04 -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
Revoking patch for Bug#10952 on behalf of Brian.
2006-07-10 20:46:05 +02: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 #18764: Delete conditions causing inconsistencies in Federated tables"
2006-07-18 18:41:36 -07:00
ha_federated.h
BUG #19773
2006-06-28 12:18:21 -07:00
ha_heap.cc
Manual merge
2006-03-30 17:14:55 +04: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
Applying patch from SergeyV
2006-06-20 13:43:13 -04:00
ha_innodb.h
foo2
2006-04-13 17:22:56 +09:30
ha_myisam.cc
bug #15860 (SPATIAL keys in INNODB)
2006-04-12 22:05:23 +05:00
ha_myisam.h
…
ha_myisammrg.cc
Merge bk-internal:/home/bk/mysql-5.0-engines
2006-07-18 10:25:04 -07:00
ha_myisammrg.h
Bug#19648
2006-05-30 17:10:53 -07:00
ha_ndbcluster.cc
Merge bodhi.local:/opt/local/work/mysql-5.0-root
2006-07-07 22:09:43 +04:00
ha_ndbcluster.h
Fix for Bug #19906 REPLACE doesn't update TEXT fields correctly
2006-06-21 09:36:50 +02:00
handler.cc
Merge bk://anubis/mysql-5.0-engines
2006-07-21 10:14:25 -07:00
handler.h
Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.0
2006-07-12 10:05:55 +02:00
hash_filo.cc
…
hash_filo.h
…
hostname.cc
Merge mysql.com:/usr/home/ram/work/mysql-4.1
2006-03-03 15:32:00 +04:00
init.cc
Fixes during review of new pushed code
2005-08-12 13:54:42 +03:00
item_buff.cc
Fix for bug#19667 group by a decimal expression yields wrong result
2006-06-15 16:24:02 +05:00
item_cmpfunc.cc
Bug#20783: Valgrind uninitialised warning in test case ctype_uca
2006-07-03 21:41:15 +02:00
item_cmpfunc.h
gcc 4.1 linux warning fixes backported from 5.0.
2006-06-28 16:28:29 +03:00
item_create.cc
Bug#20570: CURRENT_USER() in a VIEW with SQL SECURITY DEFINER returns
2006-07-02 14:35:45 +04:00
item_create.h
Bug#20570: CURRENT_USER() in a VIEW with SQL SECURITY DEFINER returns
2006-07-02 14:35:45 +04:00
item_func.cc
Fix compiler warnings in sql_udf.h: ISO C++ forbids casting
2006-07-09 13:03:51 +04:00
item_func.h
4.1 -> 5.0 merge
2006-07-13 16:35:25 -07: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 mysql.com:/home/mydev/mysql-4.1-bug14400
2006-07-05 11:20:10 +02:00
item_row.cc
Merge mysql.com:/opt/local/work/mysql-4.1-16365
2006-04-12 18:30:54 +04:00
item_row.h
Merge mysql.com:/opt/local/work/mysql-4.1-16365
2006-04-12 18:30:54 +04:00
item_strfunc.cc
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
2006-07-18 23:45:17 +04:00
item_strfunc.h
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
2006-07-13 18:16:16 +04:00
item_subselect.cc
Merge moonbone.local:/work/16302-bug-4.1-opt-mysql
2006-07-13 18:18:20 +04:00
item_subselect.h
BUG#7549: Missing error message for invalid view selection with subquery.
2006-05-11 15:30:54 +03:00
item_sum.cc
Merge mysqldev@production:my/mysql-5.0-release
2006-06-30 11:11:49 +02:00
item_sum.h
Post merge fix
2006-04-20 00:42:12 -07:00
item_timefunc.cc
Backporting Kostja's changes made for 5.0 into 4.1.
2006-07-18 15:53:12 +05:00
item_timefunc.h
Manually merged
2006-06-17 02:11:12 +04:00
item_uniq.cc
…
item_uniq.h
Inefficient usage of String::append() fixed.
2005-11-20 20:47:07 +02:00
item.cc
Fixed bug#10977: No warning issued if a column name is truncated
2006-07-16 00:45:38 +04:00
item.h
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
2006-07-13 18:03:43 +04:00
key.cc
Bug #13601: Wrong int type for bit
2006-04-04 17:54:58 -07:00
lex_symbol.h
…
lex.h
Fixed BUG#18949: Test case sp-goto is disabled
2006-04-18 11:07:34 +02:00
lock.cc
Bug#16986 - Deadlock condition with MyISAM tables
2006-06-26 19:14:35 +02:00
log_event.cc
A fix for Bug#19022 "Memory bug when switching db during trigger execution".
2006-06-28 23:47:45 +04:00
log_event.h
Bug #16206: Superfluous COMMIT event in binlog when updating BDB in autocommit
2006-06-12 08:54:45 -04:00
log.cc
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
2006-06-29 14:14:08 +02:00
Makefile.am
udf_example.c, udf.test, Makefile.am:
2006-07-29 04:41:50 +02: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 patch for bug #15195 from 5.0 -> 5.0-release (for 5.0.24)
2006-07-21 09:53:12 +02:00
mysqld_suffix.h
…
mysqld.cc
Merge patch for bug #15195 from 5.0 -> 5.0-release (for 5.0.24)
2006-07-21 09:53:12 +02:00
net_serv.cc
configure.in, net_serv.cc, compile-netware-END:
2006-06-17 00:30:02 +02:00
nt_servc.cc
…
nt_servc.h
…
opt_range.cc
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
2006-07-01 01:55:43 +04:00
opt_range.h
Fixed bug #20869.
2006-07-15 00:28:21 -07:00
opt_sum.cc
Merge mysql.com:/home/mydev/mysql-4.1-bug11824
2006-07-05 11:11:40 +02:00
parse_file.cc
Fix for BUG#15921: DROP TRIGGER - can't be drop trigger created
2006-03-28 01:01:51 +04:00
parse_file.h
Fix for BUG#15921: DROP TRIGGER - can't be drop trigger created
2006-03-28 01:01:51 +04:00
password.c
Merge mysql.com:/opt/local/work/mysql-4.1-root
2006-01-11 17:49:56 +03:00
procedure.cc
…
procedure.h
…
protocol.cc
Fixes to embedded server to be able to run tests with it
2006-02-24 18:34:15 +02:00
protocol.h
Fixes to embedded server to be able to run tests with it
2006-02-24 18:34:15 +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
Bug #18607: LOAD DATA FROM MASTER fails because of INFORMATION_SCHEMA database
2006-04-21 18:26:39 -07:00
repl_failsafe.h
pthread_handler_decl() changed to be ctags-friendly
2005-10-08 16:39:55 +02:00
set_var.cc
Merge patch for bug #15195 from 5.0 -> 5.0-release (for 5.0.24)
2006-07-21 09:53:12 +02:00
set_var.h
A post-merge fix.
2006-07-08 04:07:43 +04:00
slave.cc
slave.cc:
2006-07-25 20:00:18 +09:30
slave.h
A fix for Bug#19022 "Memory bug when switching db during trigger execution".
2006-06-28 23:47:45 +04: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
Bug#20230: routine_definition is not null
2006-06-30 00:21:55 +04:00
sp_head.h
A fix and a test case for
2006-06-27 00:47:52 +04:00
sp_pcontext.cc
Fixed BUG#18949: Test case sp-goto is disabled
2006-04-18 11:07:34 +02:00
sp_pcontext.h
Fixed BUG#18949: Test case sp-goto is disabled
2006-04-18 11:07:34 +02:00
sp_rcontext.cc
BUG#18037: Fix stack corruption in THD::rollback_item_tree_changes().
2006-05-15 12:01:55 +02:00
sp_rcontext.h
BUG#18037: Fix stack corruption in THD::rollback_item_tree_changes().
2006-05-15 12:01:55 +02:00
sp.cc
A fix and a test case for Bug#21002 "Derived table not selecting from a
2006-07-19 22:33:19 +04:00
sp.h
A fix and a test case for
2006-06-27 00:47:52 +04: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
gcc 4.1 linux warning fixes backported from 5.0.
2006-06-28 16:28:29 +03:00
sql_acl.cc
4.1 -> 5.0 merge
2006-07-13 16:35:25 -07:00
sql_acl.h
Reapply fix for bug#16372 (Server crashes when test 'conc_sys' is running)
2006-05-06 11:25:59 +04:00
sql_analyse.cc
Porting fix that allows others to include compiled code with different parsers.
2006-03-09 10:09:52 -08:00
sql_analyse.h
…
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 dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.0
2006-07-12 10:05:55 +02:00
sql_bitmap.h
…
sql_cache.cc
Merge bodhi.local:/opt/local/work/tmp_merge
2006-07-08 02:30:07 +04:00
sql_cache.h
Fixed compiler warnings from gcc 4.0.2:
2006-02-25 17:46:30 +02:00
sql_class.cc
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-release
2006-07-27 13:47:36 +04:00
sql_class.h
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-release
2006-07-27 13:47:36 +04:00
sql_client.cc
…
sql_crypt.cc
…
sql_crypt.h
…
sql_cursor.cc
Fixed BUG#15758: "Holding adaptive search latch in
2006-04-07 23:58:17 +04: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
A fix for Bug#19022 "Memory bug when switching db during trigger execution".
2006-06-28 23:47:45 +04:00
sql_delete.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
2006-07-06 14:31:32 +04: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
…
sql_error.cc
Add extre DBUG_PRINT in push_warning
2006-03-16 12:06:39 +01:00
sql_error.h
…
sql_handler.cc
Bug#16986 - Deadlock condition with MyISAM tables
2006-06-26 19:14:35 +02:00
sql_help.cc
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
sql_insert.cc
Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-release
2006-07-19 19:52:27 +02:00
sql_lex.cc
4.1 -> 5.0 merge fixes
2006-07-14 05:56:30 -07:00
sql_lex.h
auxilliary -> auxiliary
2006-07-04 02:07:41 +04:00
sql_list.cc
…
sql_list.h
WL#2486 - Natural/using join according to SQL:2003.
2005-11-28 21:57:50 +02:00
sql_load.cc
Fix for bug#18437 "Wrong values inserted with a before update trigger on
2006-07-02 01:51:10 +04:00
sql_locale.cc
Backporting Kostja's changes made for 5.0 into 4.1.
2006-07-18 15:53:12 +05: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
…
sql_map.h
…
sql_olap.cc
Implementation of WL#2486 -
2005-08-12 17:57:19 +03:00
sql_parse.cc
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-release
2006-07-27 13:47:36 +04:00
sql_prepare.cc
4.1 -> 5.0 merge
2006-07-13 16:35:25 -07:00
sql_rename.cc
Fix for bug #13525 "Rename table does not keep info of triggers".
2006-02-24 23:50:36 +03:00
sql_repl.cc
foo2
2006-04-13 17:22:56 +09:30
sql_repl.h
…
sql_select.cc
Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
2006-07-29 13:43:34 +04:00
sql_select.h
gcc 4.1 linux warning fixes backported from 5.0.
2006-06-28 16:28:29 +03:00
sql_show.cc
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
2006-07-03 13:19:18 +05:00
sql_sort.h
…
sql_state.c
…
sql_string.cc
Merge mysql.com:/usr/home/bar/mysql-4.1.b15376
2006-03-23 12:41:28 +04:00
sql_string.h
Bug#19006: 4.0 valgrind problems (in test func_str)
2006-07-01 14:31:52 -04:00
sql_table.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2006-07-11 17:04:27 +04:00
sql_test.cc
Post-review changes.
2006-05-03 21:35:27 -07:00
sql_trigger.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2006-07-08 21:45:02 +04:00
sql_trigger.h
Fix for bug#18437 "Wrong values inserted with a before update trigger on
2006-07-02 01:51:10 +04:00
sql_udf.cc
Fix compiler warnings in sql_udf.h: ISO C++ forbids casting
2006-07-09 13:03:51 +04:00
sql_udf.h
Fix compiler warnings in sql_udf.h: ISO C++ forbids casting
2006-07-09 13:03:51 +04:00
sql_union.cc
Post merge fixes
2006-04-21 08:19:38 -07:00
sql_update.cc
Merge bodhi.local:/opt/local/work/mysql-5.0-root
2006-07-07 22:09:43 +04:00
sql_view.cc
A fix and a test case for
2006-06-27 00:47:52 +04: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
Fixed bug#10977: No warning issued if a column name is truncated
2006-07-16 00:45:38 +04:00
stacktrace.c
…
stacktrace.h
…
strfunc.cc
…
structs.h
Manually merged
2006-06-14 23:54:08 +04:00
table.cc
4.1 -> 5.0 merge fixes
2006-07-14 05:56:30 -07:00
table.h
4.1 -> 5.0 merge
2006-07-13 16:35:25 -07:00
thr_malloc.cc
…
time.cc
Bug#20729: Bad date_format() call makes mysql server crash
2006-07-11 13:06:29 -04:00
tzfile.h
…
tztime.cc
A fix and a test case for
2006-06-27 00:47:52 +04:00
tztime.h
Fix for bug#11081 "Using a CONVERT_TZ function in a stored function or
2006-04-24 18:57:00 +04:00
udf_example.c
udf_example.c, udf.test, Makefile.am:
2006-07-29 04:41:50 +02:00
uniques.cc
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
unireg.cc
Fix for bug#13934 Silent truncation of table comments
2006-06-29 18:39:34 +05:00
unireg.h
Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was
2006-04-12 23:05:38 +04:00
watchdog_mysqld
…