database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-28 13:01:41 +03:00
Code
mariadb/sql
History
unknown c0918af2c7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/opt/local/work/mysql-5.0-10736


sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2005-06-17 23:27:23 +04:00
..
examples
Merge with 4.1
2005-06-07 00:31:53 +03:00
share
Fix for bug #10015 "Crash in InnoDB if stored routines are used".
2005-06-07 14:53:08 +04:00
.cvsignore
…
add_errmsg
…
client_settings.h
…
custom_conf.h
…
derror.cc
…
des_key_file.cc
default_modify.c:
2005-05-21 23:23:39 +02:00
discover.cc
…
field_conv.cc
my_vsnprintf.c, sql_select.cc, sql_delete.cc, field_conv.cc, rt_split.c:
2005-05-20 15:17:13 +02:00
field.cc
Manual merge
2005-06-15 08:39:00 -07:00
field.h
cast.result, cast.test:
2005-06-15 08:27:33 -07: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
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
sql/mysql_priv.h
2005-06-09 15:48:57 +02:00
ha_berkeley.h
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02:00
ha_blackhole.cc
Merge with 4.1
2005-06-07 00:31:53 +03:00
ha_blackhole.h
BUG#10241 cygwin port: invalid pragma interface directives
2005-05-04 15:05:56 +02:00
ha_federated.cc
sp_rcontext.cc, sp_pcontext.cc, sp_head.cc, sp_cache.cc, ha_federated.cc:
2005-06-05 16:20:22 +02:00
ha_federated.h
Fix broken linking when building with ha_federated
2005-06-05 23:00:45 +04:00
ha_heap.cc
Merge with 4.1
2005-06-07 00:31:53 +03:00
ha_heap.h
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-09 19:27:45 -07:00
ha_innodb.cc
ha_innodb.cc:
2005-06-13 16:42:00 +03:00
ha_innodb.h
ha_innodb.h, ha_innodb.cc:
2005-05-17 21:43:15 +03:00
ha_myisam.cc
fixes for windows 64-bit compiler warnings
2005-06-13 12:41:15 +02:00
ha_myisam.h
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02:00
ha_myisammrg.cc
fixes for windows 64-bit compiler warnings
2005-06-13 12:41:15 +02:00
ha_myisammrg.h
Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
2005-05-18 19:40:39 +02:00
ha_ndbcluster.cc
Relaxed type checking to allow int to real coercion
2005-06-10 10:34:05 +02:00
ha_ndbcluster.h
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-05-18 14:34:42 +02:00
handler.cc
Fix for bug #10015 "Crash in InnoDB if stored routines are used".
2005-06-07 14:53:08 +04:00
handler.h
Resolve merge from 4.1
2005-05-18 13:54:36 -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
Fixes during review
2005-05-13 14:04:32 +03:00
init.cc
…
item_buff.cc
renamed:
2005-06-15 19:58:35 +02:00
item_cmpfunc.cc
Rename all prepared statements COM_ commands to prefix with COM_STMT_
2005-06-17 23:26:25 +04:00
item_cmpfunc.h
item_func.h:
2005-06-02 07:27:02 -07:00
item_create.cc
Merge mdk10.(none):/home/reggie/bk/mysql-4.1
2005-04-11 09:29:49 -05:00
item_create.h
…
item_func.cc
Merge bk-internal:/home/bk/mysql-5.0
2005-06-15 20:24:13 +02:00
item_func.h
Post review and additional fix for BUG#10968: Stored procedures: crash if long loop.
2005-06-10 16:14:01 +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
Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902)
2005-04-01 15:04:50 +03:00
item_row.h
…
item_strfunc.cc
Fix for bug #8429 (FORMAT returns incorrect result)
2005-06-08 15:49:36 +05:00
item_strfunc.h
Bug#8610: The ucs2_turkish_ci collation fails with upper('i')
2005-06-06 16:54:15 +05:00
item_subselect.cc
renamed:
2005-06-15 19:58:35 +02:00
item_subselect.h
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02:00
item_sum.cc
After merge fixes
2005-06-07 05:43:59 +03: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 with 4.1
2005-06-07 00:31:53 +03:00
item_timefunc.h
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02:00
item_uniq.cc
Merge with 4.1
2005-06-07 00:31:53 +03:00
item_uniq.h
Merge from 4.1
2005-05-26 21:01:55 +02:00
item.cc
Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-06-15 15:58:56 +02:00
item.h
Merge bk-internal:/home/bk/mysql-5.0
2005-06-15 20:24:13 +02:00
key.cc
Fixes while reviewing new code
2005-05-06 11:39:30 +03:00
lex_symbol.h
…
lex.h
…
lock.cc
merged
2005-06-03 18:29:36 +02:00
log_event.cc
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-06-08 22:29:10 -07:00
log_event.h
Merge from 4.1
2005-05-26 21:01:55 +02:00
log.cc
Moved tc_log_page_waits outside HAVE_MMAP,
2005-06-07 11:45:28 +03:00
Makefile.am
Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902)
2005-04-01 15:04:50 +03: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
Rename all prepared statements COM_ commands to prefix with COM_STMT_
2005-06-17 23:26:25 +04:00
mysqld_suffix.h
…
mysqld.cc
Post-merge fixes.
2005-06-17 01:58:36 +04: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
…
opt_range.cc
Fix for BUG#11044 - "SELECT DISTINCT on indexed column returns inconsistent results"
2005-06-14 12:52:44 +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
Code cleanups during code reviews
2005-06-01 16:35:09 +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_cursor.cc
Merge with 4.1
2005-06-07 00:31:53 +03:00
protocol.cc
Merge with 4.1
2005-06-07 00:31:53 +03:00
protocol.h
Fixed BUG#10961: Stored procedures: crash if select * from dual
2005-06-01 12:18:41 +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
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
Merge
2005-06-09 17:15:06 +01:00
set_var.h
fixes for windows 64-bit compiler warnings
2005-06-13 12:41:15 +02:00
slave.cc
Merge of 4.1->5.0. This contained the fixes for GCC 4.0
2005-06-01 21:56:30 -07:00
slave.h
merge from 4.1
2005-03-24 14:32:40 +01: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
renamed:
2005-06-15 19:58:35 +02:00
sp_head.h
Merge bk-internal:/home/bk/mysql-5.0
2005-06-15 20:24:13 +02: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
prohibit opening Query cache for SP cursors (BUG#9715)
2005-06-14 22:45:48 +03:00
sp_rcontext.h
prohibit opening Query cache for SP cursors (BUG#9715)
2005-06-14 22:45:48 +03:00
sp.cc
Fixed BUG#9529: Stored Procedures: No Warning on truncation of procedure name
2005-05-31 18:36:32 +02:00
sp.h
Fixed BUG#9529: Stored Procedures: No Warning on truncation of procedure name
2005-05-31 18:36:32 +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 baker@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-06-09 13:11:54 -07:00
sql_acl.h
Bug#10246 - Parser: bad syntax for GRANT EXECUTE
2005-05-17 19:54:20 +01: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
renamed:
2005-06-15 19:58:35 +02:00
sql_bitmap.h
merge
2005-06-05 17:19:50 +03:00
sql_cache.cc
Clean up merge from 4.1
2005-05-02 10:19:37 -07:00
sql_cache.h
…
sql_class.cc
renamed:
2005-06-15 19:58:35 +02:00
sql_class.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-06-17 23:27:23 +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 bk-internal.mysql.com:/home/bk/mysql-5.0
2005-05-31 12:29:24 +03:00
sql_derived.cc
Patch two (the final one) for Bug#7306 "the server side preparedStatement
2005-06-07 14:11:36 +04:00
sql_do.cc
…
sql_error.cc
Patch two (the final one) for Bug#7306 "the server side preparedStatement
2005-06-07 14:11:36 +04: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
Merge
2005-06-09 17:15:06 +01:00
sql_help.cc
Preparatory (and the most problematic) patch for Bug#7306
2005-05-30 20:54:37 +04:00
sql_insert.cc
Merge with 4.1
2005-06-07 00:31:53 +03:00
sql_lex.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-06-17 23:27:23 +04:00
sql_lex.h
Fix for bug#11055: information_schema: routines.sql_data_access has wrong value
2005-06-16 12:12:47 +05: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
Preparatory (and the most problematic) patch for Bug#7306
2005-05-30 20:54:37 +04:00
sql_manager.cc
…
sql_manager.h
…
sql_map.cc
Merge with 4.1
2005-06-07 00:31:53 +03: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
Merge with 4.1
2005-06-07 00:31:53 +03:00
sql_parse.cc
Rename all prepared statements COM_ commands to prefix with COM_STMT_
2005-06-17 23:26:25 +04:00
sql_prepare.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-06-17 23:27:23 +04:00
sql_rename.cc
Cleanup during reviews
2005-03-16 16:11:01 +02:00
sql_repl.cc
Manual merge.
2005-06-07 14:50:45 +04:00
sql_repl.h
WL#874 "Extended LOAD DATA".
2005-03-16 04:32:47 +03:00
sql_select.cc
Merge bk-internal:/home/bk/mysql-5.0
2005-06-17 14:54:59 +02:00
sql_select.h
renamed:
2005-06-15 19:58:35 +02:00
sql_show.cc
Fix for bug#9434 SHOW CREATE DATABASE information_schema;
2005-06-16 13:27:22 +05: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 mysql.com:/home/jimw/my/mysql-5.0-10543
2005-06-09 19:29:55 -07:00
sql_test.cc
Fixes while reviewing new code
2005-05-06 11:39:30 +03:00
sql_trigger.cc
Fix for bugs:
2005-05-24 22:19:33 +04:00
sql_trigger.h
Fix for bug #10015 "Crash in InnoDB if stored routines are used".
2005-06-07 14:53:08 +04:00
sql_udf.cc
Merge with 4.1
2005-06-07 00:31:53 +03: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
renamed:
2005-06-15 19:58:35 +02:00
sql_update.cc
Code cleanups during code reviews
2005-06-01 16:35:09 +03:00
sql_view.cc
renamed:
2005-06-15 19:58:35 +02:00
sql_view.h
…
sql_yacc.yy
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-06-17 23:27:23 +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
renamed:
2005-06-15 19:58:35 +02:00
table.h
Code cleanups during code reviews
2005-06-01 16:35:09 +03: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
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
Some Windows compile improvements:
2005-06-06 15:23:04 +02:00
unireg.h
…
watchdog_mysqld
…