mariadb/sql
unknown 98627eab14 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_parse.cc:
  Auto merged
2003-01-27 20:30:56 +02:00
..
share .del-koi8_u.xml~ec104975f7e009bf: 2003-01-09 17:41:25 +04:00
.cvsignore
add_errmsg
cache_manager.cc
cache_manager.h
ChangeLog
convert.cc SCRUM 2003-01-20 18:47:25 +04:00
custom_conf.h
derror.cc
des_key_file.cc removed several cases of default_charset_info use 2002-12-19 09:38:29 +04:00
field.cc field.cc: 2003-01-27 18:46:51 +04:00
field.h Conflicts resolving 2003-01-20 18:59:45 +04:00
field_conv.cc Merge with 4.0.9 2003-01-18 03:13:37 +02:00
filesort.cc Portability fixes (for windows) 2003-01-21 21:07:59 +02:00
frm_crypt.cc
gen_lex_hash.cc adding check for duplicated symbols 2002-12-15 22:30:26 +04:00
gstream.cc postreview fix (SCRUM) 2002-12-28 01:01:05 +02:00
gstream.h
ha_berkeley.cc Merge 2003-01-21 21:28:51 +02:00
ha_berkeley.h A lot of portability fixes. 2003-01-05 20:18:49 +02:00
ha_heap.cc ::index_read_last() method has been added 2002-11-28 15:19:42 +04:00
ha_heap.h ::index_read_last() method has been added 2002-11-28 15:19:42 +04:00
ha_innodb.cc ha_innodb.cc: 2003-01-24 04:47:06 +02:00
ha_innodb.h buf0buf.c, buf0buf.ic, buf0buf.h: 2003-01-06 22:07:25 +02:00
ha_isam.cc Portability fix when using -DBIG_TABLES 2002-11-14 12:21:36 +02:00
ha_isam.h
ha_isammrg.cc Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes. 2002-11-07 03:54:00 +02:00
ha_isammrg.h
ha_myisam.cc resolving conflicts 2003-01-15 13:15:35 +04:00
ha_myisam.h SCRUM 2003-01-15 12:11:44 +04:00
ha_myisammrg.cc Merge with 4.0.9 2003-01-18 03:13:37 +02:00
ha_myisammrg.h - HP/UX 11 compile fix: fixed "records_in_range" class definition 2002-12-13 15:42:31 +01:00
handler.cc Merge with 4.0.6 2002-12-05 19:38:42 +02:00
handler.h Merge with 4.0 2002-11-21 15:56:48 +02:00
hash_filo.cc
hash_filo.h Merge with 4.0 2002-11-21 15:56:48 +02:00
hostname.cc removed several cases of default_charset_info use 2002-12-19 09:38:29 +04:00
init.cc
item.cc MYSQL_TIME handling(Direct DATE,TIME and TS th' structure) - server 2003-01-23 22:32:39 -08:00
item.h making the keyword ROW for row items optional 2003-01-26 20:01:45 +01:00
item_buff.cc Less "default_charset_info" 2002-12-19 15:27:46 +04:00
item_cmpfunc.cc making the keyword ROW for row items optional 2003-01-26 20:01:45 +01:00
item_cmpfunc.h making the keyword ROW for row items optional 2003-01-26 20:01:45 +01:00
item_create.cc Added support for DROP TEMPORARY TABLE 2003-01-04 15:37:20 +02:00
item_create.h Merge with 4.0.8 2003-01-03 00:04:33 +02:00
item_func.cc Merge 2003-01-21 21:28:51 +02:00
item_func.h fixed test of cardinality 2003-01-21 13:55:26 +02:00
item_row.cc Portability fixes (for windows) 2003-01-21 21:07:59 +02:00
item_row.h postreviews fix (SCRUM related) 2002-12-31 18:39:16 +02:00
item_strfunc.cc wb_wc and wc_mb now checks length inside 2003-01-27 16:46:03 +04:00
item_strfunc.h fixed test of cardinality 2003-01-21 13:55:26 +02:00
item_subselect.cc Portability fixes (for windows) 2003-01-21 21:07:59 +02:00
item_subselect.h postreview fix (SCRUM) 2002-12-28 01:01:05 +02:00
item_sum.cc Merge 2003-01-21 21:28:51 +02:00
item_sum.h strnto family functions now return error in a new argument 2003-01-16 17:17:07 +04:00
item_timefunc.cc Updates for multi-byte character sets 2003-01-14 14:28:36 +02:00
item_timefunc.h Fixes for binary protocol (complement to last push) 2002-12-14 17:43:01 +02:00
item_uniq.cc
item_uniq.h prevent using references on sum function (except HAVING clouse of current select) and forward references 2002-11-21 11:01:33 +02:00
key.cc less default_charset_info 2002-12-20 17:14:46 +04:00
lex.h Portability fixes (for windows) 2003-01-21 21:07:59 +02:00
lex_symbol.h
lock.cc Portability fixes (for windows) 2003-01-21 21:07:59 +02:00
log.cc Merge 2003-01-21 21:28:51 +02:00
log_event.cc Merge 2003-01-21 21:28:51 +02:00
log_event.h Conflicts resolving 2003-01-20 18:59:45 +04:00
Makefile.am - added missing file sql/protocol.h to distribution 2002-12-20 13:43:40 +01:00
matherr.c
mf_iocache.cc Merge 2003-01-21 21:28:51 +02:00
mini_client.cc resolving conflicts 2003-01-15 13:15:35 +04:00
mini_client.h
my_lock.c
mysql_priv.h Portability fixes (for windows) 2003-01-21 21:07:59 +02:00
mysqld.cc Avoid memory overruns when buffer_length is too small (when fetching binary data in prepared statements) 2003-01-23 21:49:28 +02:00
net_serv.cc resolving conflicts 2003-01-15 13:15:35 +04:00
nt_servc.cc postreview fix (SCRUM) 2002-12-28 01:01:05 +02:00
nt_servc.h Added optional NT service and fix the TZ variable bug 2002-10-16 21:51:03 -02:00
opt_ft.cc
opt_ft.h
opt_range.cc Portability fixes (for windows) 2003-01-21 21:07:59 +02:00
opt_range.h
opt_sum.cc Merge with 4.0.9 2003-01-18 03:13:37 +02:00
password.c Portability fixes (for windows) 2003-01-21 21:07:59 +02:00
procedure.cc
procedure.h strnto family functions now return error in a new argument 2003-01-16 17:17:07 +04:00
protocol.cc MYSQL_TIME handling(Direct DATE,TIME and TS th' structure) - server 2003-01-23 22:32:39 -08:00
protocol.h SCRUM 2003-01-20 18:47:25 +04:00
records.cc
repl_failsafe.cc resolving conflicts 2003-01-15 13:15:35 +04:00
repl_failsafe.h SCRUM 2003-01-15 12:11:44 +04:00
set_var.cc Merge 2003-01-21 21:28:51 +02:00
set_var.h Conflicts resolving 2003-01-20 18:59:45 +04:00
slave.cc Merge 2003-01-21 21:28:51 +02:00
slave.h resolving conflicts 2003-01-15 13:15:35 +04:00
spatial.cc Portability fixes (for windows) 2003-01-21 21:07:59 +02:00
spatial.h
sql_acl.cc Merge 2003-01-21 21:28:51 +02:00
sql_acl.h Basically minor code optimizations and cleanups 2002-12-05 03:55:29 +03:00
sql_analyse.cc Merge with 4.0.8 2003-01-03 00:04:33 +02:00
sql_analyse.h All String->set() now have charset argument 2002-10-30 16:19:43 +04:00
sql_base.cc Merge 2003-01-21 21:28:51 +02:00
sql_cache.cc Merge 2003-01-21 21:28:51 +02:00
sql_cache.h new status variable (number of queries deleted because of low memory) 2002-11-17 20:41:25 +02:00
sql_class.cc Merge 2003-01-21 21:28:51 +02:00
sql_class.h Conflicts resolving 2003-01-20 18:59:45 +04:00
sql_crypt.cc
sql_crypt.h
sql_db.cc Fixes cases where thd->query was not protected. 2003-01-19 02:00:26 +02:00
sql_delete.cc less default_charset_info 2002-12-20 17:14:46 +04:00
sql_derived.cc A small fix for privilege system as reported by HF. 2003-01-21 14:50:55 +02:00
sql_do.cc
sql_error.cc Changed mysql-test to print warnings for not existing table to DROP TABLE 2003-01-06 01:48:59 +02:00
sql_handler.cc Merge 2003-01-21 21:28:51 +02:00
sql_help.cc Portability fixes (for windows) 2003-01-21 21:07:59 +02:00
sql_insert.cc Merge with 4.0.8 2003-01-03 00:04:33 +02:00
sql_lex.cc Portability fixes (for windows) 2003-01-21 21:07:59 +02:00
sql_lex.h Portability fixes (for windows) 2003-01-21 21:07:59 +02:00
sql_list.cc
sql_list.h optimized IN with Rows (SCRUM) 2002-12-08 03:19:03 +02:00
sql_load.cc Conflicts resolving 2003-01-20 18:59:45 +04:00
sql_manager.cc Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes. 2002-11-07 03:54:00 +02:00
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc postreview fix (SCRUM) 2002-12-28 01:01:05 +02:00
sql_parse.cc Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 2003-01-27 20:30:56 +02:00
sql_prepare.cc MYSQL_TIME handling(Direct DATE,TIME and TS th' structure) - server 2003-01-23 22:32:39 -08:00
sql_rename.cc Merge with 4.0 2002-11-21 15:56:48 +02:00
sql_repl.cc Merge 2003-01-21 21:28:51 +02:00
sql_repl.h SCRUM 2003-01-15 12:11:44 +04:00
sql_select.cc fixed "double Procedure::~Procedure" bug 2003-01-23 00:03:40 +01:00
sql_select.h Fixed that derived tables are properly droped 2003-01-07 11:45:06 +02:00
sql_show.cc Conflicts resolving 2003-01-20 18:59:45 +04:00
sql_sort.h
sql_string.cc wb_wc and wc_mb now checks length inside 2003-01-27 16:46:03 +04:00
sql_string.h Portability fixes (for windows) 2003-01-21 21:07:59 +02:00
sql_table.cc Merge 2003-01-21 21:28:51 +02:00
sql_test.cc Windows build fix 2003-01-18 14:04:34 -08:00
sql_udf.cc Change locks in sql_udf.cc to rw_locks (SCRUM) 2002-12-31 16:58:41 +05:00
sql_udf.h
sql_union.cc A lot of portability fixes. 2003-01-05 20:18:49 +02:00
sql_update.cc Updates for multi-byte character sets 2003-01-14 14:28:36 +02:00
sql_yacc.yy sql_yacc.yy: 2003-01-27 13:46:33 +04:00
stacktrace.c postreview fix (SCRUM) 2002-12-28 01:01:05 +02:00
stacktrace.h
structs.h Merge with 4.0.8 2003-01-03 00:04:33 +02:00
table.cc Merge with 4.0.8 2003-01-06 02:04:52 +02:00
table.h merge with 4.0.9 2003-01-09 03:55:26 +02:00
thr_malloc.cc
time.cc less use of system_charset_info 2002-12-19 09:38:30 +04:00
udf_example.cc extended resolve() and reverse_resolve() UDFs for FreeBSD (SCRUM) 2002-12-16 19:09:48 +04:00
uniques.cc New multi-table-update code 2002-11-29 16:40:18 +02:00
unireg.cc Merge with 4.0.6 2002-12-05 19:38:42 +02:00
unireg.h
watchdog_mysqld