database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-22 17:44:29 +03:00
Code Activity
Files
b7130450950898892f14f2a1fef462ecac49e92a
mariadb/sql
History
unknown b713045095 Manual merge 
include/my_base.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
mysql-test/r/index_merge.result:
  Auto merged
mysql-test/r/index_merge_innodb.result:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_heap.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/opt_range.cc:
  Hand merged
sql/opt_range.h:
  Hand merged
2004-05-29 20:55:46 +04:00
..
examples
All changes are to allow someone to compile the example storage engine and use it.
2004-04-12 21:01:45 -07:00
share
Post-merge post-merge fix (new error codes for fparser).
2004-05-14 16:10:31 +02:00
.cvsignore
…
add_errmsg
…
client_settings.h
…
custom_conf.h
…
derror.cc
Fixed many compiler warnings
2004-04-05 13:56:05 +03:00
des_key_file.cc
…
discover.cc
Added NDB storage engine
2004-04-15 09:14:14 +02:00
field_conv.cc
::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
2004-04-06 21:35:26 +02:00
field.cc
Merge with 4.0.19
2004-05-05 17:05:24 +03:00
field.h
Added function comment
2004-04-12 01:42:39 +03:00
filesort.cc
Merge 4.1 -> 5.0.
2004-04-07 19:07:44 +02:00
frm_crypt.cc
…
gen_lex_hash.cc
Formatting changes requested by Monty
2004-04-15 09:17:55 +02:00
gstream.cc
Fix for valgrind's warning
2004-03-15 16:32:53 +04:00
gstream.h
Fix for valgrind's warning
2004-03-15 16:32:53 +04:00
ha_berkeley.cc
Manual merge
2004-05-29 20:55:46 +04:00
ha_berkeley.h
Manual merge
2004-05-29 20:55:46 +04:00
ha_heap.cc
::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
2004-04-06 21:35:26 +02:00
ha_heap.h
Manual merge
2004-05-29 20:55:46 +04:00
ha_innodb.cc
Manual merge
2004-05-29 20:55:46 +04:00
ha_innodb.h
Manual merge
2004-05-29 20:55:46 +04:00
ha_isam.cc
::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
2004-04-06 21:35:26 +02:00
ha_isam.h
::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
2004-04-06 21:35:26 +02:00
ha_isammrg.cc
::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
2004-04-06 21:35:26 +02:00
ha_isammrg.h
caching of queries with isammerge tables forbiden using general way
2004-05-05 21:21:41 +03:00
ha_myisam.cc
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
ha_myisam.h
::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
2004-04-06 21:35:26 +02:00
ha_myisammrg.cc
::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
2004-04-06 21:35:26 +02:00
ha_myisammrg.h
::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
2004-04-06 21:35:26 +02:00
ha_ndbcluster.cc
symlink, not hardlink
2004-04-21 14:55:39 -05:00
ha_ndbcluster.h
avoid using ndb tables in query cache
2004-05-05 11:22:10 +03:00
handler.cc
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
handler.h
Manual merge
2004-05-29 20:55:46 +04:00
hash_filo.cc
…
hash_filo.h
…
hostname.cc
fix for --open-files-limit and broken query_cache_merge.test
2004-02-20 23:42:06 +01:00
init.cc
Portability fixes
2004-04-07 04:33:58 +03:00
item_buff.cc
…
item_cmpfunc.cc
after review PS fixes
2004-04-10 01:14:32 +03:00
item_cmpfunc.h
Fixed (portability) bug in handler.h, and tried to silence cast warnings on some platforms.
2004-05-06 19:55:12 +02:00
item_create.cc
Merge 4.1 -> 5.0.
2004-04-07 19:07:44 +02:00
item_create.h
Merge 4.1 -> 5.0.
2004-04-07 19:07:44 +02:00
item_func.cc
WL#1567: Add ROW_COUNT() Function to retrieve count of rows updated/inserted/deleted
2004-05-04 13:45:20 +02:00
item_func.h
WL#1567: Add ROW_COUNT() Function to retrieve count of rows updated/inserted/deleted
2004-05-04 13:45:20 +02:00
item_geofunc.cc
Windows fixes for VC++ compiler compability
2004-05-05 02:59:17 -03:00
item_geofunc.h
Optimized GIS functions
2004-03-04 08:50:37 +02:00
item_row.cc
DBUG_ASSERT(fixed == 0) added to fix_fields()
2004-03-17 14:26:26 +02:00
item_row.h
…
item_strfunc.cc
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
2004-05-05 21:24:45 +03:00
item_strfunc.h
DBUG_ASSERT(fixed == 1); added to val*
2004-03-18 15:14:36 +02:00
item_subselect.cc
PS and SP made compatible in mechanism used for preparing query for rexecutions (Bug #2266)
2004-05-20 02:02:49 +03:00
item_subselect.h
PS and SP made compatible in mechanism used for preparing query for rexecutions (Bug #2266)
2004-05-20 02:02:49 +03:00
item_sum.cc
PS and SP made compatible in mechanism used for preparing query for rexecutions (Bug #2266)
2004-05-20 02:02:49 +03:00
item_sum.h
PS and SP made compatible in mechanism used for preparing query for rexecutions (Bug #2266)
2004-05-20 02:02:49 +03:00
item_timefunc.cc
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
item_timefunc.h
Merge 4.1 -> 5.0.
2004-04-07 19:07:44 +02:00
item_uniq.cc
…
item_uniq.h
DBUG_ASSERT(fixed == 1); added to val*
2004-03-18 15:14:36 +02:00
item.cc
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
item.h
Added frame offset to debug pring of local SP variables.
2004-05-25 19:46:21 +02:00
key.cc
::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
2004-04-06 21:35:26 +02:00
lex_symbol.h
Portability fixes
2004-03-05 19:49:50 +02:00
lex.h
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
lock.cc
Merge 4.1 -> 5.0.
2004-04-07 19:07:44 +02:00
log_event.cc
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
log_event.h
Merge 4.1 -> 5.0.
2004-04-07 19:07:44 +02:00
log.cc
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
Makefile.am
Post-merge post-merge fix (new error codes for fparser).
2004-05-14 16:10:31 +02:00
matherr.c
…
mf_iocache.cc
merge with 4.0
2004-03-16 22:41:30 +02:00
my_lock.c
…
mysql_priv.h
PS and SP made compatible in mechanism used for preparing query for rexecutions (Bug #2266)
2004-05-20 02:02:49 +03:00
mysqld.cc
Better names for two system variables:
2004-05-20 17:47:43 +03:00
net_serv.cc
c++ comment fixed
2004-02-21 14:25:43 +01:00
nt_servc.cc
Merge with 4.0
2004-03-25 23:29:45 +02:00
nt_servc.h
…
opt_range.cc
Manual merge
2004-05-29 20:55:46 +04:00
opt_range.h
Manual merge
2004-05-29 20:55:46 +04:00
opt_sum.cc
…
parse_file.cc
my_b_write() needs to be replaced with my_b_append() for a SEQ_READ_APPEND
2004-05-25 18:57:30 +03:00
parse_file.h
file parser for new .frm
2004-05-11 23:23:49 +03:00
password.c
…
procedure.cc
…
procedure.h
…
protocol_cursor.cc
…
protocol.cc
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
protocol.h
Merge 4.1 -> 5.0.
2004-04-07 19:07:44 +02:00
records.cc
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
repl_failsafe.cc
after review changes
2004-04-07 13:25:24 +03:00
repl_failsafe.h
…
set_var.cc
Better names for two system variables:
2004-05-20 17:47:43 +03:00
set_var.h
new error for unsupported command in PS
2004-04-08 00:16:17 +03:00
slave.cc
a code fix (don't specify default value of argument twice), updating a line of SHOW SLAVE STATUS
2004-05-14 23:19:42 +02:00
slave.h
Post-merge fixes.
2004-05-14 16:00:57 +02:00
sp_cache.cc
WL#1366: Use the schema (db) associated with an SP.
2004-03-22 14:44:41 +01:00
sp_cache.h
WL#1366: Use the schema (db) associated with an SP.
2004-03-22 14:44:41 +01:00
sp_head.cc
cleunup items of instruction after every instruction execution
2004-05-26 14:28:35 +03:00
sp_head.h
cleunup items of instruction after every instruction execution
2004-05-26 14:28:35 +03:00
sp_pcontext.cc
Fixed BUG#2776: Stored procedure crash if variable assigned to default.
2004-04-06 15:48:58 +02:00
sp_pcontext.h
Fixed BUG#2776: Stored procedure crash if variable assigned to default.
2004-04-06 15:48:58 +02:00
sp_rcontext.cc
…
sp_rcontext.h
…
sp.cc
Post-merge fixes, some quite complex. client/mysqlbinlog.cc and sql/log_event.cc
2004-04-28 12:08:54 +02:00
sp.h
WL#1366: Use the schema (db) associated with an SP.
2004-03-22 14:44:41 +01:00
spatial.cc
Fixed memory overrun in spatial init code
2004-03-16 00:42:10 +02:00
spatial.h
Fixed (portability) bug in handler.h, and tried to silence cast warnings on some platforms.
2004-05-06 19:55:12 +02:00
sql_acl.cc
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
sql_acl.h
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
sql_analyse.cc
my_atof is deleted
2004-02-13 15:27:21 +01:00
sql_analyse.h
…
sql_base.cc
PS and SP made compatible in mechanism used for preparing query for rexecutions (Bug #2266)
2004-05-20 02:02:49 +03:00
sql_bitmap.h
…
sql_cache.cc
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
sql_cache.h
merge with 4.0
2004-03-16 22:41:30 +02:00
sql_class.cc
PS and SP made compatible in mechanism used for preparing query for rexecutions (Bug #2266)
2004-05-20 02:02:49 +03:00
sql_class.h
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
2004-05-25 22:40:37 +03:00
sql_client.cc
…
sql_crypt.cc
…
sql_crypt.h
…
sql_db.cc
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
sql_delete.cc
Manual merge
2004-05-29 20:55:46 +04:00
sql_derived.cc
PS and SP made compatible in mechanism used for preparing query for rexecutions (Bug #2266)
2004-05-20 02:02:49 +03:00
sql_do.cc
…
sql_error.cc
Fixed BUG#2780: Stored procedure exit handler ignored for warnings.
2004-04-06 16:29:38 +02:00
sql_handler.cc
merge fixes (use old code)
2004-03-18 00:16:04 +02:00
sql_help.cc
after review changes
2004-04-07 13:25:24 +03:00
sql_insert.cc
PS and SP made compatible in mechanism used for preparing query for rexecutions (Bug #2266)
2004-05-20 02:02:49 +03:00
sql_lex.cc
PS and SP made compatible in mechanism used for preparing query for rexecutions (Bug #2266)
2004-05-20 02:02:49 +03:00
sql_lex.h
PS and SP made compatible in mechanism used for preparing query for rexecutions (Bug #2266)
2004-05-20 02:02:49 +03:00
sql_list.cc
…
sql_list.h
Merge 4.1 -> 5.0.
2004-04-07 19:07:44 +02:00
sql_load.cc
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
sql_manager.cc
…
sql_manager.h
…
sql_map.cc
…
sql_map.h
…
sql_olap.cc
false/true -> FALSE/TRUE
2004-03-30 02:32:41 +03:00
sql_parse.cc
Added test cases for the following bugs that have been fixed by recent changes:
2004-05-28 18:33:14 +02:00
sql_prepare.cc
PS and SP made compatible in mechanism used for preparing query for rexecutions (Bug #2266)
2004-05-20 02:02:49 +03:00
sql_rename.cc
Merge 4.1 -> 5.0.
2004-04-07 19:07:44 +02:00
sql_repl.cc
Merge 4.1 -> 5.0.
2004-04-07 19:07:44 +02:00
sql_repl.h
Merge 4.1 -> 5.0.
2004-04-07 19:07:44 +02:00
sql_select.cc
Manual merge
2004-05-29 20:55:46 +04:00
sql_select.h
Manual merge
2004-05-29 20:55:46 +04:00
sql_show.cc
Post-merge post-merge fix (new error codes for fparser).
2004-05-14 16:10:31 +02:00
sql_sort.h
…
sql_state.c
…
sql_string.cc
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
sql_string.h
Merge 4.1 -> 5.0.
2004-04-07 19:07:44 +02:00
sql_table.cc
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
sql_test.cc
Manual merge
2004-05-29 20:55:46 +04:00
sql_udf.cc
Fix for bug#1439 UDF Corruption
2004-03-19 14:35:00 +04:00
sql_udf.h
…
sql_union.cc
Fixed BUG#2460: Crash wih Stored Procedure and UNION.
2004-05-28 19:43:06 +02:00
sql_update.cc
Manual merge
2004-05-29 20:55:46 +04:00
sql_yacc.yy
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
stacktrace.c
…
stacktrace.h
…
strfunc.cc
…
structs.h
Post-merge post-merge fix (new error codes for fparser).
2004-05-14 16:10:31 +02:00
table.cc
Merge with 4.0.19
2004-05-05 17:05:24 +03:00
table.h
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
thr_malloc.cc
…
time.cc
Fix for valgrind errors in str_to_TIME(using of uninitialize variable).
2004-03-18 15:51:08 +04:00
udf_example.cc
…
uniques.cc
…
unireg.cc
Allow one to send empty strings with mysql_stmt_send_long_data()
2004-04-28 20:19:50 +03:00
unireg.h
MAX_KEY limit doubled (32->64)
2004-04-26 21:07:14 +02:00
watchdog_mysqld
…