mariadb/sql
unknown 6417c182df Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1


sql/sql_acl.cc:
  Auto merged
2003-08-02 17:24:44 +02:00
..
share cp1251.xml: 2003-07-31 08:33:59 +05: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 Merge with 4.0.11 2003-02-04 21:52:14 +02:00
field.cc Merge gluh@gw:/home/bk/mysql-4.1 2003-07-08 12:57:00 +05:00
field.h bugs #701 and #783 - old .frm files were read in incorrectly in 4.1 (each field was assigned a charset, BLOBs were converted to TEXT) 2003-07-28 16:58:52 +02:00
field_conv.cc changed for AUTO_VALUE_ON_ZERO 2003-07-28 10:57:46 -04:00
filesort.cc After merge fixes 2003-05-21 21:39:58 +03:00
frm_crypt.cc
gen_lex_hash.cc gen_lex_hash sigsegv fixed 2003-07-21 21:13:52 +02:00
gstream.cc
gstream.h Portability fixes 2003-02-27 03:44:44 +02:00
ha_berkeley.cc Preparing to client<->server autoconvert 2003-03-17 13:14:04 +04:00
ha_berkeley.h Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 2003-02-18 16:28:31 +02:00
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.13 2003-06-05 17:33:38 +03:00
ha_innodb.h Merge with 4.0.13 2003-05-19 16:35:49 +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 rurik.mysql.com:/home/igor/mysql-4.1 2003-06-12 06:22:35 -07: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
handler.cc changed for AUTO_VALUE_ON_ZERO 2003-07-28 10:57:46 -04:00
handler.h Merge rurik.mysql.com:/home/igor/mysql-4.1 2003-06-12 06:22:35 -07: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 merge 2003-08-01 18:24:27 +03:00
item.h count HAVING clause elements with select list elements, because agregate function can be present in it (BUG#922) 2003-07-29 13:00:32 +03:00
item_buff.cc stringcmp() and sortcmp() have been unified 2003-03-04 18:01:59 +04:00
item_cmpfunc.cc Fixed that this sequence didn't produce an error as it should have: 2003-07-29 17:39:39 +05:00
item_cmpfunc.h IN now aggregates all argument types for comparison 2003-07-18 14:03:54 +05:00
item_create.cc Merge bk-internal:/home/bk/mysql-4.1/ 2003-07-14 10:54:22 +02:00
item_create.h Merge bk-internal:/home/bk/mysql-4.1/ 2003-07-14 10:54:22 +02:00
item_func.cc bug #715: SELECT YEAR+0 FROM foobar is parsed as 'SELECT' 'YEAR' '+0' => syntax error 2003-07-20 12:26:18 +02:00
item_func.h Merge bk-internal:/home/bk/mysql-4.1/ 2003-07-18 18:06:45 +02: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 Move tmp_table_used to THD 2003-02-10 17:59:16 +02:00
item_row.h cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation 2003-01-30 14:35:07 +02:00
item_strfunc.cc A new separate error message: Unknown collation 'blablabla' 2003-07-29 17:12:14 +05:00
item_strfunc.h ELT passes the first argument in args[0] instead of having a separate Item. 2003-07-15 18:11:49 +05:00
item_subselect.cc merge 2003-08-01 16:51:54 +03:00
item_subselect.h added mem_root switching for subselect if it is necessary 2003-05-28 16:52:56 +03:00
item_sum.cc Derivation attribute was not processed correctly 2003-07-30 14:15:25 +05:00
item_sum.h reduced using of slow current_thd/current_lex macro 2003-07-05 03:03:31 +03:00
item_timefunc.cc Fix bug: mysqld crashes on func_sapdb test. 2003-07-15 12:55:29 +05:00
item_timefunc.h SAPDB date/time finctions 2003-07-08 15:06:05 +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 Add the support of 'SUBSTR' function compatible with Oracle and SAPDB (SCRUM #872) 2003-07-11 18:55:03 -07:00
lex_symbol.h
lock.cc Merge with 4.0 2003-03-16 19:17:54 +02:00
log.cc Merge bk-internal.mysql.com:/home/bk/mysql-4.1 2003-06-14 11:38:09 +03:00
log_event.cc New class DTCollation (SQL:2003 calls it "declared type collation") 2003-06-24 15:11:07 +05:00
log_event.h See each file's changeset for details. 2003-06-12 16:20:31 +02:00
Makefile.am Support for variables with components 2003-07-06 19:09:57 +03:00
matherr.c
mf_iocache.cc Merge with 4.0 2003-03-16 19:17:54 +02:00
my_lock.c Fixes for Netware 2003-01-28 08:38:28 +02:00
mysql_priv.h Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 2003-07-22 19:02:36 -04:00
mysqld.cc 'mysqld --verbose' should not print help screen 2003-07-27 10:26:29 +02:00
net_serv.cc Including client code into libmysqld 2003-07-14 16:41:58 +05:00
nt_servc.cc Fix error msg. Bug #681 2003-06-19 12:17:23 -04:00
nt_servc.h
opt_ft.cc
opt_ft.h
opt_range.cc Item_func_null doesn't have a separate Item for the first argument anymore. 2003-07-16 11:29:16 +05: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 new version of help 2003-05-29 17:47:31 -04:00
protocol_cursor.cc SCRUM 2003-04-23 19:37:33 +05:00
records.cc Merge with 4.0.13 2003-05-19 16:35:49 +03:00
repl_failsafe.cc Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1 master/slave will now use the 4.1 protocol 2003-06-14 11:37:42 +03:00
repl_failsafe.h Merge with 4.0 2003-03-16 19:17:54 +02:00
set_var.cc A new separate error message: Unknown collation 'blablabla' 2003-07-29 17:12:14 +05:00
set_var.h Support for variables with components 2003-07-06 19:09:57 +03:00
slave.cc On Feb 4th, 2003, Monty said he would push my patch to print replicate-do-table 2003-07-23 15:46:46 +02:00
slave.h On Feb 4th, 2003, Monty said he would push my patch to print replicate-do-table 2003-07-23 15:46:46 +02: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 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 2003-08-02 17:24:44 +02:00
sql_acl.h now GRANT db.* ... compares patterns correctly to prevent privilege escalation 2003-07-22 22:21:23 +02:00
sql_analyse.cc There is no Item->binary() anymore. It was remain from 4.0. 2003-07-02 18:34:43 +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 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 2003-07-28 10:58:50 -04:00
sql_cache.cc tabe & query hashes made case insensitive (BUG#933) 2003-07-28 18:28:44 +03:00
sql_cache.h merging 2003-04-16 20:35:29 +03:00
sql_class.cc cond_count moved to SELECT_LEX_NODE 2003-06-26 11:09:11 +03:00
sql_class.h merge 2003-07-01 15:57:45 +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 ixed wrong unlock of tables (new bug) 2003-05-26 20:48:40 +03:00
sql_derived.cc count HAVING clause elements with select list elements, because agregate function can be present in it (BUG#922) 2003-07-29 13:00:32 +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 fix and test case for the bug #787: HANDLER without INDEX doesn't work with deleted rows 2003-07-04 14:41:01 +05: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 merge 2003-08-01 18:24:27 +03:00
sql_lex.h merge 2003-08-01 18:24:27 +03:00
sql_list.cc
sql_list.h Added SQLSTATE to client/server protocol 2003-06-04 18:28:51 +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
sql_parse.cc merge 2003-08-01 18:24:27 +03:00
sql_prepare.cc implementation of mysql_stmt_reset client end 2003-07-08 02:27:21 -07:00
sql_rename.cc Merge with 4.0 2003-03-16 19:17:54 +02:00
sql_repl.cc Merge with 4.0.13 2003-06-05 17:33:38 +03:00
sql_repl.h Conflicts relsolving 2003-03-11 16:32:17 +04:00
sql_select.cc count HAVING clause elements with select list elements, because agregate function can be present in it (BUG#922) 2003-07-29 13:00:32 +03:00
sql_select.h cut&paste fixed 2003-07-15 15:20:22 +02: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 Fix for the bug #841: wrong number of warnings 2003-07-14 15:32:31 +05: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 count HAVING clause elements with select list elements, because agregate function can be present in it (BUG#922) 2003-07-29 13:00:32 +03:00
sql_update.cc Fix for the bug #841: wrong number of warnings 2003-07-14 15:32:31 +05:00
sql_yacc.yy merge 2003-08-01 18:24:27 +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 bugs #701 and #783 - old .frm files were read in incorrectly in 4.1 (each field was assigned a charset, BLOBs were converted to TEXT) 2003-07-28 16:58:52 +02:00
table.h changed for AUTO_VALUE_ON_ZERO 2003-07-28 10:57:46 -04: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 Many files: 2003-04-24 14:33:33 +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 Merge with 4.0.13 2003-06-05 17:33:38 +03:00
watchdog_mysqld