database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-25 18:38:00 +03:00
Code Activity
Files
dd37fca2693b2a8230a3aaf8be6be6480c0722ed
mariadb/sql
History
unknown c5f78752aa Manual merge 
BitKeeper/etc/ignore:
  auto-union
mysql-test/t/bool.test:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/func_concat.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/innodb-deadlock.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/lowercase_table.test:
  Auto merged
mysql-test/t/lowercase_table3.test:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_empty_master_crash.test:
  Auto merged
BitKeeper/deleted/.del-isam.test~834fb0ee8196c445:
  Auto merged
BitKeeper/deleted/.del-rpl_trunc_binlog.test~961b1f6ac73d37c8:
  Auto merged
mysql-test/r/flush_block_commit.result:
  Auto merged
mysql-test/r/flush_table.result:
  Auto merged
mysql-test/r/lock_multi.result:
  Auto merged
mysql-test/r/rpl_server_id1.result:
  Auto merged
mysql-test/r/rpl_server_id2.result:
  Auto merged
mysql-test/r/rpl_start_stop_slave.result:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/ctype_latin1_de.test:
  Auto merged
mysql-test/t/flush_block_commit.test:
  Auto merged
mysql-test/t/func_if.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
mysql-test/t/rpl_drop.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_get_lock.test:
  Auto merged
mysql-test/t/rpl_heap.test:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_loaddata_rule_m.test:
  Auto merged
mysql-test/t/rpl_loaddata_rule_s.test:
  Auto merged
mysql-test/t/rpl_loaddatalocal.test:
  Auto merged
mysql-test/t/rpl_max_relay_size.test:
  Auto merged
mysql-test/t/rpl_reset_slave.test:
  Auto merged
mysql-test/t/system_mysql_db.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/t/rpl_server_id2.test:
  Auto merged
2005-09-15 22:21:30 +04:00
..
examples
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-12 17:00:50 -07:00
share
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
2005-09-14 13:37:40 +03: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_conv.cc
Added option --valgrind-mysqltest to mysql-test-run
2005-09-14 01:41:44 +03:00
field.cc
Added option --valgrind-mysqltest to mysql-test-run
2005-09-14 01:41:44 +03:00
field.h
Added option --valgrind-mysqltest to mysql-test-run
2005-09-14 01:41:44 +03: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
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 bk-internal.mysql.com:/home/bk/mysql-5.0
2005-08-15 18:35:48 +03:00
ha_berkeley.h
Fixes during review of new pushed code
2005-08-12 13:54:42 +03:00
ha_blackhole.cc
ha_blackhole.cc:
2005-08-30 02:46:03 +02: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
Per LenZ, changed calculated buffer size to constant and removed some unused variables.
2005-09-14 11:02:33 -07:00
ha_federated.h
Improvement to federated for BUG#12659
2005-09-13 23:31:17 -07:00
ha_heap.cc
Implement MySQL framework to support consistent read views in
2005-07-20 20:02:36 +04:00
ha_heap.h
Always report row type of 'Fixed' for MEMORY tables. (Bug #3094)
2005-08-05 13:19:48 -07:00
ha_innodb.cc
InnoDB: Reject foreign keys in temporary tables. Closes bug #12084.
2005-09-06 14:38:21 +03:00
ha_innodb.h
Bug #11946: Review fixes.
2005-08-30 12:39:20 +03: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
Added option --valgrind-mysqltest to mysql-test-run
2005-09-14 01:41:44 +03:00
ha_ndbcluster.h
Fixed handling of NOT LIKE after Item_func::NOTLIKE_FUNC has been removed
2005-08-01 11:50:43 +02:00
handler.cc
Added option --valgrind-mysqltest to mysql-test-run
2005-09-14 01:41:44 +03:00
handler.h
Made changes to add federated CONNECTION information to the .frm file
2005-09-12 18:02:17 -07: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
Backport of JimW's localhost patch to 4.1 tree.
2005-09-02 17:07:05 -07:00
init.cc
Fixes during review of new pushed code
2005-08-12 13:54:42 +03:00
item_buff.cc
sql_select.cc:
2005-07-25 12:57:23 -07:00
item_cmpfunc.cc
Merged from 4.1 to 5.0.
2005-09-13 01:44:50 +03:00
item_cmpfunc.h
merged
2005-09-09 09:44:58 +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
Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs.
2005-08-25 17:34:34 +04:00
item_func.cc
fix for Bug #12979 Stored procedures: crash if inout decimal parameter
2005-09-14 07:25:32 +04:00
item_func.h
func_str.result, null.result:
2005-08-26 22:25:45 -07: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-08-31 15:24:06 -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
Rename:
2005-09-02 17:21:19 +04:00
item_subselect.h
Rename:
2005-09-02 17:21:19 +04:00
item_sum.cc
Added option --valgrind-mysqltest to mysql-test-run
2005-09-14 01:41:44 +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
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
item.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-09-14 08:10:18 +02:00
item.h
fix for Bug #12849 Stored Procedure: Crash on procedure call with CHAR type 'INOUT' parameter
2005-09-08 18:25:42 +02:00
key.cc
Fixes while reviewing new code
2005-05-06 11:39:30 +03:00
lex_symbol.h
…
lex.h
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-08-25 17:39:02 +04:00
lock.cc
Fix for bug #12704 "Server crashes during trigger execution".
2005-09-15 03:56:09 +04:00
log_event.cc
Merge mysql.com:/users/lthalmann/bk/mysql-4.1
2005-09-02 11:01:00 +02:00
log_event.h
Implement WL#2661 "Prepared Statements: Dynamic SQL in Stored Procedures".
2005-09-03 03:13:18 +04:00
log.cc
Fix for BUG#12637: Make SPs+user variables replication work:
2005-09-07 19:39:47 +04:00
Makefile.am
Include the new header file in an appropriate macro.
2005-08-25 21:41:50 +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 bk-internal.mysql.com:/home/bk/mysql-5.0
2005-09-15 03:57:59 +04:00
mysqld_suffix.h
…
mysqld.cc
Merge mysql.com:/home/mydev/mysql-4.1-4100
2005-09-14 13:37:16 +02:00
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
join_outer.result, opt_range.cc, item_cmpfunc.cc:
2005-09-07 17:42:47 +04: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
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_cursor.cc
fix for bug#8692
2005-07-22 08:11:23 +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
records.cc
Moved some old test and added a new test to only be run with mysql-test-run --big
2005-04-07 19:24:14 +03:00
repl_failsafe.cc
Bug#9683 INFORMATION_SCH: Creation of temporary table allowed in
2005-09-13 16:07:38 +05:00
repl_failsafe.h
…
set_var.cc
Fixed BUG#12712: SET AUTOCOMMIT should fail within SP/functions/triggers
2005-09-13 17:16:12 +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 xiphis.org:/usr/home/antony/work2/mysql-4.1
2005-08-11 12:18:53 +01: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_cache.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-08-11 16:43:22 +03:00
sp_cache.h
BUG#12228: Post review fixes: Added test case, code cleanup.
2005-08-10 21:17:02 +00:00
sp_head.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-09-15 03:57:59 +04:00
sp_head.h
Post-review fix for BUG#12712: SET AUTOCOMMIT should fail within SP/functions/triggers
2005-09-14 10:54:02 +02: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
Fix for Bug#11247 Stored procedures: Function calls in long loops leak memory
2005-08-18 11:23:54 +02:00
sp_rcontext.h
Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs.
2005-08-25 17:34:34 +04:00
sp.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-09-15 03:57:59 +04:00
sp.h
Fix for bug #12704 "Server crashes during trigger execution".
2005-09-15 03:56:09 +04: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 sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
2005-09-14 12:26:09 +03:00
sql_acl.h
part 1 (ver 2, postreview fix) of WL#2787
2005-09-14 10:53:09 +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
Merge from 4.1
2005-05-26 21:01:55 +02:00
sql_array.h
Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs.
2005-08-25 17:34:34 +04:00
sql_base.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-09-15 03:57:59 +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 sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-09-06 20:51:15 +03: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
Fixed BUG#12379: PROCEDURE with HANDLER calling FUNCTION with error
2005-09-13 15:32:42 +02:00
sql_class.h
Fixed BUG#12379: PROCEDURE with HANDLER calling FUNCTION with error
2005-09-13 15:32:42 +02: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
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-09-12 20:18:49 +03:00
sql_delete.cc
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
2005-09-01 22:42:37 +03:00
sql_derived.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-08-15 18:35:48 +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
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
Fix for bug #12704 "Server crashes during trigger execution".
2005-09-15 03:56:09 +04:00
sql_lex.cc
Fix for bug #12704 "Server crashes during trigger execution".
2005-09-15 03:56:09 +04:00
sql_lex.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-09-15 03:57:59 +04:00
sql_list.cc
a compiler must see '#pragma implementation' *before*
2005-06-05 19:38:52 +02:00
sql_list.h
Add a comment about I_List<> copy constructor.
2005-08-22 19:23:01 +04:00
sql_load.cc
Implementation of WL#2486 -
2005-08-12 17:57:19 +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
Implementation of WL#2486 -
2005-08-12 17:57:19 +03:00
sql_parse.cc
Merge mysql.com:/home/emurphy/src/work/mysql-5.0-bug-12870
2005-09-14 14:44:48 -04:00
sql_prepare.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-09-15 03:57:59 +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
Bug#9683 INFORMATION_SCH: Creation of temporary table allowed in
2005-09-13 16:07:38 +05:00
sql_repl.h
…
sql_select.cc
Manual merge
2005-09-15 22:21:30 +04:00
sql_select.h
Remove an obsolete comment and an unused variable.
2005-09-08 18:51:36 +04:00
sql_show.cc
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-09-15 15:39:44 +03: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 bk-internal.mysql.com:/home/bk/mysql-5.0
2005-09-15 03:57:59 +04:00
sql_test.cc
Merge mysql.com:/home/mydev/mysql-4.1-4100
2005-09-14 13:37:16 +02:00
sql_trigger.cc
Fix for bug #12704 "Server crashes during trigger execution".
2005-09-15 03:56:09 +04: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
Name resolution context added (BUG#6443)
2005-07-01 07:05:42 +03:00
sql_union.cc
Rename:
2005-09-02 17:21:19 +04:00
sql_update.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-09-15 03:57:59 +04:00
sql_view.cc
Fix bug #11416 Server crash if using a view that uses function convert_tz
2005-09-15 00:08:12 +04:00
sql_view.h
Fix bug #11864 non unique names are allowed in subquery
2005-08-10 17:45:00 +04:00
sql_yacc.yy
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
2005-09-14 13:37:40 +03: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
Merge mysql.com:/home/mydev/mysql-4.1-4100
2005-09-14 13:37:16 +02:00
table.cc
indentation correction
2005-09-14 13:44:44 +02:00
table.h
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
2005-09-14 11:07:04 +03: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
Added option --valgrind-mysqltest to mysql-test-run
2005-09-14 01:41:44 +03: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 bk-internal.mysql.com:/home/bk/mysql-5.0
2005-09-14 03:18:05 +03:00
unireg.h
unireg.h:
2005-08-27 01:50:38 +02:00
watchdog_mysqld
…