mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 07:44:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
unknown 0a0b9309eb Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
ndb/test/run-test/daily-devel-tests.txt:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
2005-02-11 06:42:57 +01:00
..
examples 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
share WL#2130: Table locking for stored FUNCTIONs 2005-02-08 20:52:50 +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 Things missing in last changset 2005-02-10 15:41:51 +02:00
field.h Things missing in last changset 2005-02-10 15:41:51 +02:00
field_conv.cc Precision Math implementation 2005-02-09 02:50:45 +04:00
filesort.cc Precision Math implementation 2005-02-09 02:50:45 +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-02-10 02:27:37 +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 Precision Math implementation 2005-02-09 02:50:45 +04:00
ha_innodb.h Merge of query cache from 4.1 to 5.0 2005-02-04 10:56:53 +01:00
ha_myisam.cc Precision Math implementation 2005-02-09 02:50:45 +04:00
ha_myisam.h Merge changes 2005-02-04 11:59:02 -08: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 Fix core dump in ha_ndbcluster::print_results 2005-02-09 15:09:13 +01:00
ha_ndbcluster.h Small changes after Tomas review 2005-02-07 13:46:13 +01:00
handler.cc Merged "query cache for ndb" to 5.0 2005-02-03 09:33:48 +01:00
handler.h Merge changes 2005-02-04 11:59:02 -08:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge mysql.com:/home/jonas/src/mysql-4.1 2005-02-11 06:42:57 +01:00
item.h Merge with 4.1 2005-02-10 02:27:37 +02:00
item_buff.cc Precision Math implementation 2005-02-09 02:50:45 +04:00
item_cmpfunc.cc Merge with 4.1 2005-02-10 02:27:37 +02:00
item_cmpfunc.h Precision Math implementation 2005-02-09 02:50:45 +04:00
item_create.cc Precision Math implementation 2005-02-09 02:50:45 +04:00
item_create.h Precision Math implementation 2005-02-09 02:50:45 +04:00
item_func.cc Merge with 4.1 2005-02-10 02:27:37 +02:00
item_func.h Precision Math implementation 2005-02-09 02:50:45 +04: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 2005-02-10 02:27:37 +02:00
item_row.h Precision Math implementation 2005-02-09 02:50:45 +04:00
item_strfunc.cc Merge with 4.1 2005-02-10 02:27:37 +02:00
item_strfunc.h Precision Math implementation 2005-02-09 02:50:45 +04:00
item_subselect.cc Merge with 4.1 2005-02-10 02:27:37 +02:00
item_subselect.h Precision Math implementation 2005-02-09 02:50:45 +04:00
item_sum.cc Precision Math implementation 2005-02-09 02:50:45 +04:00
item_sum.h Precision Math implementation 2005-02-09 02:50:45 +04: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 Precision Math implementation 2005-02-09 02:50:45 +04:00
item_uniq.cc Precision Math implementation 2005-02-09 02:50:45 +04:00
item_uniq.h Precision Math implementation 2005-02-09 02:50:45 +04: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 Merge mysql.com:/home/jonas/src/mysql-4.1 2005-02-11 06:42:57 +01:00
log_event.cc Precision Math implementation 2005-02-09 02:50:45 +04:00
log_event.h WL#1062 "log charset info into all Query_log_event": 2005-02-03 16:22:16 +01:00
Makefile.am Precision Math implementation 2005-02-09 02:50:45 +04:00
matherr.c
mf_iocache.cc
my_decimal.cc fixed C++ syntax in C code 2005-02-09 11:35:22 +02:00
my_decimal.h Precision Math implementation 2005-02-09 02:50:45 +04:00
my_lock.c
mysql_priv.h Precision Math implementation 2005-02-09 02:50:45 +04:00
mysqld.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-02-09 22:03:41 +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 cleaned up mysql installation code for windows. 2005-02-09 22:02:48 +02:00
opt_range.cc Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only (2nd patch after Monty's comments). 2005-02-05 18:16:29 +03: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 Precision Math implementation 2005-02-09 02:50:45 +04:00
procedure.h Precision Math implementation 2005-02-09 02:50:45 +04:00
protocol.cc Precision Math implementation 2005-02-09 02:50:45 +04:00
protocol.h Precision Math implementation 2005-02-09 02:50:45 +04: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 Precision Math implementation 2005-02-09 02:50:45 +04:00
set_var.h Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-02-03 16:25:57 +01:00
slave.cc Ensure that slaves have normal COMMIT behaviour after WL#1967 2005-02-07 13:15:48 +00:00
slave.h WL#1062 "log charset info into all Query_log_event": 2005-02-03 16:22:16 +01:00
sp.cc WL#2130: Table locking for stored FUNCTIONs 2005-02-08 20:52:50 +01:00
sp.h WL#2130: Table locking for stored FUNCTIONs 2005-02-08 20:52:50 +01:00
sp_cache.cc
sp_cache.h
sp_head.cc Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-02-09 02:54:08 +04:00
sp_head.h WL#2130: Table locking for stored FUNCTIONs 2005-02-08 20:52:50 +01: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 Precision Math implementation 2005-02-09 02:50:45 +04: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 Precision Math implementation 2005-02-09 02:50:45 +04:00
sql_analyse.h Precision Math implementation 2005-02-09 02:50:45 +04:00
sql_base.cc Merge serg.mylan:/usr/home/serg/Abk/m50-broken 2005-02-09 13:48:31 +01:00
sql_bitmap.h
sql_cache.cc Merge of query cache from 4.1 to 5.0 2005-02-04 10:56:53 +01:00
sql_cache.h Merged "query cache for ndb" to 5.0 2005-02-03 09:33:48 +01:00
sql_class.cc Precision Math implementation 2005-02-09 02:50:45 +04:00
sql_class.h Things missing in last changset 2005-02-10 15:41:51 +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 WL#2130: Table locking for stored FUNCTIONs 2005-02-08 20:52:50 +01:00
sql_do.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
sql_error.cc Things missing in last changset 2005-02-10 15:41:51 +02:00
sql_handler.cc Precision Math implementation 2005-02-09 02:50:45 +04: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 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-02-09 02:54:08 +04:00
sql_lex.h WL#2130: Table locking for stored FUNCTIONs 2005-02-08 20:52:50 +01:00
sql_list.cc
sql_list.h Things missing in last changset 2005-02-10 15:41:51 +02: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 Fix -ansi -pedantic compilation failure. 2005-02-10 17:46:27 +03:00
sql_prepare.cc Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-02-09 02:54:08 +04: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 Merge with 4.1 2005-02-10 02:27:37 +02:00
sql_select.h Merge with global tree 2004-12-19 20:25:19 +02:00
sql_show.cc Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-02-09 02:54:08 +04: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 Merge mysql.com:/home/psergey/mysql-4.1-bug7816 2005-02-05 01:52:17 +03:00
sql_table.cc Precision Math implementation 2005-02-09 02:50:45 +04:00
sql_test.cc First stage of table definition cache 2005-01-06 13:00:13 +02:00
sql_trigger.cc Precision Math implementation 2005-02-09 02:50:45 +04: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 Precision Math implementation 2005-02-09 02:50:45 +04:00
sql_union.cc Merge changes 2005-02-04 11:59:02 -08:00
sql_update.cc Precision Math implementation 2005-02-09 02:50:45 +04:00
sql_view.cc WL#2130: Table locking for stored FUNCTIONs 2005-02-08 20:52:50 +01:00
sql_view.h post-merge fix 2004-11-25 02:23:13 +02:00
sql_yacc.yy Fix for NCHAR bug appeared during the merging 2005-02-09 16:32:43 +04: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 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-02-07 11:57:14 +03: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 Merge with 4.1 to get bug fix 2005-02-07 19:42:03 +02:00
watchdog_mysqld