mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
unknown 0b732c4797 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0


include/my_sys.h:
  Auto merged
include/thr_lock.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql-common/client.c:
  Auto merged
client/mysqldump.c:
  Manual merge
include/mysql.h:
  Manual merge
libmysql/libmysql.c:
  Manual merge
myisam/rt_split.c:
  Manual merge
mysys/thr_lock.c:
  Manual merge
sql/lock.cc:
  Manual merge
sql/mysql_priv.h:
  Manual merge
sql/sql_base.cc:
  Manual merge
sql/sql_table.cc:
  Manual merge
tests/mysql_client_test.c:
  Manual merge
2005-07-21 01:29:57 -04:00
..
examples Implement MySQL framework to support consistent read views in 2005-07-20 20:02:36 +04:00
share Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-07-19 20:55:09 +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 Fix date conversion on 32-bit machines. 2005-07-20 10:16:43 -07:00
field.h Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03: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 Implement MySQL framework to support consistent read views in 2005-07-20 20:02:36 +04:00
ha_berkeley.h A fix and a test case for Bug#10760 and complementary cleanups. 2005-07-19 22:21:12 +04: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 Implement MySQL framework to support consistent read views in 2005-07-20 20:02:36 +04:00
ha_federated.h A fix and a test case for Bug#10760 and complementary cleanups. 2005-07-19 22:21:12 +04:00
ha_heap.cc Implement MySQL framework to support consistent read views in 2005-07-20 20:02:36 +04:00
ha_heap.h A fix and a test case for Bug#10760 and complementary cleanups. 2005-07-19 22:21:12 +04:00
ha_innodb.cc Implement MySQL framework to support consistent read views in 2005-07-20 20:02:36 +04:00
ha_innodb.h A fix and a test case for Bug#10760 and complementary cleanups. 2005-07-19 22:21:12 +04:00
ha_myisam.cc Implement MySQL framework to support consistent read views in 2005-07-20 20:02:36 +04:00
ha_myisam.h A fix and a test case for Bug#10760 and complementary cleanups. 2005-07-19 22:21:12 +04:00
ha_myisammrg.cc Implement MySQL framework to support consistent read views in 2005-07-20 20:02:36 +04:00
ha_myisammrg.h A fix and a test case for Bug#10760 and complementary cleanups. 2005-07-19 22:21:12 +04:00
ha_ndbcluster.cc Implement MySQL framework to support consistent read views in 2005-07-20 20:02:36 +04:00
ha_ndbcluster.h Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 2005-07-06 11:39:48 +02:00
handler.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 2005-07-21 01:29:57 -04:00
handler.h Implement MySQL framework to support consistent read views in 2005-07-20 20:02:36 +04: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 Handle systems where 127.0.0.1 doesn't always map to 'localhost' 2005-07-18 17:00:37 -07:00
init.cc
item.cc Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-07-19 11:05:49 -07:00
item.h Fix for bugs #5892/6182/8751/8758/10994 (based on Antony's patch) 2005-07-19 20:06:49 +04:00
item_buff.cc Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-22 14:11:23 +05: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 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-07-19 11:05:49 -07:00
item_func.h After-merge fixes (4.1 -> 5.0). 2005-07-16 16:10:42 +04: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-19 11:05:49 -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 Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03: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 Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
item_sum.h merge 2005-07-05 11:21:47 +03:00
item_timefunc.cc Merge bk-internal:/home/bk/mysql-5.0 2005-07-19 19:59:32 -07: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
lex.h Fix for bugs #5892/6182/8751/8758/10994 (based on Antony's patch) 2005-07-19 20:06:49 +04:00
lex_symbol.h
lock.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 2005-07-21 01:29:57 -04:00
log.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-07-18 19:03:01 +03:00
log_event.cc Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-07-19 11:05:49 -07:00
log_event.h Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
Makefile.am init_db.sql: 2005-07-06 10:16:36 +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-4.1 2005-07-21 01:29:57 -04:00
mysqld.cc Merge bk-internal:/home/bk/mysql-5.0 2005-07-19 19:59:32 -07: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 bk-internal.mysql.com:/home/bk/mysql-5.0 2005-07-18 19:03:01 +03:00
opt_range.h Merge with 4.1 2005-06-07 00:31:53 +03:00
opt_sum.cc Fixed wrong key length when using MIN() optimization (non fatal, but caused InnoDB to write warnings to the log file) 2005-06-06 14:03:33 +03:00
parse_file.cc Cleanups during review 2005-07-18 15:33:18 +03:00
parse_file.h
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 Merge with 4.1 2005-06-07 00:31:53 +03:00
records.cc
repl_failsafe.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
repl_failsafe.h
set_var.cc A fix and a test case for Bug#10760 and complementary cleanups. 2005-07-19 22:21:12 +04:00
set_var.h Merge mysql.com:/opt/local/work/mysql-4.1-root 2005-07-16 13:45:32 +04:00
slave.cc Get rid of checking for ETIME return value of pthread_cond_timedwait. 2005-07-14 19:42:56 +04:00
slave.h
sp.cc Fix for bugs #5892/6182/8751/8758/10994 (based on Antony's patch) 2005-07-19 20:06:49 +04:00
sp.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-07-13 15:08:13 +04: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 Add USE_PRAGMA_INTERFACE and USE_PRAGMA_IMPLEMENTATION to files not existsing in 4.1 2005-05-27 12:03:37 +02:00
sp_head.cc Fixed BUG#9538: SProc: Creation fails if we try to SET system variable 2005-07-15 17:24:19 +02:00
sp_head.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-07-09 22:04:18 +04: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 jwinstead@production.mysql.com:my/mysql-5.0-11045 2005-07-06 16:49:04 -07:00
sql_acl.h added processing of view grants to table grants (BUG#9795) 2005-07-05 13:36:36 +03: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-4.1 2005-07-21 01:29:57 -04:00
sql_bitmap.h Bug#10932 - Building server with key limit of 128, makes test cases fail 2005-07-19 14:13:56 +02:00
sql_cache.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-07-18 19:03:01 +03:00
sql_cache.h
sql_class.cc A fix and a test case for Bug#10760 and complementary cleanups. 2005-07-19 22:21:12 +04:00
sql_class.h A fix and a test case for Bug#10760 and complementary cleanups. 2005-07-19 22:21:12 +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 Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03: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 Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
sql_help.cc do not register changes of stack variable 2005-07-03 00:51:02 +03:00
sql_insert.cc Get rid of checking for ETIME return value of pthread_cond_timedwait. 2005-07-14 19:42:56 +04:00
sql_lex.cc Post-merge fixes. 2005-07-15 00:41:58 +04:00
sql_lex.h Fix for bugs #5892/6182/8751/8758/10994 (based on Antony's patch) 2005-07-19 20:06:49 +04: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 Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03: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 mysql.com:/home/jimw/my/mysql-5.0-11822 2005-07-19 19:59:33 -07:00
sql_prepare.cc Merge bk-internal:/home/bk/mysql-5.0 2005-07-19 19:59:32 -07: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 mysql.com:/home/kostja/mysql/mysql-4.1-root 2005-07-19 00:55:37 +04:00
sql_repl.h
sql_select.cc Implement MySQL framework to support consistent read views in 2005-07-20 20:02:36 +04:00
sql_select.h Implement MySQL framework to support consistent read views in 2005-07-20 20:02:36 +04:00
sql_show.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-07-19 20:55:09 +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-4.1 2005-07-21 01:29:57 -04:00
sql_test.cc
sql_trigger.cc Fix for bugs #5892/6182/8751/8758/10994 (based on Antony's patch) 2005-07-19 20:06:49 +04:00
sql_trigger.h Fix for bugs #5892/6182/8751/8758/10994 (based on Antony's patch) 2005-07-19 20:06:49 +04: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 Merge jwinstead@production.mysql.com:my/mysql-5.0-11045 2005-07-06 16:49:04 -07:00
sql_update.cc sql_update.cc: 2005-07-13 16:13:36 +03:00
sql_view.cc view.test, view.result: 2005-07-12 10:44:32 -07:00
sql_view.h Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
sql_yacc.yy Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-07-19 20:55:09 +04:00
stacktrace.c
stacktrace.h
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 jwinstead@production.mysql.com:my/mysql-5.0-11045 2005-07-06 16:49:04 -07:00
table.h Fix for bugs #5892/6182/8751/8758/10994 (based on Antony's patch) 2005-07-19 20:06:49 +04:00
thr_malloc.cc
time.cc
tzfile.h
tztime.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
tztime.h Merge neptunus.(none):/home/msvensson/mysql/bug10241 2005-05-09 11:26:48 +02:00
udf_example.cc
uniques.cc Code cleanups during code reviews 2005-06-01 16:35:09 +03:00
unireg.cc Bug#6877 MySQL should give an error if the requested table type is not available 2005-06-17 22:14:44 +01:00
unireg.h
watchdog_mysqld