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 8b1a32aead Merge mysql.com:/home/mysql_src/mysql-4.1 
into  mysql.com:/home/mysql_src/mysql-5.0;
a very bad automerge (issues with non-ascii chars), plus some hard conflicts I'll fix by hand in a next cset


BitKeeper/deleted/.del-compile-pentium64-valgrind-max:
  Delete: BUILD/compile-pentium64-valgrind-max
BitKeeper/etc/config:
  Auto merged
sql/log.cc:
  Auto merged
sql/slave.h:
  Auto merged
client/mysqltest.c:
  manual merge
mysql-test/r/subselect.result:
  manual merge
mysql-test/t/subselect.test:
  manual merge
sql/log_event.cc:
  manual merge
sql/log_event.h:
  manual merge
sql/slave.cc:
  manual merge
sql/sql_yacc.yy:
  manual merge
2005-10-12 21:58:02 +02:00
..
examples Final patch for 5.0 for simplifying storage engine code. We now have just one set of ifdefs. I may also remove the code for creating new handlers. 2005-10-03 18:42:30 -07:00
share Fixed BUG#13510: Setting password local variable changes current password 2005-10-11 15:01:38 +02:00
.cvsignore
add_errmsg
client_settings.h
custom_conf.h
derror.cc
des_key_file.cc Many files: 2005-09-30 14:03:55 +02:00
discover.cc
field.cc Some minor fixes revealed as warnings by 2005-09-23 21:28:56 +03:00
field.h Added option --valgrind-mysqltest to mysql-test-run 2005-09-14 01:41:44 +03:00
field_conv.cc a fix (bug #7589: Decimal types are ignored when updating data from another column). 2005-09-21 14:32:19 +05:00
filesort.cc Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 2005-09-12 20:18:49 +03:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_archive.cc Final patch for 5.0 for simplifying storage engine code. We now have just one set of ifdefs. I may also remove the code for creating new handlers. 2005-10-03 18:42:30 -07:00
ha_archive.h Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-02 20:13:18 -07:00
ha_berkeley.cc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-03 21:09:01 -07:00
ha_berkeley.h Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-03 21:09:01 -07:00
ha_blackhole.cc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-02 20:13:18 -07:00
ha_blackhole.h Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 2005-08-26 15:56:52 +03:00
ha_federated.cc Reviewing new pushed code 2005-10-12 00:58:22 +03:00
ha_federated.h Improvement to federated for BUG#12659 2005-09-13 23:31:17 -07:00
ha_heap.cc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-02 20:13:18 -07:00
ha_heap.h
ha_innodb.cc Fix compile error on Windows: remove wrong typecast 2005-10-12 16:43:55 +04:00
ha_innodb.h Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-03 21:09:01 -07:00
ha_myisam.cc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-02 20:13:18 -07:00
ha_myisam.h
ha_myisammrg.cc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-02 20:13:18 -07:00
ha_myisammrg.h
ha_ndbcluster.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-12 00:59:52 +03:00
ha_ndbcluster.h Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-03 21:09:01 -07:00
handler.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-12 00:59:52 +03:00
handler.h Store and read engine type string in extra block of .frm. 2005-10-10 23:01:45 +05:00
hash_filo.cc
hash_filo.h
hostname.cc Backport of JimW's localhost patch to 4.1 tree. 2005-09-02 17:07:05 -07:00
init.cc
item.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-12 00:59:52 +03:00
item.h Reviewing new pushed code 2005-10-12 00:58:22 +03:00
item_buff.cc
item_cmpfunc.cc Merge msdesk.(none):/home/msvensson/mysql-4.1 2005-10-06 14:40:18 +02:00
item_cmpfunc.h Merge 2005-09-29 03:20:31 +02:00
item_create.cc Fixed BUG#12963, BUG#13000: wrong VIEW creation with DAYNAME(), 2005-09-14 20:25:00 +04:00
item_create.h
item_func.cc Reviewing new pushed code 2005-10-12 00:58:22 +03:00
item_func.h Merge mysqldev@production.mysql.com:my/mysql-5.0-release 2005-09-23 00:46:59 +04:00
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc Reviewing new pushed code 2005-10-12 00:58:22 +03:00
item_strfunc.h Reviewing new pushed code 2005-10-12 00:58:22 +03:00
item_subselect.cc A fix and a test case for Bug#6513 "Test Suite: Values inserted by using 2005-09-22 02:11:21 +04:00
item_subselect.h Rename: 2005-09-02 17:21:19 +04:00
item_sum.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-09-30 12:36:23 +03:00
item_sum.h Merge 4.1->5.0 2005-09-09 10:54:59 +04:00
item_timefunc.cc Fixed BUG#12963, BUG#13000: wrong VIEW creation with DAYNAME(), 2005-09-14 20:25:00 +04:00
item_timefunc.h Fixed BUG#12963, BUG#13000: wrong VIEW creation with DAYNAME(), 2005-09-14 20:25:00 +04:00
item_uniq.cc
item_uniq.h
key.cc
lex.h
lex_symbol.h
lock.cc Fix for bug #12704 "Server crashes during trigger execution". 2005-09-15 03:56:09 +04:00
log.cc Merge mysql.com:/home/mysql_src/mysql-4.1 2005-10-12 21:58:02 +02:00
log_event.cc Merge mysql.com:/home/mysql_src/mysql-4.1 2005-10-12 21:58:02 +02:00
log_event.h Merge mysql.com:/home/mysql_src/mysql-4.1 2005-10-12 21:58:02 +02:00
Makefile.am Moving archive from example to sql. 2005-09-28 19:04:51 -07:00
matherr.c
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h pthread_handler_decl() changed to be ctags-friendly 2005-10-08 16:39:55 +02:00
mysqld.cc after merge fix 2005-10-12 13:18:46 +05:00
mysqld_suffix.h
net_serv.cc Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-09-12 17:00:50 -07:00
nt_servc.cc
nt_servc.h
opt_range.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-08 03:37:23 +03:00
opt_range.h
opt_sum.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 2005-09-28 11:34:53 +02:00
parse_file.cc Reviewing new pushed code 2005-10-12 00:58:22 +03:00
parse_file.h Changes after discussion/review with Sanja 2005-09-18 21:43:28 +02:00
password.c Reviewing new pushed code 2005-10-12 00:58:22 +03:00
procedure.cc
procedure.h
protocol.cc
protocol.h A fix and a test case for Bug#6513 "Test Suite: Values inserted by using 2005-09-22 02:11:21 +04:00
records.cc
repl_failsafe.cc pthread_handler_decl() changed to be ctags-friendly 2005-10-08 16:39:55 +02:00
repl_failsafe.h pthread_handler_decl() changed to be ctags-friendly 2005-10-08 16:39:55 +02:00
set_var.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-09-21 17:42:44 +02:00
set_var.h Fixed BUG#12712: SET AUTOCOMMIT should fail within SP/functions/triggers 2005-09-13 17:16:12 +02:00
slave.cc Merge mysql.com:/home/mysql_src/mysql-4.1 2005-10-12 21:58:02 +02:00
slave.h Merge mysql.com:/home/mysql_src/mysql-4.1 2005-10-12 21:58:02 +02:00
sp.cc Fix use of "%*s" *printf() specifiers that were really meant to be 2005-10-06 17:37:24 -07:00
sp.h Fix for bug #12704 "Server crashes during trigger execution". 2005-09-15 03:56:09 +04:00
sp_cache.cc Fix use of "%*s" *printf() specifiers that were really meant to be 2005-10-06 17:37:24 -07:00
sp_cache.h
sp_head.cc Merge mysql.com:/usr/local/bk/mysql-5.0 2005-10-12 11:52:37 +02:00
sp_head.h Merge mysqldev@production.mysql.com:my/mysql-5.0-release 2005-09-23 00:46:59 +04:00
sp_pcontext.cc Fixed BUG#13133: Local variables in stored procedures are not initialized correctly. 2005-09-13 12:50:21 +02:00
sp_pcontext.h Fixed BUG#13133: Local variables in stored procedures are not initialized correctly. 2005-09-13 12:50:21 +02:00
sp_rcontext.cc Fixed BUG#6127: Stored procedure handlers within handlers don't work 2005-09-26 18:22:00 +02:00
sp_rcontext.h Fixed BUG#6127: Stored procedure handlers within handlers don't work 2005-09-26 18:22:00 +02:00
spatial.cc
spatial.h
sql_acl.cc Fix for bug #13546 "Build errors with --with-embedded-server 2005-09-28 18:43:46 +04:00
sql_acl.h WL#2787 (Add view definer/owner to the view definition (.frm) to check privileges on used tables and stored routines when using a VIEW.) 2005-09-20 21:20:38 +03:00
sql_analyse.cc Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-09-13 18:23:37 +03:00
sql_analyse.h
sql_array.h
sql_base.cc Reviewing new pushed code 2005-10-12 00:58:22 +03:00
sql_bitmap.h
sql_cache.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-09-30 16:51:35 +02:00
sql_cache.h Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1 2005-09-06 20:51:15 +03:00
sql_class.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-08 03:37:23 +03:00
sql_class.h pthread_handler_decl() changed to be ctags-friendly 2005-10-08 16:39:55 +02:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_cursor.cc A fix and a test case for Bug#6513 "Test Suite: Values inserted by using 2005-09-22 02:11:21 +04:00
sql_cursor.h A fix and a test case for Bug#6513 "Test Suite: Values inserted by using 2005-09-22 02:11:21 +04:00
sql_db.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-09-30 16:51:35 +02:00
sql_delete.cc Move handler specific options into handlerton flag check 2005-09-30 16:26:48 -07:00
sql_derived.cc A fix and a test case for Bug#6513 "Test Suite: Values inserted by using 2005-09-22 02:11:21 +04:00
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc Fix for bug #12704 "Server crashes during trigger execution". 2005-09-15 03:56:09 +04:00
sql_help.cc Added option --valgrind-mysqltest to mysql-test-run 2005-09-14 01:41:44 +03:00
sql_insert.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-12 00:59:52 +03:00
sql_lex.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 2005-09-28 11:34:53 +02:00
sql_lex.h Merge mysqldev@production.mysql.com:my/mysql-5.0-release 2005-09-23 00:46:59 +04:00
sql_list.cc
sql_list.h A fix and a test case for Bug#6513 "Test Suite: Values inserted by using 2005-09-22 02:11:21 +04:00
sql_load.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 2005-09-28 11:34:53 +02:00
sql_manager.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-12 00:59:52 +03:00
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc after merge fix 2005-10-12 13:18:46 +05:00
sql_prepare.cc Reviewing new pushed code 2005-10-12 00:58:22 +03:00
sql_rename.cc Changes after discussion/review with Sanja 2005-09-18 21:43:28 +02:00
sql_repl.cc Bug#9683 INFORMATION_SCH: Creation of temporary table allowed in 2005-09-13 16:07:38 +05:00
sql_repl.h
sql_select.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-12 00:59:52 +03:00
sql_select.h A fix and a test case for Bug#6513 "Test Suite: Values inserted by using 2005-09-22 02:11:21 +04:00
sql_show.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-12 00:59:52 +03:00
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h
sql_table.cc Reviewing new pushed code 2005-10-12 00:58:22 +03:00
sql_test.cc Merge mysql.com:/home/mydev/mysql-4.1-4100 2005-09-14 13:37:16 +02:00
sql_trigger.cc WL#2787 (part 2, ver 3 (merged)) changed securety context switching 2005-09-15 22:29:07 +03:00
sql_trigger.h Fix for bug #12704 "Server crashes during trigger execution". 2005-09-15 03:56:09 +04:00
sql_udf.cc Added option --valgrind-mysqltest to mysql-test-run 2005-09-14 01:41:44 +03:00
sql_udf.h
sql_union.cc A fix and a test case for Bug#6513 "Test Suite: Values inserted by using 2005-09-22 02:11:21 +04:00
sql_update.cc Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 2005-10-10 17:50:19 +02:00
sql_view.cc Reviewing new pushed code 2005-10-12 00:58:22 +03:00
sql_view.h Fix for bug#5508 after Sanja's review 2005-09-16 17:13:21 +02:00
sql_yacc.yy sql_yacc.yy: 2005-10-12 09:47:59 +02:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-08 03:37:23 +03:00
table.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-12 00:59:52 +03:00
table.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-08 03:37:23 +03:00
thr_malloc.cc
time.cc
tzfile.h
tztime.cc Added option --valgrind-mysqltest to mysql-test-run 2005-09-14 01:41:44 +03:00
tztime.h
udf_example.cc
uniques.cc
unireg.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-12 00:59:52 +03:00
unireg.h unireg.h: 2005-08-27 01:50:38 +02:00
watchdog_mysqld