mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
unknown 4ad51359c1 Merge with 4.1 
(Includes merge of arena code in 4.1 and 5.0)



BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
VC++Files/sql/mysqld.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
libmysql/client_settings.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/ctype_recoding.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/func_in.result:
  Auto merged
mysql-test/r/func_like.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/having.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/lowercase_table.result:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Auto merged
mysql-test/r/null.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/rename.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/null.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/rpl_charset.test:
  Auto merged
mysql-test/t/rpl_heap.test:
  Auto merged
mysql-test/t/rpl_relayrotate.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
netware/mysql_test_run.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
sql/table.cc:
  Auto merged
sql-common/client.c:
  Auto merged
client/mysqlbinlog.cc:
  Merge with 4.1
configure.in:
  Merge with 4.1
include/mysqld_error.h:
  Add new error message (1) from 4.1
mysql-test/mysql-test-run.sh:
  Merge with 4.1
mysql-test/r/func_gconcat.result:
  Merge with 4.1
mysql-test/r/func_if.result:
  Merge with 4.1
mysql-test/r/grant.result:
  Merge with 4.1
mysql-test/r/join_outer.result:
  Merge with 4.1
mysql-test/r/rpl_charset.result:
  Merge with 4.1 (This has to be fixed before pushing)
mysql-test/r/system_mysql_db.result:
  Merge with 4.1.
  Added collation to new privileges
mysql-test/t/grant.test:
  Merge with 4.1
mysql-test/t/grant_cache.test:
  Merge with 4.1
mysql-test/t/show_check.test:
  Merge with 4.1
sql/Makefile.am:
  Merge with 4.1
sql/item.cc:
  Merge with 4.1
sql/item_cmpfunc.cc:
  Merge with 4.1 (arena code)
sql/item_subselect.cc:
  Merge with 4.1
sql/item_subselect.h:
  Merge with 4.1
sql/item_sum.cc:
  Merge with 4.1
sql/item_sum.h:
  Merge with 4.1
sql/log.cc:
  Merge with 4.1 (Remove code that is not relevant for 5.0)
sql/mysqld.cc:
  Merge with 4.1
sql/opt_range.cc:
  Merge with 4.1
sql/share/czech/errmsg.txt:
  Merge with 4.1
sql/share/danish/errmsg.txt:
  Merge with 4.1
sql/share/dutch/errmsg.txt:
  Merge with 4.1
sql/share/english/errmsg.txt:
  Merge with 4.1
sql/share/estonian/errmsg.txt:
  Merge with 4.1
sql/share/french/errmsg.txt:
  Merge with 4.1
sql/share/german/errmsg.txt:
  Merge with 4.1
sql/share/greek/errmsg.txt:
  Merge with 4.1
sql/share/hungarian/errmsg.txt:
  Merge with 4.1
sql/share/italian/errmsg.txt:
  Merge with 4.1
sql/share/japanese/errmsg.txt:
  Merge with 4.1
sql/share/korean/errmsg.txt:
  Merge with 4.1
sql/share/norwegian-ny/errmsg.txt:
  Merge with 4.1
sql/share/norwegian/errmsg.txt:
  Merge with 4.1
sql/share/polish/errmsg.txt:
  Merge with 4.1
sql/share/portuguese/errmsg.txt:
  Merge with 4.1
sql/share/romanian/errmsg.txt:
  Merge with 4.1
sql/share/russian/errmsg.txt:
  Merge with 4.1
sql/share/serbian/errmsg.txt:
  Merge with 4.1
sql/share/slovak/errmsg.txt:
  Merge with 4.1
sql/share/spanish/errmsg.txt:
  Merge with 4.1
sql/share/swedish/errmsg.txt:
  Merge with 4.1
sql/share/ukrainian/errmsg.txt:
  Merge with 4.1
sql/sql_base.cc:
  Merge with 4.1
sql/sql_class.cc:
  Merge with 4.1
  Use arena code from 4.1
sql/sql_class.h:
  Merge with 4.1
  Use arena code from 4.1
sql/sql_derived.cc:
  Merge with 4.1
sql/sql_lex.cc:
  Merge with 4.1
sql/sql_lex.h:
  Merge with 4.1
sql/sql_parse.cc:
  Merge with 4.1
sql/sql_prepare.cc:
  Merge with 4.1
sql/sql_select.cc:
  Merge with 4.1
sql/sql_table.cc:
  Merge with 4.1
sql/sql_union.cc:
  Merge with 4.1
sql/sql_yacc.yy:
  Merge with 4.1
sql/tztime.cc:
  Merge with 4.1
tests/client_test.c:
  Merge with 4.1
2004-09-06 15:14:10 +03:00
..
examples Merge bk-internal.mysql.com:/home/bk/mysql-4.1 2004-08-23 13:47:52 +03:00
share Merge with 4.1 2004-09-06 15:14:10 +03:00
.cvsignore
add_errmsg
client_settings.h Fix for #2126 2003-12-18 18:12:00 +04:00
custom_conf.h
derror.cc Fixed many compiler warnings 2004-04-05 13:56:05 +03:00
des_key_file.cc
discover.cc After merge fixes 2004-05-24 14:42:34 +03:00
field.cc typo fixed 2004-08-30 10:13:13 +02:00
field.h Review of new pushed code (Indentation fixes and simple optimizations) 2004-08-31 14:35:04 +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 Merge with 4.1.3-beta 2004-07-07 11:29:39 +03:00
frm_crypt.cc
gen_lex_hash.cc Merge with 4.0 2004-09-01 04:12:09 +03:00
gstream.cc Fix for valgrind's warning 2004-03-15 16:32:53 +04:00
gstream.h Fix for valgrind's warning 2004-03-15 16:32:53 +04:00
ha_berkeley.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
ha_berkeley.h Merge with 4.1 2004-07-12 08:20:24 +03:00
ha_heap.cc Bug 4531: unique key prefix interacts poorly with utf8 2004-08-19 16:07:18 +05:00
ha_heap.h Merge with 4.1 2004-07-12 08:20:24 +03:00
ha_innodb.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
ha_innodb.h Merge with 4.1 2004-09-06 15:14:10 +03:00
ha_isam.cc key_cmp -> key_cmp_if_same 2004-05-16 14:48:32 +03:00
ha_isam.h New handler::index_flags() definition to make it easy to check the full used key and a specific key part. 2004-07-08 15:45:25 +03:00
ha_isammrg.cc ::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert() 2004-04-06 21:35:26 +02:00
ha_isammrg.h New handler::index_flags() definition to make it easy to check the full used key and a specific key part. 2004-07-08 15:45:25 +03:00
ha_myisam.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
ha_myisam.h failing fulltext_order_by.test fixed 2004-07-15 17:30:55 +02:00
ha_myisammrg.cc VIEW 2004-07-16 01:15:55 +03:00
ha_myisammrg.h New handler::index_flags() definition to make it easy to check the full used key and a specific key part. 2004-07-08 15:45:25 +03:00
ha_ndbcluster.cc Fix for bug#5312 Ndb Cluster returns wrong error code for duplicate key at insert 2004-08-31 12:07:48 +02:00
ha_ndbcluster.h Fix for bug#5312 Ndb Cluster returns wrong error code for duplicate key at insert 2004-08-31 12:07:48 +02:00
handler.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
handler.h Merge with 4.1 2004-09-06 15:14:10 +03:00
hash_filo.cc
hash_filo.h
hostname.cc fix for --open-files-limit and broken query_cache_merge.test 2004-02-20 23:42:06 +01:00
init.cc Portability fixes 2004-04-07 04:33:58 +03:00
item.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
item.h Merge with 4.1 2004-09-06 15:14:10 +03:00
item_buff.cc
item_cmpfunc.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
item_cmpfunc.h Merge with 4.1 2004-09-06 15:14:10 +03: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 with 4.1 2004-09-06 15:14:10 +03:00
item_func.h Merge with 4.1 2004-09-06 15:14:10 +03:00
item_geofunc.cc Final patch for WL#1600(warn if max_allowed_packet used) 2004-07-21 21:27:45 +05:00
item_geofunc.h Optimized GIS functions 2004-03-04 08:50:37 +02:00
item_row.cc after merge 2004-08-26 18:22:22 +02:00
item_row.h Pack of changes about 'cleanup()'-s 2004-01-20 20:55:47 +04:00
item_strfunc.cc Portability fixes 2004-08-26 18:26:38 +03:00
item_strfunc.h in 4.1 DATABASE() may be NULL 2004-07-16 13:21:58 +02:00
item_subselect.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
item_subselect.h Merge with 4.1 2004-09-06 15:14:10 +03:00
item_sum.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
item_sum.h Merge with 4.1 2004-09-06 15:14:10 +03:00
item_timefunc.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
item_timefunc.h Merge with 4.1 2004-09-06 15:14:10 +03:00
item_uniq.cc
item_uniq.h DBUG_ASSERT(fixed == 1); added to val* 2004-03-18 15:14:36 +02:00
key.cc Bug#4594: column index make = failed for gbk, but like works 2004-08-23 20:12:39 +05:00
lex.h Merge with 4.1 2004-09-06 15:14:10 +03:00
lex_symbol.h Portability fixes 2004-03-05 19:49:50 +02:00
lock.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
log.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
log_event.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
log_event.h Replication: various small fixes specific to the new binlog format of 5.0 2004-07-26 19:42:59 +02:00
Makefile.am Merge with 4.1 2004-09-06 15:14:10 +03:00
matherr.c
mf_iocache.cc merge with 4.0 2004-03-16 22:41:30 +02:00
my_lock.c
mysql_priv.h Merge with 4.1 2004-09-06 15:14:10 +03:00
mysqld.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
mysqld_suffix.h New MYSQL_SERVER_SUFFIX usage (for easier compilation) 2004-05-25 02:28:44 +03:00
net_serv.cc Merge with 4.1.3-beta 2004-07-07 11:29:39 +03:00
nt_servc.cc Merge with 4.0 2004-03-25 23:29:45 +02:00
nt_servc.h
opt_range.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
opt_range.h Fix and testcase for BUG#4984 2004-08-11 16:40:46 +04:00
opt_sum.cc Bug#4411 2004-08-11 23:24:36 +01:00
parse_file.cc removing archive of .frm-s added (BUG#4821) 2004-08-25 14:57:57 +03:00
parse_file.h fix function prototype 2004-07-16 19:42:38 +03:00
password.c check_scramble_323 shuold ensure that the scramble has the correct length 2004-06-01 23:58:33 +02:00
procedure.cc
procedure.h
protocol.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
protocol.h Microsoft VC++ won't compile class C { static const int I=1; }. 2004-08-28 10:32:27 +04:00
protocol_cursor.cc Microsoft VC++ won't compile class C { static const int I=1; }. 2004-08-28 10:32:27 +04:00
records.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
repl_failsafe.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
repl_failsafe.h
set_var.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
set_var.h Merge with 4.1 2004-09-06 15:14:10 +03:00
slave.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
slave.h Post-merge fixes. 2004-05-14 16:00:57 +02:00
sp.cc Fixed BUG#5251: mysql changes creation time of a procedure/function when altering. 2004-08-27 16:41:34 +02:00
sp.h Fixed BUG#3339: Stored procedures in nonexistent schemas are uncallable. 2004-06-15 15:42:28 +02:00
sp_cache.cc WL#1366: Use the schema (db) associated with an SP. 2004-03-22 14:44:41 +01:00
sp_cache.h WL#1366: Use the schema (db) associated with an SP. 2004-03-22 14:44:41 +01:00
sp_head.cc Fixed BUG#5307: Stored procedure allows statement after BEGIN ... END. 2004-09-02 19:14:34 +02:00
sp_head.h Major rehacking and cleanup of sp_pcontext. 2004-08-26 12:54:30 +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 Fixed BUG#2653: Undeclared variables not detected in stored procedures. 2004-07-21 14:53:09 +02:00
sp_rcontext.h Fixed BUG#2653: Undeclared variables not detected in stored procedures. 2004-07-21 14:53:09 +02:00
spatial.cc Merging 2004-06-02 19:17:35 +05:00
spatial.h Merging 2004-05-27 16:32:49 +05:00
sql_acl.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_acl.h Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_analyse.cc manually merged 2004-08-18 19:57:55 +02:00
sql_analyse.h
sql_base.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_bitmap.h Made my_snprintf() behavior snprintf() compatible when printing %x arguments (it should 2004-05-27 17:54:40 +04:00
sql_cache.cc VIEW 2004-07-16 01:15:55 +03:00
sql_cache.h merge with 4.0 2004-03-16 22:41:30 +02:00
sql_class.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_class.h Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_client.cc merge 2003-12-19 16:34:48 +02:00
sql_crypt.cc
sql_crypt.h
sql_db.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_delete.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_derived.cc Fix for bug#4912 "mysqld crashs in case a statement is executed 2004-08-21 02:02:46 +04:00
sql_do.cc
sql_error.cc Port of cursors to be pushed into 5.0 tree: 2004-08-03 03:32:21 -07:00
sql_handler.cc Port of cursors to be pushed into 5.0 tree: 2004-08-03 03:32:21 -07:00
sql_help.cc Port of cursors to be pushed into 5.0 tree: 2004-08-03 03:32:21 -07:00
sql_insert.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_lex.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_lex.h Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_list.cc
sql_list.h Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_load.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc VIEW 2004-07-16 01:15:55 +03:00
sql_parse.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_prepare.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_rename.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_repl.cc Port of cursors to be pushed into 5.0 tree: 2004-08-03 03:32:21 -07:00
sql_repl.h Merge 4.1 -> 5.0. 2004-04-07 19:07:44 +02:00
sql_select.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_select.h Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_show.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_sort.h Implementation of SUM(DISTINCT), tests cases 2003-12-19 19:04:03 +03:00
sql_state.c
sql_string.cc Merge with 4.1.3-beta 2004-07-07 11:29:39 +03:00
sql_string.h Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_table.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_test.cc Manual merge 2004-05-29 20:55:46 +04:00
sql_udf.cc Fix for bug#1439 UDF Corruption 2004-03-19 14:35:00 +04:00
sql_udf.h
sql_union.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
sql_update.cc Merge with pulled code 2004-09-03 22:38:45 +03:00
sql_view.cc Merge with pulled code 2004-09-03 22:38:45 +03:00
sql_view.h sending right error message where VIEW is not expected (BUG#4606) 2004-08-24 15:37:51 +03:00
sql_yacc.yy Merge with 4.1 2004-09-06 15:14:10 +03:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h Merge with 4.1.3-beta 2004-07-07 11:29:39 +03:00
table.cc Merge with 4.1 2004-09-06 15:14:10 +03:00
table.h Merge with pulled code 2004-09-03 22:38:45 +03:00
thr_malloc.cc
time.cc WL#1580: --start-datetime, --stop-datetime, --start-position (alias for --position) and --stop-position 2004-07-29 23:25:58 +02:00
tzfile.h WL#1264 "Per-thread time zone support infrastructure". 2004-06-18 10:11:31 +04:00
tztime.cc bug in my_strnncoll_utf8 (and friends) fixed 2004-08-30 08:37:36 +02:00
tztime.h Fix for bug #4508 "CONVERT_TZ() function with new time zone as param crashes server". 2004-08-10 12:42:31 +04:00
udf_example.cc Merge 2003-12-18 17:51:43 +01:00
uniques.cc Fixed bug in replacation for not x86 platforms 2003-12-21 19:41:34 +02:00
unireg.cc Fixed a copy-and-paste error: mysql_create_frm() should have 2004-07-29 10:33:33 +02:00
unireg.h VIEW 2004-07-16 01:15:55 +03:00
watchdog_mysqld