database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-10 04:22:00 +03:00
Code Activity
Files
2fe8cc51aad5fb7958a90ea8be3667f1e23b0ea5
mariadb/sql
History
unknown 2fe8cc51aa Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1


scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2005-05-17 23:25:13 +02:00
..
examples
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02:00
share
Fix wrong format specifier in error messages.
2005-05-14 02:28:10 +04:00
.cvsignore
…
add_errmsg
…
bitvector.cc
WL 1682: Bitvector for updated/read fields in handler interface
2005-05-07 10:00:25 +02:00
bitvector.h
WL 1682: Bitvector for updated/read fields in handler interface
2005-05-07 10:00:25 +02:00
client_settings.h
…
custom_conf.h
…
derror.cc
Remove compiler warnings and remove not used variables
2005-02-25 16:53:22 +02:00
des_key_file.cc
…
discover.cc
…
field_conv.cc
Bit type support for non-MyISAM tables.
2005-04-12 12:27:43 +05:00
field.cc
merge
2005-05-17 10:17:53 +02:00
field.h
merge
2005-05-17 10:17:53 +02:00
filesort.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
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
Fixes while reviewing new code
2005-05-06 11:39:30 +03:00
ha_berkeley.h
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02:00
ha_blackhole.cc
Manual merge (again)
2005-05-14 12:38:12 +04:00
ha_blackhole.h
BUG#10241 cygwin port: invalid pragma interface directives
2005-05-04 15:05:56 +02:00
ha_federated.cc
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
2005-05-07 11:23:09 +02:00
ha_federated.h
Chmod -x for ha_federated.h
2005-03-05 00:35:00 +03:00
ha_heap.cc
Merge
2005-05-07 08:25:58 -07:00
ha_heap.h
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02:00
ha_innodb.cc
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-05-17 23:25:13 +02:00
ha_innodb.h
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-05-17 23:25:13 +02:00
ha_myisam.cc
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-05-02 13:18:26 +02:00
ha_myisam.h
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02:00
ha_myisammrg.cc
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-05-02 13:18:26 +02:00
ha_myisammrg.h
BUG#10241 cygwin port: invalid pragma interface directives
2005-05-04 15:05:56 +02:00
ha_ndbcluster.cc
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
2005-05-12 12:01:01 +02:00
ha_ndbcluster.h
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
2005-05-12 12:01:01 +02:00
handler.cc
merge
2005-05-17 10:17:53 +02:00
handler.h
merge
2005-05-17 10:17:53 +02:00
hash_filo.cc
…
hash_filo.h
…
hostname.cc
Fixes during review
2005-05-13 14:04:32 +03:00
init.cc
…
item_buff.cc
Fixed failing test cases 'row.test' when running with --ps-protocol
2005-02-15 16:45:00 +02:00
item_cmpfunc.cc
merge
2005-05-06 13:51:58 +03:00
item_cmpfunc.h
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02:00
item_create.cc
Merge mdk10.(none):/home/reggie/bk/mysql-4.1
2005-04-11 09:29:49 -05:00
item_create.h
Precision Math implementation
2005-02-09 02:50:45 +04:00
item_func.cc
Bug#10246 - Parser: bad syntax for GRANT EXECUTE
2005-05-17 19:54:20 +01:00
item_func.h
Manual merge of fix for bug #9913 into 5.0 tree.
2005-05-09 16:21:57 +04:00
item_geofunc.cc
Fix for #6553 and #8776 (no errors on bad spatial data)
2005-04-29 20:23:02 +05:00
item_geofunc.h
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02:00
item_row.cc
Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902)
2005-04-01 15:04:50 +03:00
item_row.h
Precision Math implementation
2005-02-09 02:50:45 +04:00
item_strfunc.cc
Merge
2005-05-09 11:28:57 -07:00
item_strfunc.h
Merge neptunus.(none):/home/msvensson/mysql/bug9535
2005-05-17 20:32:00 +02:00
item_subselect.cc
postmerge 4.1->5.0 fixes
2005-04-01 02:14:30 +03:00
item_subselect.h
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02:00
item_sum.cc
Manual merge of fix for bug #9913 into 5.0 tree.
2005-05-09 16:21:57 +04:00
item_sum.h
Manual merge of fix for bug #9913 into 5.0 tree.
2005-05-09 16:21:57 +04:00
item_timefunc.cc
Merge mysql.com:/home/dlenev/src/mysql-4.1-bg10040
2005-04-25 11:35:30 +04:00
item_timefunc.h
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02: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
item.cc
merge
2005-05-17 10:17:53 +02:00
item.h
Merge with 4.1 to get fix for memory leak
2005-05-16 20:21:38 +03:00
key.cc
Fixes while reviewing new code
2005-05-06 11:39:30 +03:00
lex_symbol.h
…
lex.h
BUG#3190 fix (request for STDDEV_SAMP, VAR_SAMP).
2005-02-25 22:19:04 +04:00
lock.cc
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
2005-05-07 11:23:09 +02:00
log_event.cc
Manual merge 5.0->5.1
2005-05-06 15:04:07 +02:00
log_event.h
Approximative fixes for BUG#2610,2611,9100 i.e. WL#2146 binlogging/replication of routines (stored procs and functions).
2005-05-05 14:20:53 +02:00
log.cc
Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1
2005-05-09 11:45:59 +02:00
Makefile.am
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
2005-05-07 11:23:09 +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
A lot of fixes to Precision math
2005-05-05 20:06:49 +05:00
my_lock.c
…
mysql_priv.h
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-05-17 23:25:13 +02:00
mysqld_suffix.h
…
mysqld.cc
merge
2005-05-17 10:17:53 +02:00
net_serv.cc
Merge bk-internal.mysql.com:/users/rburnett/bug9721
2005-05-06 15:15:48 +02: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
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
2005-05-12 12:01:01 +02:00
opt_range.h
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02:00
opt_sum.cc
Fixes while reviewing new code
2005-05-06 11:39:30 +03:00
parse_file.cc
…
parse_file.h
…
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
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02:00
protocol_cursor.cc
Fixed BUILD script to use --with-berkeley-db instead of --with-bdb
2005-02-19 18:58:27 +02:00
protocol.cc
Merge mysql.com:/home/psergey/mysql-4.1-bug9228
2005-05-01 19:07:01 +04:00
protocol.h
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02: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
WL#2472:
2005-03-21 22:09:42 +01:00
repl_failsafe.h
…
rpl_filter.cc
WL#2472:
2005-03-21 22:09:42 +01:00
rpl_filter.h
WL#2472: Fixes according to review
2005-03-22 10:19:24 +01:00
set_var.cc
Merge mysql.com:/home/jimw/my/mysql-5.0-7800
2005-05-16 14:33:46 -07:00
set_var.h
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02:00
slave.cc
Manual merge 5.0->5.1
2005-05-06 15:04:07 +02:00
slave.h
5.0 to 5.1 merge
2005-04-01 12:32:17 -08:00
sp_cache.cc
…
sp_cache.h
…
sp_head.cc
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-05-17 19:57:27 +01:00
sp_head.h
Merge in fix Bug#3788
2005-03-08 22:32:09 +00:00
sp_pcontext.cc
Fixed BUG#9073: Able to declare two handlers for same condition in same scope
2005-04-08 19:58:04 +02:00
sp_pcontext.h
Fixed BUG#9856: Stored procedures: crash if handler for sqlexception, not found.
2005-04-13 16:57:49 +02:00
sp_rcontext.cc
Item::fix_field need correct pointer on item reference to chnge it if itis need, so support of correct item address added to SP commands (BUG#5963)
2005-05-09 01:59:10 +03:00
sp_rcontext.h
Item::fix_field need correct pointer on item reference to chnge it if itis need, so support of correct item address added to SP commands (BUG#5963)
2005-05-09 01:59:10 +03:00
sp.cc
Approximative fixes for BUG#2610,2611,9100 i.e. WL#2146 binlogging/replication of routines (stored procs and functions).
2005-05-05 14:20:53 +02:00
sp.h
Better approach for prelocking of tables for stored routines execution
2005-03-04 16:35:28 +03:00
spatial.cc
Fix for #6553 and #8776 (no errors on bad spatial data)
2005-04-29 20:23:02 +05:00
spatial.h
Fix for #6553 and #8776 (no errors on bad spatial data)
2005-04-29 20:23:02 +05:00
sql_acl.cc
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-05-17 23:25:13 +02:00
sql_acl.h
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-05-17 23:25:13 +02:00
sql_analyse.cc
Remove compiler warnings and remove not used variables
2005-02-25 16:53:22 +02:00
sql_analyse.h
Precision Math implementation
2005-02-09 02:50:45 +04:00
sql_base.cc
Bug#10246 - Parser: bad syntax for GRANT EXECUTE
2005-05-17 19:54:20 +01:00
sql_bitmap.h
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
2005-05-12 12:01:01 +02:00
sql_cache.cc
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-05-03 00:10:52 +02:00
sql_cache.h
merge
2005-02-07 21:39:37 +02:00
sql_class.cc
Item::fix_field need correct pointer on item reference to chnge it if itis need, so support of correct item address added to SP commands (BUG#5963)
2005-05-09 01:59:10 +03:00
sql_class.h
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
2005-05-12 12:01:01 +02:00
sql_client.cc
…
sql_crypt.cc
…
sql_crypt.h
…
sql_db.cc
BUG#9455 mysqladmin status crash the server
2005-04-14 11:56:13 +02:00
sql_delete.cc
merge
2005-05-17 10:17:53 +02:00
sql_derived.cc
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
2005-04-01 13:02:29 +03:00
sql_do.cc
Merge with 4.1
2004-12-22 13:54:39 +02:00
sql_error.cc
Fixed BUG#9004: Inconsistent behaviour of SP re. warnings
2005-04-22 12:53:48 +02:00
sql_error.h
Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902)
2005-04-01 15:04:50 +03:00
sql_handler.cc
Better approach for prelocking of tables for stored routines execution
2005-03-04 16:35:28 +03:00
sql_help.cc
Eliminate warnings noticed by VC7. This includes fixing my_mmap() on
2005-03-18 16:12:25 -08:00
sql_insert.cc
merge
2005-05-17 10:17:53 +02:00
sql_lex.cc
sql_lex.cc:
2005-05-16 14:27:03 +02:00
sql_lex.h
merge
2005-05-17 10:17:53 +02:00
sql_list.cc
…
sql_list.h
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02:00
sql_load.cc
WL 1682: After review fixes + update bitvector class + bitvector test
2005-05-02 15:45:33 +02:00
sql_manager.cc
…
sql_manager.h
…
sql_map.cc
A fix (mysql_priv.h should be included first)
2005-02-24 12:17:59 +04:00
sql_map.h
…
sql_olap.cc
post-merge fix
2004-11-25 02:23:13 +02:00
sql_parse.cc
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-05-17 23:25:13 +02:00
sql_prepare.cc
Fixed failing tests for not 32 bit intel machines
2005-05-16 13:34:23 +03:00
sql_rename.cc
Cleanup during reviews
2005-03-16 16:11:01 +02:00
sql_repl.cc
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-05-02 13:18:26 +02:00
sql_repl.h
WL#2472: Fixes according to review
2005-03-22 10:19:24 +01:00
sql_select.cc
merge
2005-05-17 10:17:53 +02:00
sql_select.h
A fix and test case for Bug#9478 "mysql_stmt_attr_set mysql_stmt_execute"
2005-05-12 11:16:12 +04:00
sql_show.cc
Bug#10246 - Parser: bad syntax for GRANT EXECUTE
2005-05-17 19:54:20 +01:00
sql_sort.h
…
sql_state.c
…
sql_string.cc
Cleanup during reviews
2005-03-16 16:11:01 +02:00
sql_string.h
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02:00
sql_table.cc
merge
2005-05-17 10:17:53 +02:00
sql_test.cc
Fixes while reviewing new code
2005-05-06 11:39:30 +03:00
sql_trigger.cc
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-05-07 17:26:01 +02:00
sql_trigger.h
comment change (post-review of "replication of triggers"). Btw date_formats segfaults with --ps-protocol - not caused by my changes though; I'll file a bug report.
2005-05-10 15:55:22 +02:00
sql_udf.cc
WL 1682: After review fixes + update bitvector class + bitvector test
2005-05-02 15:45:33 +02:00
sql_udf.h
Manual merge of fix for bug #9913 into 5.0 tree.
2005-05-09 16:21:57 +04:00
sql_union.cc
merge 4.1->5.0
2005-03-31 10:39:48 +03:00
sql_update.cc
merge
2005-05-17 10:17:53 +02:00
sql_view.cc
Manual merge
2005-05-10 16:41:47 -07:00
sql_view.h
post-merge fix
2004-11-25 02:23:13 +02:00
sql_yacc.yy
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-05-17 23:25:13 +02: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
Remove compiler warnings and remove not used variables
2005-02-25 16:53:22 +02:00
structs.h
Add support for slave_compressed_protocol, slave_load_tmpdir, and
2005-05-07 06:55:47 -07:00
table.cc
merge
2005-05-17 10:17:53 +02:00
table.h
Manual merge
2005-05-10 16:41:47 -07:00
thr_malloc.cc
…
time.cc
Don't use -lsupc++ with gcc 3.3 and below as this gives linking problems when linking staticly
2005-04-04 16:43:25 +03:00
tzfile.h
…
tztime.cc
Last part of WL#1062: better replication of timezones: no more use
2005-03-22 00:26:12 +01:00
tztime.h
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02:00
udf_example.cc
Merge with 4.1
2004-12-22 13:54:39 +02:00
uniques.cc
…
unireg.cc
merge
2005-05-17 10:17:53 +02:00
unireg.h
Merge with 4.1 to get bug fix
2005-02-07 19:42:03 +02:00
watchdog_mysqld
…