mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
unknown 12b769418a Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any-4.1 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2003-08-23 13:33:02 +03:00
..
share merge 2003-08-19 00:10:21 +03:00
.cvsignore
add_errmsg
client_settings.h Last part of resolving conflicts after pull 2003-06-18 10:34:09 +05:00
custom_conf.h
derror.cc
des_key_file.cc
field.cc merge 2003-08-19 00:10:21 +03:00
field.h Merge with 4.0.14 2003-08-11 22:44:43 +03:00
field_conv.cc Merge with 4.0.14 2003-08-11 22:44:43 +03:00
filesort.cc Old style charset() and set_charset() were removed. 2003-08-05 12:52:37 +05:00
frm_crypt.cc
gen_lex_hash.cc Merge 2003-08-05 16:08:36 +03:00
gstream.cc
gstream.h
ha_berkeley.cc Preparing to client<->server autoconvert 2003-03-17 13:14:04 +04:00
ha_berkeley.h
ha_heap.cc
ha_heap.h Merge with 4.0.13 2003-05-19 16:35:49 +03:00
ha_innodb.cc Merge with 4.0.14 2003-08-11 22:44:43 +03:00
ha_innodb.h Merge with 4.0.14 2003-08-11 22:44:43 +03:00
ha_isam.cc Give warning if MySQL doesn't honor given storage engine 2003-05-13 11:15:11 +03:00
ha_isam.h Give warning if MySQL doesn't honor given storage engine 2003-05-13 11:15:11 +03:00
ha_isammrg.cc
ha_isammrg.h
ha_myisam.cc Merge with 4.0.14 2003-08-11 22:44:43 +03:00
ha_myisam.h Many files: 2003-06-12 04:29:02 -07:00
ha_myisammrg.cc Allow one to use MERGE tables with tables from different databases 2003-06-27 16:29:10 +03:00
ha_myisammrg.h After merge fixes 2003-08-19 00:08:08 +03:00
handler.cc Merge with 4.0.14 2003-08-11 22:44:43 +03:00
handler.h Merge with 4.0.14 2003-08-11 22:44:43 +03:00
hash_filo.cc
hash_filo.h sql_acl.cc, item.h: 2003-03-07 12:21:32 +04:00
hostname.cc sql_acl.cc, item.h: 2003-03-07 12:21:32 +04:00
init.cc Merge with 4.0.13 2003-05-19 16:35:49 +03:00
item.cc fixed bug of lack of fix_fields call (after merge bugfix (SCRUM)) 2003-08-23 13:29:38 +03:00
item.h fixed bug of lack of fix_fields call (after merge bugfix (SCRUM)) 2003-08-23 13:29:38 +03:00
item_buff.cc Old style charset() and set_charset() were removed. 2003-08-05 12:52:37 +05:00
item_cmpfunc.cc merge 2003-08-20 22:17:57 +03:00
item_cmpfunc.h merge 2003-08-20 22:17:57 +03:00
item_create.cc CAST(expr AS CHAR(10)) is now working 2003-08-21 14:15:25 +05:00
item_create.h CAST(expr AS CHAR(10)) is now working 2003-08-21 14:15:25 +05:00
item_func.cc merge 2003-08-19 20:14:35 +03:00
item_func.h merge 2003-08-19 20:14:35 +03:00
item_geofunc.cc Renamed xxx_as_text() and xxx__from_text(). 2003-06-20 14:53:37 +05:00
item_geofunc.h Renamed xxx_as_text() and xxx__from_text(). 2003-06-20 14:53:37 +05:00
item_row.cc Item tree iterator 2003-07-02 13:12:18 +03:00
item_row.h Item tree iterator 2003-07-02 13:12:18 +03:00
item_strfunc.cc Merge with 4.0.14 2003-08-11 22:44:43 +03:00
item_strfunc.h merge 2003-08-11 11:51:33 +03:00
item_subselect.cc Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any-4.1 2003-08-23 13:33:02 +03:00
item_subselect.h Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any-4.1 2003-08-23 13:33:02 +03:00
item_sum.cc fixed bug of lack of fix_fields call (after merge bugfix (SCRUM)) 2003-08-23 13:29:38 +03:00
item_sum.h fixed bug of lack of fix_fields call (after merge bugfix (SCRUM)) 2003-08-23 13:29:38 +03:00
item_timefunc.cc CAST(expr AS CHAR(10)) is now working 2003-08-21 14:15:25 +05:00
item_timefunc.h CAST(expr AS CHAR(10)) is now working 2003-08-21 14:15:25 +05:00
item_uniq.cc
item_uniq.h Added SQLSTATE to client/server protocol 2003-06-04 18:28:51 +03:00
key.cc Merge with 4.0.12 2003-03-19 22:25:44 +02:00
lex.h merge 2003-08-19 00:10:21 +03:00
lex_symbol.h
lock.cc Merge with 4.0 2003-03-16 19:17:54 +02:00
log.cc After merge fixes 2003-08-19 00:08:08 +03:00
log_event.cc After merge fixes + bugs from last merge 2003-08-19 16:00:12 +03:00
log_event.h Merge with 4.0.14 2003-08-11 22:44:43 +03:00
Makefile.am Merge with 4.0.14 2003-08-11 22:44:43 +03:00
matherr.c
mf_iocache.cc Merge with 4.0 2003-03-16 19:17:54 +02:00
my_lock.c
mysql_priv.h fixed bug of lack of fix_fields call (after merge bugfix (SCRUM)) 2003-08-23 13:29:38 +03:00
mysqld.cc merge 2003-08-19 20:14:35 +03:00
net_serv.cc Merge with 4.0.14 2003-08-11 22:44:43 +03:00
nt_servc.cc Fix error msg. Bug #681 2003-06-19 12:38:14 -04:00
nt_servc.h
opt_ft.cc
opt_ft.h
opt_range.cc After merge fixes 2003-08-19 00:08:08 +03:00
opt_range.h ORDER BY optimization 2003-05-27 18:40:37 +03:00
opt_sum.cc After merge fixes 2003-05-21 21:39:58 +03:00
password.c After merge fixes 2003-03-20 21:35:03 +02:00
procedure.cc
procedure.h Strings which appear without charset context, 2003-03-03 10:53:08 +04:00
protocol.cc SCRUM - adding client into embedded server 2003-07-23 15:23:20 +05:00
protocol.h After merge fixes + bugs from last merge 2003-08-19 16:00:12 +03:00
protocol_cursor.cc SCRUM 2003-04-23 19:37:33 +05:00
records.cc fix for bug #958 and tests for it 2003-08-06 16:58:03 +04:00
repl_failsafe.cc Merge with 4.0.14 2003-08-11 22:44:43 +03:00
repl_failsafe.h Merge with 4.0 2003-03-16 19:17:54 +02:00
set_var.cc After merge fixes + bugs from last merge 2003-08-19 16:00:12 +03:00
set_var.h After merge fixes 2003-08-19 00:08:08 +03:00
slave.cc After merge fixes + bugs from last merge 2003-08-19 16:00:12 +03:00
slave.h Merge with 4.0.14 2003-08-11 22:44:43 +03:00
spatial.cc Renamed xxx_as_text() and xxx__from_text(). 2003-06-20 14:53:37 +05:00
spatial.h Renamed xxx_as_text() and xxx__from_text(). 2003-06-20 14:53:37 +05:00
sql_acl.cc After merge fixes 2003-08-19 00:08:08 +03:00
sql_acl.h Merge with 4.0.14 2003-08-11 22:44:43 +03:00
sql_analyse.cc Old style charset() and set_charset() were removed. 2003-08-05 12:52:37 +05:00
sql_analyse.h There is no Item->binary() anymore. It was remain from 4.0. 2003-07-02 18:34:43 +05:00
sql_base.cc fixed bug of lack of fix_fields call (after merge bugfix (SCRUM)) 2003-08-23 13:29:38 +03:00
sql_cache.cc Merge with 4.0.14 2003-08-11 22:44:43 +03:00
sql_cache.h Merge with 4.0.14 2003-08-11 22:44:43 +03:00
sql_class.cc Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any-4.1 2003-08-23 13:33:02 +03:00
sql_class.h Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any-4.1 2003-08-23 13:33:02 +03:00
sql_client.cc Some mistakes fixed 2003-07-14 16:38:51 +05:00
sql_crypt.cc - renamed "rnd" to "my_rnd" as the name was too generic (and is an exported 2003-03-18 22:14:02 +01:00
sql_crypt.h
sql_db.cc A new separate error message: Unknown collation 'blablabla' 2003-07-29 17:12:14 +05:00
sql_delete.cc merge 2003-08-19 20:14:35 +03:00
sql_derived.cc fixed bug of lack of fix_fields call (after merge bugfix (SCRUM)) 2003-08-23 13:29:38 +03:00
sql_do.cc
sql_error.cc Support of warnings for all DML statements (Insert, Update and Alter) 2003-04-30 00:02:28 -07:00
sql_handler.cc After merge fixes 2003-08-19 00:08:08 +03:00
sql_help.cc Fixed some new memory leaks 2003-06-24 12:10:35 +03:00
sql_insert.cc changed for AUTO_VALUE_ON_ZERO 2003-07-28 10:57:46 -04:00
sql_lex.cc Code cleanup 2003-08-16 13:26:48 +03:00
sql_lex.h merge 2003-08-19 20:14:35 +03:00
sql_list.cc Don't install signal handler for SIGINT by default 2003-06-10 21:42:29 +03:00
sql_list.h Merge with 4.0.14 2003-08-11 22:44:43 +03:00
sql_load.cc Fix for the bug #841: wrong number of warnings 2003-07-14 15:32:31 +05:00
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc subselect transformation moved in after-fix_field place 2003-05-14 21:51:33 +03:00
sql_parse.cc Merge 2003-08-20 17:45:04 +03:00
sql_prepare.cc implementation of mysql_stmt_reset client end 2003-07-08 02:27:21 -07:00
sql_rename.cc Safety and speedup fixes: 2003-07-14 10:12:05 +03:00
sql_repl.cc After merge fixes 2003-08-19 00:08:08 +03:00
sql_repl.h Merge with 4.0.14 2003-08-11 22:44:43 +03:00
sql_select.cc merge 2003-08-19 20:14:35 +03:00
sql_select.h Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 2003-08-13 10:12:41 +03:00
sql_show.cc now GRANT db.* ... compares patterns correctly to prevent privilege escalation 2003-07-22 22:21:23 +02:00
sql_sort.h Many files: 2003-04-24 14:33:33 +03:00
sql_state.c Added SQLSTATE to client/server protocol 2003-06-04 18:28:51 +03:00
sql_string.cc SAPDB date/time finctions 2003-07-08 15:06:05 +05:00
sql_string.h SAPDB date/time finctions 2003-07-08 15:06:05 +05:00
sql_table.cc merge 2003-08-19 20:14:35 +03:00
sql_test.cc Fixed bug in allocation memory in key cache. (Memory was not properly aligned which cased core dumps on sparc CPU's) 2003-03-25 02:37:41 +02:00
sql_udf.cc INSERT ... UPDATE ... VALUES() 2003-05-03 01:16:56 +02:00
sql_udf.h
sql_union.cc fixed bug of lack of fix_fields call (after merge bugfix (SCRUM)) 2003-08-23 13:29:38 +03:00
sql_update.cc quick fix for found row counter 2003-08-20 21:57:37 +03:00
sql_yacc.yy Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 2003-08-22 19:56:03 +03:00
stacktrace.c Merge with 4.0 2003-03-16 19:17:54 +02:00
stacktrace.h
structs.h Many files: 2003-04-24 14:33:33 +03:00
table.cc After merge fixes + bugs from last merge 2003-08-19 16:00:12 +03:00
table.h merge 2003-08-19 20:14:35 +03:00
thr_malloc.cc After merge fixes 2003-05-21 21:39:58 +03:00
time.cc SAPDB date/time finctions 2003-07-08 15:06:05 +05:00
udf_example.cc Fix for the bug #537 (UDF example broken on 4.1). 2003-05-30 13:03:00 +05:00
uniques.cc Merge with 4.0.14 2003-08-11 22:44:43 +03:00
unireg.cc Remove FORCE_INIT_OF_VARS when compiling for valgrind/purify to spot wrong LINT_INIT() options 2003-06-30 13:23:54 +03:00
unireg.h Fix: create table t1 (a char(10) character set cp1251) SELECT _koi8r'blabla' as a 2003-08-11 18:18:34 +05:00
watchdog_mysqld