mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
unknown 44cdd695ab Merge rama.(none):/home/jimw/my/mysql-4.1-clean 
into  rama.(none):/home/jimw/my/mysql-5.0-clean


include/m_ctype.h:
  Auto merged
include/m_string.h:
  Auto merged
include/my_global.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.h:
  Auto merged
include/my_sys.h:
  Resolve conflict
sql/mysql_priv.h:
  Resolve conflict
sql/mysqld.cc:
  Resolve conflict
sql/opt_range.cc:
  Resolve conflict
sql/sql_acl.cc:
  Resolve conflict
2006-09-28 18:09:10 -07:00
..
examples Additional files for cmake support 2006-08-31 19:52:42 +02:00
share Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2006-08-30 00:45:33 +04:00
.cvsignore
add_errmsg
client_settings.h
CMakeLists.txt Additional files for cmake support 2006-08-31 19:52:42 +02:00
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
field.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2006-08-30 00:45:33 +04:00
field.h fix windows build 2006-08-15 01:54:14 -07:00
field_conv.cc Bug#17226: Variable set in cursor on first iteration is assigned 2006-06-30 18:14:22 +04:00
filesort.cc
frm_crypt.cc
gen_lex_hash.cc Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint-gca 2006-08-23 18:37:04 -04:00
gstream.cc
gstream.h
ha_archive.cc Fixes for crashes and test failures 2006-09-01 14:34:37 +02: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
ha_berkeley.h
ha_blackhole.cc Revoking patch for Bug#10952 on behalf of Brian. 2006-07-10 20:46:05 +02:00
ha_blackhole.h
ha_federated.cc autopush test - sorry for the commit messages, ignore 2006-08-09 17:41:35 -07:00
ha_federated.h BUG #15133 "unique index with nullable value not accepted in federated table" 2006-07-25 18:38:09 -04:00
ha_heap.cc
ha_heap.h
ha_innodb.cc innodb r702 2006-08-18 14:16:11 +02:00
ha_innodb.h
ha_myisam.cc
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 Fix for BUG#11151 "LOAD DATA INFILE commits transaction in 5.0". 2006-09-05 16:52:05 +02:00
ha_ndbcluster.h Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: do not release operation records for on-going read_multi_range 2006-08-15 14:31:21 +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
init.cc
item.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2006-08-30 00:45:33 +04:00
item.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2006-08-30 00:45:33 +04: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 Merge polly.local:/tmp/20924/bug20294/my50-bug20294 2006-09-13 16:06:59 +04:00
item_cmpfunc.h Merge polly.local:/tmp/20924/bug20294/my50-bug20294 2006-09-13 16:06:59 +04:00
item_create.cc Bug#16172 DECIMAL data type processed incorrectly 2006-08-08 14:40:07 +05: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 Fixed the faulty merge 2006-09-13 19:32:21 +04:00
item_func.h Merge polly.local:/tmp/20924/bug20294/my41-bug20294 2006-09-13 15:18:14 +04:00
item_geofunc.cc bug #14807 (GeomFromText() should return MYSQL_TYPE_GEOMETRY) 2006-07-04 12:56:53 +05:00
item_geofunc.h Merge mysql.com:/home/mydev/mysql-4.1-bug14400 2006-07-05 11:20:10 +02:00
item_row.cc BUG#21166: Prepared statement causes signal 11 on second execution 2006-08-24 15:49:12 +04:00
item_row.h
item_strfunc.cc Merge maint1.mysql.com:/data/localhome/cmiller/bug15583/my50-bug15583 2006-09-13 15:07:06 +02:00
item_strfunc.h Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 2006-08-31 11:57:36 +02:00
item_subselect.cc BUG#16255: Merge to 5.0 2006-08-24 20:56:28 +04:00
item_subselect.h Merge mysql.com:/home/psergey/mysql-4.1-opt 2006-07-21 23:45:34 +04:00
item_sum.cc BUG#21477 "memory overruns for certain kinds of subqueries": 2006-09-01 13:23:43 +04:00
item_sum.h Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 2006-07-23 12:58:26 +05:00
item_timefunc.cc Merge rama.(none):/home/jimw/my/mysql-4.1-clean 2006-09-28 18:09:10 -07:00
item_timefunc.h Manually merged 2006-06-17 02:11:12 +04:00
item_uniq.cc
item_uniq.h
key.cc
lex.h
lex_symbol.h
lock.cc Fix for bug#21216 "Simultaneous DROP TABLE and SHOW OPEN TABLES causes 2006-08-21 12:18:59 +04:00
log.cc Merge perch.ndb.mysql.com:/home/jonas/src/50-work 2006-09-04 14:34:42 +02:00
log_event.cc Fixed the faulty merge 2006-09-13 19:32:21 +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
Makefile.am make dist changes for Cmake build 2006-09-01 10:32:12 +02:00
matherr.c
message.mc make dist changes for Cmake build 2006-09-01 10:32:12 +02:00
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h Merge rama.(none):/home/jimw/my/mysql-4.1-clean 2006-09-28 18:09:10 -07:00
mysqld.cc Merge rama.(none):/home/jimw/my/mysql-4.1-clean 2006-09-28 18:09:10 -07:00
mysqld_suffix.h
net_serv.cc Merge maint2.mysql.com:/data/localhome/tsmith/bk/41 2006-09-01 08:53:56 +02:00
nt_servc.cc
nt_servc.h
opt_range.cc Merge rama.(none):/home/jimw/my/mysql-4.1-clean 2006-09-28 18:09:10 -07:00
opt_range.h BUG#21077: Possible crash caused by invalid sequence of handler::* calls: 2006-08-15 20:33:14 +04:00
opt_sum.cc Merge mysql.com:/home/mydev/mysql-4.1-bug11824 2006-07-05 11:11:40 +02:00
parse_file.cc
parse_file.h
password.c
procedure.cc
procedure.h
protocol.cc Bug#8153 (Stored procedure with subquery and continue handler, wrong result) 2006-08-22 18:58:14 -07:00
protocol.h
records.cc
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
set_var.cc Merge rama.(none):/home/jimw/my/mysql-4.1-clean 2006-09-28 18:09:10 -07:00
set_var.h A post-merge fix. 2006-07-08 04:07:43 +04:00
slave.cc Merge rama.(none):/home/jimw/my/mysql-4.1-clean 2006-09-28 18:09:10 -07:00
slave.h Merge rama.(none):/home/jimw/my/mysql-4.1-clean 2006-09-28 18:09:10 -07:00
sp.cc after merge fix 2006-09-07 18:09:49 +05:00
sp.h A fix and a test case for 2006-06-27 00:47:52 +04:00
sp_cache.cc
sp_cache.h
sp_head.cc after merge fix 2006-09-07 18:09:49 +05:00
sp_head.h Fix for bug#21795: SP: sp_head::is_not_allowed_in_function() contains 2006-08-25 15:51:29 +02:00
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc Bug#8153 (Stored procedure with subquery and continue handler, wrong result) 2006-08-02 22:18:49 -07:00
sp_rcontext.h Bug#8153 (Stored procedure with subquery and continue handler, wrong result) 2006-08-02 22:18:49 -07:00
spatial.cc
spatial.h gcc 4.1 linux warning fixes backported from 5.0. 2006-06-28 16:28:29 +03:00
sql_acl.cc after merge fix 2006-09-07 18:09:49 +05: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
sql_analyse.h
sql_array.h
sql_base.cc Fix for BUG#21774: Column count doesn't match value count at row x 2006-09-12 17:50:24 +03:00
sql_bitmap.h
sql_cache.cc BUG#21051: RESET QUERY CACHE very slow when query_cache_type=0 2006-08-22 11:47:52 +04:00
sql_cache.h BUG#21051: RESET QUERY CACHE very slow when query_cache_type=0 2006-08-22 11:47:52 +04:00
sql_class.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2006-08-30 00:45:33 +04:00
sql_class.h Merge rama.(none):/home/jimw/my/mysql-4.1-clean 2006-09-28 18:09:10 -07:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc Fix for BUG#16211: Stored function return type for strings is ignored. 2006-07-27 17:57:43 +04:00
sql_delete.cc Fixed bug#21261: Wrong access rights was required for an insert into a view 2006-08-15 21:45:24 +04:00
sql_derived.cc
sql_do.cc
sql_error.cc Bug#8153 (Stored procedure with subquery and continue handler, wrong result) 2006-08-02 22:18:49 -07: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
sql_insert.cc Fix for BUG#21774: Column count doesn't match value count at row x 2006-09-12 17:50:24 +03:00
sql_lex.cc Merge bk-internal:/home/bk/mysql-5.0-opt 2006-09-04 11:39:58 +02:00
sql_lex.h Merge bk-internal:/home/bk/mysql-5.0-opt 2006-09-04 11:39:58 +02:00
sql_list.cc
sql_list.h
sql_load.cc Fix for BUG#11151 "LOAD DATA INFILE commits transaction in 5.0". 2006-09-05 16:52:05 +02:00
sql_locale.cc Fix compile errors in VC++ 7.0 2006-08-21 16:21:48 +04:00
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc Merge lamia.home:/home/timka/mysql/src/5.0-bug-21774-sm 2006-09-13 15:24:06 +03:00
sql_prepare.cc Bug#21813 An attacker has the opportunity to bypass query logging, part2 2006-08-30 17:11:00 +02:00
sql_rename.cc
sql_repl.cc Merge perch.ndb.mysql.com:/home/jonas/src/41-work 2006-09-04 13:46:56 +02:00
sql_repl.h after merge fix 2006-09-07 18:09:49 +05:00
sql_select.cc Merge dl145s:/data/tkatchaounov/5.0-bug-21787 2006-09-04 11:45:43 +02: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 bug #20910 (NOT NULL reported as NULL for TIMESTAMP) 2006-08-08 13:34:27 +05:00
sql_sort.h
sql_state.c
sql_string.cc Merge salvation.intern.azundris.com:/home/tnurnberg/21913/my41-21913 2006-09-04 07:01:15 +02: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 maint2.mysql.com:/data/localhome/tsmith/bk/41 2006-09-01 08:53:56 +02:00
sql_test.cc Post-review changes. 2006-05-03 21:35:27 -07:00
sql_trigger.cc Polishing (was the part of original patch for BUG#16899): 2006-08-24 18:48:26 +04:00
sql_trigger.h Polishing (was the part of original patch for BUG#16899): 2006-08-24 18:48:26 +04:00
sql_udf.cc Merge bk-internal:/home/bk/mysql-5.0-maint 2006-07-18 09:32:49 +02: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 Fixed bug#21261: Wrong access rights was required for an insert into a view 2006-08-15 21:45:24 +04:00
sql_view.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2006-08-30 00:45:33 +04:00
sql_view.h sql_base.cc, unireg.h, sql_lex.h, table.cc, sql_view.h, sql_view.cc: 2006-08-09 00:05:42 +04:00
sql_yacc.yy after merge fix 2006-09-08 16:16:39 +05:00
stacktrace.c Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx 2006-09-07 00:59:08 +02:00
stacktrace.h Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx 2006-09-07 00:59:08 +02:00
strfunc.cc
structs.h Manually merged 2006-06-14 23:54:08 +04:00
table.cc Merge mysql.com:/home/gluh/MySQL/Merge/4.1-merge 2006-09-07 15:17:46 +05:00
table.h Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 2006-08-03 16:54:06 +02: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 Fix a compilation failiure on QNX 2006-08-02 13:25:13 +04:00
uniques.cc
unireg.cc Fix for bug#13934 Silent truncation of table comments 2006-06-29 18:39:34 +05:00
unireg.h sql_base.cc, unireg.h, sql_lex.h, table.cc, sql_view.h, sql_view.cc: 2006-08-09 00:05:42 +04:00
watchdog_mysqld