mariadb/sql
unknown 93678f6bd9 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0


sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_row.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
2004-10-22 09:51:20 +03:00
..
examples Merge bk-internal.mysql.com:/home/bk/mysql-4.1 2004-08-23 13:47:52 +03:00
share errors without code removed 2004-10-20 04:04:37 +03:00
.cvsignore
add_errmsg
client_settings.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
field.cc More fixes for strict mode: 2004-10-02 22:20:08 +03:00
field.h More fixes for strict mode: 2004-10-02 22:20:08 +03:00
field_conv.cc Bug#5081: UCS2 fields are filled with '0x2020' after extending field length 2004-08-19 11:59:33 +05:00
filesort.cc Added per thread status variables, after review, patch v1.1. 2004-09-13 16:48:01 +03:00
frm_crypt.cc
gen_lex_hash.cc Merge with 4.0 2004-09-01 04:12:09 +03:00
gstream.cc
gstream.h
ha_berkeley.cc Merge 2004-09-15 22:36:57 +03:00
ha_berkeley.h Added options --auto-increment-increment and --auto-increment-offset. 2004-09-15 22:10:31 +03:00
ha_heap.cc Merge 2004-09-15 22:36:57 +03:00
ha_heap.h Added options --auto-increment-increment and --auto-increment-offset. 2004-09-15 22:10:31 +03:00
ha_innodb.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2004-10-22 09:51:20 +03:00
ha_innodb.h errors without code removed 2004-10-20 04:04:37 +03:00
ha_isam.cc Added some missing per status variables. 2004-09-15 22:13:55 +03:00
ha_isam.h
ha_isammrg.cc Added some missing per status variables. 2004-09-15 22:13:55 +03:00
ha_isammrg.h
ha_myisam.cc Merge with implementation of WL#1724. 2004-10-11 10:47:08 +03:00
ha_myisam.h Added options --auto-increment-increment and --auto-increment-offset. 2004-09-15 22:10:31 +03:00
ha_myisammrg.cc Added per thread status variables, after review, patch v1.1. 2004-09-13 16:48:01 +03:00
ha_myisammrg.h
ha_ndbcluster.cc Merge 2004-09-15 22:36:57 +03:00
ha_ndbcluster.h Added options --auto-increment-increment and --auto-increment-offset. 2004-09-15 22:10:31 +03:00
handler.cc Merge with implementation of WL#1724. 2004-10-11 10:47:08 +03:00
handler.h Added options --auto-increment-increment and --auto-increment-offset. 2004-09-15 22:10:31 +03:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2004-10-22 09:51:20 +03:00
item.h Merge for post-merge fixes for Item_equal patch. 2004-10-19 16:07:10 -07:00
item_buff.cc
item_cmpfunc.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2004-10-22 09:51:20 +03:00
item_cmpfunc.h Merge for Item_equal. 2004-10-09 10:34:13 -07:00
item_create.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
item_create.h Merge with 4.1 2004-09-06 15:14:10 +03:00
item_func.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2004-10-22 09:51:20 +03:00
item_func.h Merge for Item_equal. 2004-10-09 10:34:13 -07:00
item_geofunc.cc
item_geofunc.h
item_row.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2004-10-22 09:51:20 +03:00
item_row.h
item_strfunc.cc Merge. 2004-09-13 18:12:44 +03:00
item_strfunc.h Merge for Item_equal. 2004-10-09 10:34:13 -07:00
item_subselect.cc errors without code removed 2004-10-20 04:04:37 +03:00
item_subselect.h errors without code removed 2004-10-20 04:04:37 +03:00
item_sum.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2004-10-20 16:11:16 +03:00
item_sum.h Implementation of the last review comments for WL#1724 2004-09-10 04:45:15 +03:00
item_timefunc.cc errors without code removed 2004-10-20 04:04:37 +03:00
item_timefunc.h Merge with 4.1 2004-09-06 15:14:10 +03:00
item_uniq.cc
item_uniq.h errors without code removed 2004-10-20 04:04:37 +03:00
key.cc Merge with implementation of WL#1724. 2004-10-11 10:47:08 +03:00
lex.h Implemented the stored procedure data access characteristics: 2004-10-14 18:07:09 +02:00
lex_symbol.h
lock.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
log.cc Added options --auto-increment-increment and --auto-increment-offset. 2004-09-15 22:10:31 +03:00
log_event.cc changed function name to prevent injection wrong code from 4.1 (WL#2133) 2004-10-20 16:06:54 +03:00
log_event.h Added options --auto-increment-increment and --auto-increment-offset. 2004-09-15 22:10:31 +03:00
Makefile.am Yet another manual merge with main tree for patch for WL#1218 "Triggers" 2004-09-09 19:52:10 +04:00
matherr.c
mf_iocache.cc
my_lock.c
mysql_priv.h Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2004-10-20 16:11:16 +03:00
mysqld.cc changed function name to prevent injection wrong code from 4.1 (WL#2133) 2004-10-20 16:06:54 +03:00
mysqld_suffix.h
net_serv.cc Added per thread status variables, after review, patch v1.1. 2004-09-13 16:48:01 +03:00
nt_servc.cc
nt_servc.h
opt_range.cc Merge rurik.mysql.com:/home/igor/mysql-5.0 2004-10-20 13:17:06 -07:00
opt_range.h WL#1724 "Min/Max Optimization for Queries with Group By Clause" 2004-08-27 16:37:13 +03:00
opt_sum.cc Merge for post-merge fixes for Item_equal patch. 2004-10-19 16:07:10 -07:00
parse_file.cc Fix for bug #5887 "Triggers with string literals cause errors" 2004-10-08 15:16:03 +04:00
parse_file.h fixed & added comments (according to Igor's review and a bit more) 2004-10-07 01:45:06 +03:00
password.c fixed & added comments (according to Igor's review and a bit more) 2004-10-07 01:45:06 +03:00
procedure.cc
procedure.h
protocol.cc changed function name to prevent injection wrong code from 4.1 (WL#2133) 2004-10-20 16:06:54 +03:00
protocol.h changed function name to prevent injection wrong code from 4.1 (WL#2133) 2004-10-20 16:06:54 +03:00
protocol_cursor.cc errors without code removed 2004-10-20 04:04:37 +03:00
records.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
repl_failsafe.cc errors without code removed 2004-10-20 04:04:37 +03:00
repl_failsafe.h errors without code removed 2004-10-20 04:04:37 +03:00
set_var.cc errors without code removed 2004-10-20 04:04:37 +03:00
set_var.h Merge with 4.1 2004-09-06 15:14:10 +03:00
slave.cc errors without code removed 2004-10-20 04:04:37 +03:00
slave.h errors without code removed 2004-10-20 04:04:37 +03:00
sp.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2004-10-20 16:11:16 +03:00
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2004-10-20 16:11:16 +03:00
sp_head.h Fixed BUG#3583: query cache doesn't work for stored procedures. 2004-09-17 15:40:38 +02:00
sp_pcontext.cc Fixed BUG#5287: Stored procedure crash if leave outside loop. 2004-09-02 17:24:25 +02:00
sp_pcontext.h Fixed BUG#5287: Stored procedure crash if leave outside loop. 2004-09-02 17:24:25 +02:00
sp_rcontext.cc errors without code removed 2004-10-20 04:04:37 +03:00
sp_rcontext.h Strict mode & better warnings 2004-09-28 20:08:00 +03:00
spatial.cc
spatial.h
sql_acl.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2004-10-20 16:11:16 +03:00
sql_acl.h errors without code removed 2004-10-20 04:04:37 +03:00
sql_analyse.cc manually merged 2004-08-18 19:57:55 +02:00
sql_analyse.h
sql_base.cc errors without code removed 2004-10-20 04:04:37 +03:00
sql_bitmap.h
sql_cache.cc Fixed BUG#3583: query cache doesn't work for stored procedures. 2004-09-17 15:40:38 +02:00
sql_cache.h Fixed BUG#3583: query cache doesn't work for stored procedures. 2004-09-17 15:40:38 +02:00
sql_class.cc errors without code removed 2004-10-20 04:04:37 +03:00
sql_class.h changed function name to prevent injection wrong code from 4.1 (WL#2133) 2004-10-20 16:06:54 +03:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_db.cc errors without code removed 2004-10-20 04:04:37 +03:00
sql_delete.cc errors without code removed 2004-10-20 04:04:37 +03:00
sql_derived.cc memory leaks fixed 2004-09-04 23:05:12 +03:00
sql_do.cc errors without code removed 2004-10-20 04:04:37 +03:00
sql_error.cc errors without code removed 2004-10-20 04:04:37 +03:00
sql_handler.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2004-10-20 16:11:16 +03:00
sql_help.cc errors without code removed 2004-10-20 04:04:37 +03:00
sql_insert.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2004-10-20 16:11:16 +03:00
sql_lex.cc allow merging views with subqueries in WHERE clause (BUG#5504) 2004-10-07 22:54:31 +03:00
sql_lex.h Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2004-10-20 16:11:16 +03:00
sql_list.cc
sql_list.h Merge for Item_equal. 2004-10-09 10:34:13 -07:00
sql_load.cc errors without code removed 2004-10-20 04:04:37 +03:00
sql_manager.cc
sql_manager.h
sql_map.cc errors without code removed 2004-10-20 04:04:37 +03:00
sql_map.h
sql_olap.cc
sql_parse.cc changed function name to prevent injection wrong code from 4.1 (WL#2133) 2004-10-20 16:06:54 +03:00
sql_prepare.cc errors without code removed 2004-10-20 04:04:37 +03:00
sql_rename.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_repl.cc changed function name to prevent injection wrong code from 4.1 (WL#2133) 2004-10-20 16:06:54 +03:00
sql_repl.h errors without code removed 2004-10-20 04:04:37 +03:00
sql_select.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2004-10-22 09:51:20 +03:00
sql_select.h Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2004-10-22 09:51:20 +03:00
sql_show.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2004-10-20 16:11:16 +03:00
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_table.cc errors without code removed 2004-10-20 04:04:37 +03:00
sql_test.cc Added per thread status variables, after review, patch v1.1. 2004-09-13 16:48:01 +03:00
sql_trigger.cc errors without code removed 2004-10-20 04:04:37 +03:00
sql_trigger.h WL#1218 "Triggers". Some very preliminary version of patch. 2004-09-07 16:29:46 +04:00
sql_udf.cc errors without code removed 2004-10-20 04:04:37 +03:00
sql_udf.h
sql_union.cc errors without code removed 2004-10-20 04:04:37 +03:00
sql_update.cc errors without code removed 2004-10-20 04:04:37 +03:00
sql_view.cc errors without code removed 2004-10-20 04:04:37 +03:00
sql_view.h errors without code removed 2004-10-20 04:04:37 +03:00
sql_yacc.yy Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2004-10-20 16:11:16 +03:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h Added per thread status variables, after review, patch v1.1. 2004-09-13 16:48:01 +03:00
table.cc test of DELETE privilege and cyclic reference added in case of altering view (BUG#5148) 2004-10-07 15:43:04 +03:00
table.h table.h, sql_select.h: 2004-10-19 14:12:55 -07:00
thr_malloc.cc
time.cc Strict mode & better warnings 2004-09-28 20:08:00 +03:00
tzfile.h
tztime.cc Small after merge cleanup of time zone initialization code. 2004-09-17 12:30:26 +04:00
tztime.h After merge fixes of merge with 4.1 that included the new arena code. 2004-09-09 06:59:26 +03:00
udf_example.cc
uniques.cc
unireg.cc After merge fixes of merge with 4.1 that included the new arena code. 2004-09-09 06:59:26 +03:00
unireg.h
watchdog_mysqld