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 aca6f88ebb Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1


BitKeeper/etc/config:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema_db.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysys/default.c:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/include/os0file.h:
  Auto merged
storage/innobase/include/read0read.h:
  Auto merged
storage/innobase/include/read0types.h:
  Auto merged
storage/innobase/include/trx0trx.h:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/read/read0read.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/innobase/srv/srv0srv.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/innobase/trx/trx0sys.c:
  Auto merged
storage/innobase/trx/trx0trx.c:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
storage/ndb/src/common/portlib/NdbMutex.c:
  Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.hpp:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  Manual merge 5.0 -> 5.1
mysql-test/t/alter_table.test:
  Manual merge 5.0 -> 5.1
sql/share/errmsg.txt:
  Manual merge 5.0 -> 5.1
storage/ndb/tools/Makefile.am:
  Manual merge 5.0 -> 5.1
2005-08-05 18:01:34 -04:00
..
examples merge 2005-07-21 00:04:18 +02:00
share Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
.cvsignore
add_errmsg
client_settings.h
custom_conf.h
derror.cc
des_key_file.cc Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-07-19 11:05:49 -07:00
discover.cc
field.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
field.h Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
field_conv.cc Cleanups after merge from 4.1. 2005-07-19 16:32:38 -07:00
filesort.cc Fix bug #7422 "order by" doesn't work 2005-06-21 20:14:50 +04:00
frm_crypt.cc
gen_lex_hash.cc a fix (#10742: Can't compile "sql_lex.cc" on AIX 5.2). 2005-05-19 18:56:01 +05:00
gstream.cc fixes for windows 64-bit compiler warnings 2005-06-13 12:41:15 +02:00
gstream.h
ha_berkeley.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2005-07-23 00:15:53 +03:00
ha_berkeley.h Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2005-07-23 00:15:53 +03:00
ha_blackhole.cc Implement MySQL framework to support consistent read views in 2005-07-20 20:02:36 +04:00
ha_blackhole.h A fix and a test case for Bug#10760 and complementary cleanups. 2005-07-19 22:21:12 +04:00
ha_federated.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
ha_federated.h merge 2005-07-19 21:56:10 +02:00
ha_heap.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2005-07-23 00:15:53 +03:00
ha_heap.h Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2005-07-23 00:15:53 +03:00
ha_innodb.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
ha_innodb.h Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
ha_myisam.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2005-07-23 00:15:53 +03:00
ha_myisam.h Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2005-07-23 00:15:53 +03:00
ha_myisammrg.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2005-07-23 00:15:53 +03:00
ha_myisammrg.h Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2005-07-23 00:15:53 +03:00
ha_ndbcluster.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
ha_ndbcluster.h Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
ha_partition.cc merge 2005-07-20 00:40:49 +02:00
ha_partition.h Patch for push of wl1354 Partitioning 2005-07-18 13:31:02 +02:00
handler.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
handler.h Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2005-07-23 00:15:53 +03:00
hash_filo.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
hash_filo.h forgotten s/__GNUC__/USE_PRAGMA_INTERFACE/ causes compilation faliures 2005-05-27 14:15:08 +02:00
hostname.cc Fix shortcircuit of 127.0.0.1 -> localhost lookup on little-endian machines. (Bug #11822) 2005-07-27 13:01:48 +02:00
init.cc
item.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
item.h Fixes during review of new pushed code 2005-07-31 12:49:55 +03:00
item_buff.cc sql_select.cc: 2005-07-25 12:57:23 -07:00
item_cmpfunc.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-07-18 19:03:01 +03:00
item_cmpfunc.h After merge fixes 2005-07-04 16:01:04 +03:00
item_create.cc stop evaluation constant functions in WHERE (BUG#4663) 2005-07-16 00:01:44 +03:00
item_create.h
item_func.cc Manual merge 2005-08-03 03:47:07 +00:00
item_func.h Remove Item_func::NOTLIKE_FUNC and all [dead] code that uses it 2005-07-29 03:37:06 +02:00
item_geofunc.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
item_geofunc.h Merge neptunus.(none):/home/msvensson/mysql/bug10241 2005-05-09 11:26:48 +02:00
item_row.cc Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
item_row.h Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
item_strfunc.cc Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-07-22 12:35:15 -07:00
item_strfunc.h Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2005-07-16 00:17:05 +03:00
item_subselect.cc Patch for push of wl1354 Partitioning 2005-07-18 13:31:02 +02:00
item_subselect.h Merge mysql.com:/opt/local/work/mysql-4.1-11458 2005-07-13 18:05:57 +04:00
item_sum.cc Manual merge of #11335 bugfix 2005-08-05 00:34:42 +04:00
item_sum.h merge 2005-07-05 11:21:47 +03:00
item_timefunc.cc Fixes during review of new pushed code 2005-07-31 12:49:55 +03:00
item_timefunc.h Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
item_uniq.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
item_uniq.h Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
key.cc Bug #12116 patch 2005-07-22 17:05:16 -04:00
lex.h merge 2005-07-19 21:56:10 +02:00
lex_symbol.h
lock.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
log.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
log_event.cc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-07-20 07:53:10 +02:00
log_event.h Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
Makefile.am Patch for push of wl1354 Partitioning 2005-07-18 13:31:02 +02:00
matherr.c
mf_iocache.cc
my_decimal.cc Trimmed fix for bug #9546 (Crashing with huge decimals) 2005-05-06 19:04:58 +05:00
my_decimal.h Fix for bug #10896 (0.00 > -0.00) 2005-06-08 21:56:22 +05:00
my_lock.c
mysql_priv.h Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
mysqld.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
mysqld_suffix.h
net_serv.cc Merge mysql.com:/home/bkroot/mysql-4.1 2005-07-13 02:13:04 +02:00
nt_servc.cc
nt_servc.h
opt_range.cc merge 2005-07-19 21:56:10 +02:00
opt_range.h Merge with 4.1 2005-06-07 00:31:53 +03:00
opt_sum.cc Patch for push of wl1354 Partitioning 2005-07-18 13:31:02 +02:00
parse_file.cc store/restore sql_mode which was in force during ctrigger creation (BUG#5891) 2005-07-28 22:39:11 +03:00
parse_file.h store/restore sql_mode which was in force during ctrigger creation (BUG#5891) 2005-07-28 22:39:11 +03:00
password.c fixes for windows 64-bit compiler warnings 2005-06-13 12:41:15 +02:00
procedure.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
procedure.h Merge neptunus.(none):/home/msvensson/mysql/bug10241 2005-05-09 11:26:48 +02:00
protocol.cc A fix and a test case for Bug#10794 "mysql_stmt_attr_set no 2005-06-30 16:17:10 +04:00
protocol.h A fix and a test case for Bug#10794 "mysql_stmt_attr_set no 2005-06-30 16:17:10 +04:00
protocol_cursor.cc fix for bug#8692 2005-07-22 08:11:23 +02:00
records.cc Patch for push of wl1354 Partitioning 2005-07-18 13:31:02 +02:00
repl_failsafe.cc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-02 10:44:48 +02:00
repl_failsafe.h
rpl_filter.cc
rpl_filter.h
set_var.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
set_var.h Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
slave.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
slave.h updates for BUG#10780 - fixed slave I/O thread running status to No while attempting 2005-07-29 21:00:28 -06:00
sp.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
sp.h Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-03 10:14:01 +00:00
sp_cache.cc sp_rcontext.cc, sp_pcontext.cc, sp_head.cc, sp_cache.cc, ha_federated.cc: 2005-06-05 16:20:22 +02:00
sp_cache.h Fixed comment 2005-08-03 10:12:31 +00:00
sp_head.cc Manual merge 2005-08-03 03:47:07 +00:00
sp_head.h Manual merge 2005-08-03 03:47:07 +00:00
sp_pcontext.cc sp_rcontext.cc, sp_pcontext.cc, sp_head.cc, sp_cache.cc, ha_federated.cc: 2005-06-05 16:20:22 +02:00
sp_pcontext.h Add USE_PRAGMA_INTERFACE and USE_PRAGMA_IMPLEMENTATION to files not existsing in 4.1 2005-05-27 12:03:37 +02:00
sp_rcontext.cc Fixed BUG#11529: crash server after use stored procedure 2005-06-30 18:07:06 +02:00
sp_rcontext.h Fixed BUG#11529: crash server after use stored procedure 2005-06-30 18:07:06 +02:00
spatial.cc Merge mdk10.(none):/home/reggie/bk/mysql-4.1 2005-05-19 15:50:44 -05:00
spatial.h Fix warnings from icc 2005-05-18 19:00:21 +03:00
sql_acl.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
sql_acl.h Merge 2005-07-12 20:01:22 +02:00
sql_analyse.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
sql_analyse.h Merge from 4.1 2005-05-26 21:01:55 +02:00
sql_base.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
sql_bitmap.h merge 2005-07-20 00:40:49 +02:00
sql_cache.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
sql_cache.h
sql_class.cc Manual merge 2005-08-03 03:47:07 +00:00
sql_class.h Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
sql_client.cc
sql_crypt.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
sql_crypt.h Add ifdefs to control when "#pragma implementation" should be used 2005-05-26 12:09:14 +02:00
sql_db.cc fixed conflicts 2005-05-20 16:34:59 -05:00
sql_delete.cc Merge 2005-07-12 20:01:22 +02:00
sql_derived.cc Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
sql_do.cc Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
sql_error.cc merge 2005-07-05 11:38:05 +03:00
sql_error.h
sql_handler.cc Patch for push of wl1354 Partitioning 2005-07-18 13:31:02 +02:00
sql_help.cc Patch for push of wl1354 Partitioning 2005-07-18 13:31:02 +02:00
sql_insert.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
sql_lex.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
sql_lex.h Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2005-07-23 00:15:53 +03:00
sql_list.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
sql_list.h merged 2005-05-19 15:20:10 +02:00
sql_load.cc Merge 2005-07-12 20:01:22 +02:00
sql_manager.cc
sql_manager.h
sql_map.cc WL#2286 - Compile MySQL w/YASSL support 2005-06-22 14:08:28 +05:00
sql_map.h Add ifdefs to control when "#pragma implementation" should be used 2005-05-26 12:09:14 +02:00
sql_olap.cc Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
sql_parse.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
sql_partition.cc BUG #12097 patch 2005-07-22 14:47:05 -04:00
sql_prepare.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
sql_rename.cc Bug#6877 MySQL should give an error if the requested table type is not available 2005-06-17 22:14:44 +01:00
sql_repl.cc merge 2005-07-19 21:56:10 +02:00
sql_repl.h
sql_select.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
sql_select.h merge 2005-07-21 00:04:18 +02:00
sql_show.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
sql_sort.h
sql_state.c
sql_string.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
sql_string.h Bug#8610: The ucs2_turkish_ci collation fails with upper('i') 2005-06-06 16:54:15 +05:00
sql_table.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
sql_test.cc Fixes while reviewing new code 2005-05-06 11:39:30 +03:00
sql_trigger.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-07-31 12:56:02 +03:00
sql_trigger.h Manual merge 2005-08-03 03:47:07 +00:00
sql_udf.cc - backport of a compile fix from 4.1 (ChangeSet@1.2260.23.2 2005/05/19 from reggie) 2005-06-30 17:33:23 +02:00
sql_udf.h Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
sql_union.cc Fix bug #11335 View redefines TinyInt(1) column definition 2005-07-30 05:53:35 +04:00
sql_update.cc Patch for push of wl1354 Partitioning 2005-07-18 13:31:02 +02:00
sql_view.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-07-31 12:56:02 +03:00
sql_view.h Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
sql_yacc.yy Bug #12097 More fixes 2005-07-22 15:17:05 -04:00
stacktrace.c Step 2 of the switch to support configuration with NPTL: 2005-04-20 20:38:57 +02:00
stacktrace.h Step 2 of the switch to support configuration with NPTL: 2005-04-20 20:38:57 +02:00
strfunc.cc
structs.h Fix for bug#11055: information_schema: routines.sql_data_access has wrong value 2005-06-16 12:12:47 +05:00
table.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
table.h Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
thr_malloc.cc
time.cc Fixes during review of new pushed code 2005-07-31 12:49:55 +03:00
tzfile.h
tztime.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
tztime.h Fixes during review of new pushed code 2005-07-31 12:49:55 +03:00
udf_example.cc
uniques.cc Code cleanups during code reviews 2005-06-01 16:35:09 +03:00
unireg.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
unireg.h Patch for push of wl1354 Partitioning 2005-07-18 13:31:02 +02:00
watchdog_mysqld