mariadb/sql
unknown f8866c162b Merging 4.1 to 5.0.
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/null.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/rpl_server_id2.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/rpl000015.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
mysql-test/t/rpl_log_pos.test:
  Auto merged
mysql-test/t/rpl_max_relay_size.test:
  Auto merged
mysql-test/t/rpl_relayrotate.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl_server_id2.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/my_pthread.c:
  Auto merged
netware/BUILD/compile-netware-all:
  Auto merged
netware/BUILD/compile-netware-standard:
  Auto merged
netware/BUILD/mwenv:
  Auto merged
netware/Makefile.am:
  Auto merged
netware/my_manage.c:
  Auto merged
netware/my_manage.h:
  Auto merged
netware/mysql_test_run.c:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/client_test.c:
  Auto merged
2004-05-26 17:04:45 +02:00
..
examples Updating range_in_rows for the include file for ha_example (the main .cc file has already been updated). 2004-05-18 09:54:36 -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 After merge fixes 2004-05-24 14:42:34 +03:00
field.cc Support for character set conversion in binary protocol: another go 2004-05-25 02:03:49 +04:00
field.h Added function comment 2004-04-12 01:42:39 +03: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
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 Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
ha_berkeley.h Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
ha_heap.cc typo fixed 2004-05-17 11:10:22 +02:00
ha_heap.h key_cmp -> key_cmp_if_same 2004-05-16 14:48:32 +03:00
ha_innodb.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
ha_innodb.h Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
ha_isam.cc key_cmp -> key_cmp_if_same 2004-05-16 14:48:32 +03:00
ha_isam.h key_cmp -> key_cmp_if_same 2004-05-16 14:48:32 +03: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 Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
ha_myisam.h key_cmp -> key_cmp_if_same 2004-05-16 14:48:32 +03:00
ha_myisammrg.cc key_cmp -> key_cmp_if_same 2004-05-16 14:48:32 +03:00
ha_myisammrg.h key_cmp -> key_cmp_if_same 2004-05-16 14:48:32 +03:00
ha_ndbcluster.cc key_cmp -> key_cmp_if_same 2004-05-16 14:48:32 +03:00
ha_ndbcluster.h key_cmp -> key_cmp_if_same 2004-05-16 14:48:32 +03:00
handler.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
handler.h Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02: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.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
item.h Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
item_buff.cc
item_cmpfunc.cc logging_ok: 2004-05-10 23:19:50 +02: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 Merging 4.1 to 5.0. 2004-05-26 17:04:45 +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 Pack of changes about 'cleanup()'-s 2004-01-20 20:55:47 +04:00
item_strfunc.cc Merge with 4.0, mainly to get changes to windows project files 2004-05-20 00:54:52 +03:00
item_strfunc.h DBUG_ASSERT(fixed == 1); added to val* 2004-03-18 15:14:36 +02:00
item_subselect.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
item_subselect.h Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
item_sum.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
item_sum.h Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
item_timefunc.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +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
key.cc key_cmp -> key_cmp_if_same 2004-05-16 14:48:32 +03:00
lex.h Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
lex_symbol.h Portability fixes 2004-03-05 19:49:50 +02:00
lock.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
log.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
log_event.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
log_event.h Merge 4.1 -> 5.0. 2004-04-07 19:07:44 +02:00
Makefile.am Merging 4.1 to 5.0. 2004-05-26 17:04:45 +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 Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
mysqld.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
mysqld_suffix.h New MYSQL_SERVER_SUFFIX usage (for easier compilation) 2004-05-25 02:28:44 +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 Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
opt_range.h Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
opt_sum.cc key_cmp -> key_cmp_if_same 2004-05-16 14:48:32 +03:00
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.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
protocol.h Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
protocol_cursor.cc
records.cc Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
repl_failsafe.cc Portability fixes 2004-05-12 02:38:57 +03:00
repl_failsafe.h
set_var.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
set_var.h new error for unsupported command in PS 2004-04-08 00:16:17 +03:00
slave.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
slave.h Post-merge fixes. 2004-05-14 16:00:57 +02:00
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
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 Fix BUG#2269: Lost connect if stored procedure called before USE 2004-01-09 09:36:37 +01:00
sp_rcontext.h Fix BUG#2269: Lost connect if stored procedure called before USE 2004-01-09 09:36:37 +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 Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
sql_acl.h Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
sql_analyse.cc Portability fixes 2004-05-12 02:38:57 +03:00
sql_analyse.h
sql_base.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
sql_bitmap.h
sql_cache.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
sql_cache.h merge with 4.0 2004-03-16 22:41:30 +02:00
sql_class.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
sql_class.h Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_db.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
sql_delete.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_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 with 4.0, mainly to get changes to windows project files 2004-05-20 00:54:52 +03:00
sql_help.cc after review changes 2004-04-07 13:25:24 +03:00
sql_insert.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
sql_lex.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
sql_lex.h Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02: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 Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
sql_prepare.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02: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 Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
sql_select.h Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
sql_show.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
sql_sort.h
sql_state.c
sql_string.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
sql_string.h Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
sql_table.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
sql_test.cc poratble printing of ha_rows values 2004-05-17 15:14:19 +03:00
sql_udf.cc Fix for bug#1439 UDF Corruption 2004-03-19 14:35:00 +04:00
sql_udf.h
sql_union.cc Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
sql_update.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_yacc.yy Merging 4.1 to 5.0. 2004-05-26 17:04:45 +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 Support for character set conversion in binary protocol: another go 2004-05-25 02:03:49 +04:00
udf_example.cc
uniques.cc Fixed bug in replacation for not x86 platforms 2003-12-21 19:41:34 +02:00
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