mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 01:04:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
unknown c41989a28e Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
2005-02-03 16:50:06 +02:00
..
examples 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
share small Makefile.am cleanup 2005-01-28 17:14:03 +01:00
.cvsignore
add_errmsg
client_settings.h
custom_conf.h
derror.cc WL#1895 - Print message to error log in case of detected MyISAM corruption 2004-12-23 20:11:38 +01:00
des_key_file.cc
discover.cc WL1424 Multiple MySQL Servers: SHOW TABLES etc. should detect new and delete old tables. 2004-09-13 14:46:38 +02:00
field.cc Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-01-24 11:31:21 -08:00
field.h Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-01-26 11:53:33 -08:00
field_conv.cc ER_WARN_DATA_TRUNCATED replaced with WARN_DATA_TRUNCATED. 2005-01-19 16:24:06 +04:00
filesort.cc CSC#4385: slow sorting for UTF8 large table: 2005-01-26 16:34:09 +04:00
frm_crypt.cc
gen_lex_hash.cc After merge fixes 2004-12-31 00:44:00 +02:00
gstream.cc
gstream.h
ha_berkeley.cc Merge with 4.1 2005-01-15 14:09:45 +02:00
ha_berkeley.h merge with 4.1 2004-10-29 19:26:52 +03:00
ha_federated.cc Review fixed 2005-02-02 22:39:21 +02:00
ha_federated.h changes to get rid of compile warnings in both ha_federated.cc and ha_federated.h 2005-01-26 11:47:28 -08:00
ha_heap.cc Merge with 4.1 2005-01-15 14:09:45 +02:00
ha_heap.h Output 'MEMORY' as table type for tables using the memory (nee heap) storage 2005-01-13 17:38:13 -08:00
ha_innodb.cc 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
ha_innodb.h WL#1967 2005-02-01 19:48:05 +00:00
ha_myisam.cc A fix for bit type. 2005-01-14 18:24:32 +04:00
ha_myisam.h bit type 2004-12-17 18:06:05 +04:00
ha_myisammrg.cc First stage of table definition cache 2005-01-06 13:00:13 +02:00
ha_myisammrg.h Fix for BUG#7377. This fix adds the same implementation for ha_myisammgr::index_type as in version 5.0. 2004-12-27 14:05:35 +02:00
ha_ndbcluster.cc Merge 2005-01-27 18:41:23 +01:00
ha_ndbcluster.h Merge 2005-01-26 13:22:07 +01:00
handler.cc WL#1967 2005-02-01 19:48:05 +00:00
handler.h WL#1967 2005-02-01 19:48:05 +00:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
item.h After merge fixes 2005-01-15 17:38:43 +02:00
item_buff.cc Rename: Item::val -> Item::val_real(). 2004-11-11 21:39:35 +03:00
item_cmpfunc.cc Merge mysql.com:/usr/home/bar/mysql-4.1 2005-01-20 16:08:27 +04:00
item_cmpfunc.h 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
item_create.cc Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1 2005-01-26 09:05:58 +01:00
item_create.h Merge with 4.1 2004-12-22 13:54:39 +02:00
item_func.cc 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
item_func.h 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
item_geofunc.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
item_geofunc.h Rename: Item::val -> Item::val_real(). 2004-11-11 21:39:35 +03:00
item_row.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
item_row.h Rename: Item::val -> Item::val_real(). 2004-11-11 21:39:35 +03:00
item_strfunc.cc 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
item_strfunc.h 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
item_subselect.cc 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
item_subselect.h Merge with 4.1 2004-12-22 13:54:39 +02:00
item_sum.cc Fixes for windows compilation bugs 2005-01-26 15:19:20 +01:00
item_sum.h After merge fixes 2005-01-15 17:38:43 +02:00
item_timefunc.cc Manual merge of fixes for bugs #7899 "CREATE TABLE .. SELECT .. and 2005-01-28 10:22:50 +03:00
item_timefunc.h Manual merge of fixes for bugs #7899 "CREATE TABLE .. SELECT .. and 2005-01-28 10:22:50 +03:00
item_uniq.cc
item_uniq.h merge 2004-11-12 15:36:31 +02:00
key.cc Fixes for windows compilation bugs 2005-01-26 15:19:20 +01:00
lex.h WL#1967 2005-02-01 19:48:05 +00:00
lex_symbol.h
lock.cc added variable NDB_MGM to be able to run the management client in tests 2005-01-20 13:45:42 +01:00
log.cc merged 2005-01-24 19:41:42 +01:00
log_event.cc Merge 2005-01-16 21:39:21 +01:00
log_event.h Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
Makefile.am small Makefile.am cleanup 2005-01-28 17:14:03 +01:00
matherr.c
mf_iocache.cc
my_lock.c
mysql_priv.h Review fixed 2005-02-02 22:39:21 +02:00
mysqld.cc 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
mysqld_suffix.h
net_serv.cc Merge mysql.com:/home/kostja/work/mysql-4.1-7428 2005-01-11 14:47:12 +03:00
nt_servc.cc
nt_servc.h
opt_range.cc Fixes for windows compilation bugs 2005-01-26 15:19:20 +01:00
opt_range.h Post WL#2126 fixes: 2004-12-29 16:07:27 +03:00
opt_sum.cc First stage of table definition cache 2005-01-06 13:00:13 +02:00
parse_file.cc now my_printf_error is not better then my_error, but my_error call is shorter 2004-11-13 19:35:51 +02: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 Merge with 4.1 2004-12-22 13:54:39 +02:00
procedure.cc now my_printf_error is not better then my_error, but my_error call is shorter 2004-11-13 19:35:51 +02:00
procedure.h After merge fixes 2005-01-15 17:38:43 +02:00
protocol.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
protocol.h merge 2004-11-12 15:36:31 +02:00
protocol_cursor.cc merge 2004-11-12 15:36:31 +02:00
records.cc Merge 2005-01-20 07:51:00 +03:00
repl_failsafe.cc First stage of table definition cache 2005-01-06 13:00:13 +02:00
repl_failsafe.h merge 2004-11-12 15:36:31 +02:00
set_var.cc 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
set_var.h Manual merge of fixes for bugs #7899 "CREATE TABLE .. SELECT .. and 2005-01-28 10:22:50 +03:00
slave.cc merged 2005-01-24 19:41:42 +01:00
slave.h Merge with 4.1 2004-12-22 13:54:39 +02:00
sp.cc First stage of table definition cache 2005-01-06 13:00:13 +02:00
sp.h WL#925 - Privileges for stored routines 2004-12-23 10:46:24 +00:00
sp_cache.cc
sp_cache.h
sp_head.cc First stage of table definition cache 2005-01-06 13:00:13 +02:00
sp_head.h Fix for bug #5888 "Triggers with nonexistent columns cause packets 2004-11-24 12:24:02 +03: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 Fix warnings and compilation failures (Windows). 2004-11-17 13:45:05 +03:00
sp_rcontext.cc post-review fixes 2004-11-12 14:34:00 +02:00
sp_rcontext.h Fixed BUG#6029: Stored procedure specific handlers should have priority. 2004-10-23 14:23:32 +02:00
spatial.cc Fix for bug #6117 (Centroid() crashes server) 2004-10-22 20:32:02 +05:00
spatial.h Fix compiler warnings (detected by Intel's C++ compiler) 2004-10-22 18:44:51 +03:00
sql_acl.cc Fixes for windows compilation bugs 2005-01-26 15:19:20 +01:00
sql_acl.h merged 2005-01-24 19:41:42 +01:00
sql_analyse.cc Review fixed 2005-02-02 22:39:21 +02:00
sql_analyse.h
sql_base.cc 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
sql_bitmap.h
sql_cache.cc Merge 2005-01-31 16:27:17 -08:00
sql_cache.h merge with 4.1 2004-10-29 19:26:52 +03:00
sql_class.cc 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
sql_class.h 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_db.cc merged 2005-01-24 19:41:42 +01:00
sql_delete.cc First stage of table definition cache 2005-01-06 13:00:13 +02:00
sql_derived.cc First stage of table definition cache 2005-01-06 13:00:13 +02:00
sql_do.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
sql_error.cc merge 2004-11-12 15:36:31 +02:00
sql_handler.cc First stage of table definition cache 2005-01-06 13:00:13 +02:00
sql_help.cc after review fixup (bug #8129: help.test fails using --ps-protocol) 2005-01-26 16:02:19 +04:00
sql_insert.cc Review fixed 2005-02-02 22:39:21 +02:00
sql_lex.cc 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
sql_lex.h 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
sql_list.cc
sql_list.h protection: TRASH in delete 2004-11-28 15:53:17 +01:00
sql_load.cc First stage of table definition cache 2005-01-06 13:00:13 +02:00
sql_manager.cc
sql_manager.h
sql_map.cc now my_printf_error is not better then my_error, but my_error call is shorter 2004-11-13 19:35:51 +02:00
sql_map.h
sql_olap.cc post-merge fix 2004-11-25 02:23:13 +02:00
sql_parse.cc 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
sql_prepare.cc Merge with 4.1 2005-01-15 14:09:45 +02:00
sql_rename.cc First stage of table definition cache 2005-01-06 13:00:13 +02:00
sql_repl.cc Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
sql_repl.h Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
sql_select.cc 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
sql_select.h Merge with global tree 2004-12-19 20:25:19 +02:00
sql_show.cc A fix: 'information_schema' test with ps-protocol option fails 2005-01-28 19:08:27 +03:00
sql_sort.h
sql_state.c
sql_string.cc Add support for up to VARCHAR (size up to 65535) 2004-12-06 02:00:37 +02:00
sql_string.h protection: TRASH in delete 2004-11-28 15:53:17 +01:00
sql_table.cc 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
sql_test.cc First stage of table definition cache 2005-01-06 13:00:13 +02:00
sql_trigger.cc First stage of table definition cache 2005-01-06 13:00:13 +02:00
sql_trigger.h Fix for bug #5888 "Triggers with nonexistent columns cause packets 2004-11-24 12:24:02 +03:00
sql_udf.cc First stage of table definition cache 2005-01-06 13:00:13 +02:00
sql_udf.h A fix (bug #6441: Aggregate UDF in multi-table query crashes MySQL when returning multiple rows). 2004-11-06 09:37:30 +04:00
sql_union.cc after merge fixes 2005-01-18 23:34:15 +02:00
sql_update.cc 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
sql_view.cc Fix accesses to uninitialized memory (found by valgrind) 2005-01-13 03:02:49 +02:00
sql_view.h post-merge fix 2004-11-25 02:23:13 +02:00
sql_yacc.yy WL#1967 2005-02-01 19:48:05 +00:00
stacktrace.c Merge with 4.0 for 4.1 release 2004-10-06 19:14:33 +03:00
stacktrace.h
strfunc.cc Merging conflicts resolved 2005-01-11 21:00:53 +04:00
structs.h Manual merge of patch implementing WL#1339 with main tree. 2004-12-29 22:35:16 +03:00
table.cc Fixes for windows compilation bugs 2005-01-26 15:19:20 +01:00
table.h Fixed memory reference errors found by valgrind 2005-01-12 03:38:53 +02:00
thr_malloc.cc Simpler arena swapping code 2004-11-08 01:13:54 +02:00
time.cc Fix for bug #7297 "Two digit year should be interpreted correctly 2004-12-16 16:31:50 +03:00
tzfile.h
tztime.cc Manual merge of fixes for bugs #7899 "CREATE TABLE .. SELECT .. and 2005-01-28 10:22:50 +03:00
tztime.h Merge with global tree 2004-12-31 00:50:30 +02:00
udf_example.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
uniques.cc
unireg.cc First stage of table definition cache 2005-01-06 13:00:13 +02:00
unireg.h First stage of table definition cache 2005-01-06 13:00:13 +02:00
watchdog_mysqld