mariadb/sql
unknown 24f8b1cfa8 Merging 4.1->5.0
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-compile-netware-src~1:
  Delete: netware/BUILD/compile-netware-src
BitKeeper/deleted/.del-knetware.imp~1:
  Delete: netware/BUILD/knetware.imp
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
include/my_global.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/distinct.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-10-22 16:10:22 +02:00
..
share Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
.cvsignore
add_errmsg
client_settings.h SCRUM 2003-09-19 14:05:28 +05:00
custom_conf.h
derror.cc Fix for Windows bug reported throuhg Miguel 2003-10-21 16:05:17 +05:00
des_key_file.cc Merge with 4.0.16 2003-10-07 15:42:26 +03:00
field.cc Merge commit 2003-10-20 13:45:28 +05:00
field.h After merge fixes. 2003-09-11 19:06:23 +03:00
field_conv.cc Add warnings for single line inserts. To do this I had to convert count_cuted_fields to an enum (to be able to detect setting a NOT NULL field to NULL) 2003-10-11 23:26:39 +03:00
filesort.cc Merging 4.1 -> 5.0 2003-09-24 11:29:38 +02:00
frm_crypt.cc
gen_lex_hash.cc - Polished mysql-copyright a bit and added call to remove 2003-09-23 00:38:01 +02:00
gstream.cc
gstream.h
ha_berkeley.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
ha_berkeley.h
ha_heap.cc
ha_heap.h
ha_innodb.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
ha_innodb.h Many files: 2003-10-13 11:20:19 +03:00
ha_isam.cc
ha_isam.h
ha_isammrg.cc
ha_isammrg.h
ha_myisam.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
ha_myisam.h table checksum background: 2003-08-05 21:14:15 +02:00
ha_myisammrg.cc Allow one to use MERGE tables with tables from different databases 2003-06-27 16:29:10 +03:00
ha_myisammrg.h After merge fixes 2003-08-19 00:08:08 +03:00
handler.cc Indentation cleanups 2003-10-08 21:50:05 +03:00
handler.h merge with 4.0 2003-10-16 03:08:40 +03:00
hash_filo.cc
hash_filo.h SCRUM 2003-09-19 14:44:31 +05:00
hostname.cc
init.cc Fix for Windows bug reported throuhg Miguel 2003-10-21 16:05:17 +05:00
item.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
item.h Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
item_buff.cc Old style charset() and set_charset() were removed. 2003-08-05 12:52:37 +05:00
item_cmpfunc.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
item_cmpfunc.h Merge 2003-10-06 20:55:06 +03:00
item_create.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
item_create.h Scrum task 835 - text-to-datetime conversion function 2003-10-20 13:24:18 +05:00
item_func.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
item_func.h Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
item_geofunc.cc Renamed xxx_as_text() and xxx__from_text(). 2003-06-20 14:53:37 +05:00
item_geofunc.h fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib 2003-08-21 16:15:06 +02:00
item_row.cc fixed error names 2003-10-06 22:35:05 +03:00
item_row.h Item tree iterator 2003-07-02 13:12:18 +03:00
item_strfunc.cc Merge bk-internal.mysql.com:/home/bk/mysql-4.1 2003-10-15 22:52:31 +03:00
item_strfunc.h Merge bk-internal:/home/bk/mysql-4.1/ 2003-09-03 15:40:19 +02:00
item_subselect.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
item_subselect.h Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 2003-10-07 17:42:59 +03:00
item_sum.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
item_sum.h Add in bit_xor function (approved by Sergei) 2003-10-15 02:11:03 -04:00
item_timefunc.cc Scrum task 835 - text-to-datetime conversion function 2003-10-20 13:24:18 +05:00
item_timefunc.h Scrum task 835 - text-to-datetime conversion function 2003-10-20 13:24:18 +05:00
item_uniq.cc
item_uniq.h merge with 4.0.15 2003-08-29 13:44:35 +03:00
key.cc
lex.h Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
lex_symbol.h
lock.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
log.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
log_event.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
log_event.h merge with 4.0.15 2003-08-29 13:44:35 +03:00
Makefile.am Implemented SP CONDITIONs and HANDLERs, with the extension of handling 2003-09-16 14:26:08 +02:00
matherr.c
mf_iocache.cc
my_lock.c
mysql_priv.h Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
mysqld.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
net_serv.cc merge 2003-09-24 10:24:56 +03:00
nt_servc.cc Fix error msg. Bug #681 2003-06-19 12:38:14 -04:00
nt_servc.h
opt_ft.cc Add new user variables for tuning memory usage: 2003-10-11 22:00:24 +03:00
opt_ft.h Add new user variables for tuning memory usage: 2003-10-11 22:00:24 +03:00
opt_range.cc merge with 4.0 for more memory allocation variables. 2003-10-13 15:50:30 +03:00
opt_range.h Portability fixes for windows 2003-10-15 22:40:36 +03:00
opt_sum.cc
password.c C cleanups 2003-09-03 16:31:01 +02:00
procedure.cc
procedure.h
protocol.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
protocol.h WL#962: Added simple, read-only, non-scrolling, asensitive cursors in SPs, using the 2003-10-10 16:57:21 +02:00
protocol_cursor.cc WL#962: Added simple, read-only, non-scrolling, asensitive cursors in SPs, using the 2003-10-10 16:57:21 +02:00
records.cc Merging 4.1 -> 5.0 2003-09-24 11:29:38 +02:00
repl_failsafe.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
repl_failsafe.h
set_var.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
set_var.h Merge commit 2003-10-20 13:45:28 +05:00
slave.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
slave.h Final push for WL#1098: 2003-10-09 00:06:21 +02:00
sp.cc Bugfix of previous WL#1265 commit. 2003-10-21 18:13:14 +02:00
sp.h SP cache (WL#730). (Mostly by vva, additions by pem.) 2003-07-01 18:14:24 +02:00
sp_cache.cc Bugfix of previous WL#1265 commit. 2003-10-21 18:13:14 +02:00
sp_cache.h Bugfix of previous WL#1265 commit. 2003-10-21 18:13:14 +02:00
sp_head.cc Bugfix; added another method to Item_splocal, updated tests, and added previous 2003-10-20 16:59:45 +02:00
sp_head.h WL#962: Added simple, read-only, non-scrolling, asensitive cursors in SPs, using the 2003-10-10 16:57:21 +02:00
sp_pcontext.cc WL#962: Added simple, read-only, non-scrolling, asensitive cursors in SPs, using the 2003-10-10 16:57:21 +02:00
sp_pcontext.h WL#962: Added simple, read-only, non-scrolling, asensitive cursors in SPs, using the 2003-10-10 16:57:21 +02:00
sp_rcontext.cc Fix for BUG#1495: Evaluate items before setting a local variable with SELECT INTO. 2003-10-14 12:59:28 +02:00
sp_rcontext.h Fix for BUG#1495: Evaluate items before setting a local variable with SELECT INTO. 2003-10-14 12:59:28 +02:00
spatial.cc Renamed xxx_as_text() and xxx__from_text(). 2003-06-20 14:53:37 +05:00
spatial.h Renamed xxx_as_text() and xxx__from_text(). 2003-06-20 14:53:37 +05:00
sql_acl.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
sql_acl.h SCRUM: 2003-09-26 15:33:13 +05:00
sql_analyse.cc Old style charset() and set_charset() were removed. 2003-08-05 12:52:37 +05:00
sql_analyse.h There is no Item->binary() anymore. It was remain from 4.0. 2003-07-02 18:34:43 +05:00
sql_base.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
sql_cache.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
sql_cache.h Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 2003-08-26 16:42:49 +03:00
sql_class.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
sql_class.h Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
sql_client.cc Some mistakes fixed 2003-07-14 16:38:51 +05:00
sql_crypt.cc Style fixes, comments for 4.1.1 authorization 2003-07-18 18:25:54 +04:00
sql_crypt.h
sql_db.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
sql_delete.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
sql_derived.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
sql_do.cc
sql_error.cc Merge 4.1 into 5.0 (first pass). 2003-07-08 17:50:23 +02:00
sql_handler.cc merge with 4.0 2003-10-16 03:08:40 +03:00
sql_help.cc Portability fixes for windows 2003-10-15 22:40:36 +03:00
sql_insert.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
sql_lex.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
sql_lex.h Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
sql_list.cc
sql_list.h Merge with 4.0.14 2003-08-11 22:44:43 +03:00
sql_load.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
sql_prepare.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
sql_rename.cc Safety and speedup fixes: 2003-07-14 10:12:05 +03:00
sql_repl.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
sql_repl.h Merge 4.1 into 5.0 2003-08-26 11:51:09 +02:00
sql_select.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
sql_select.h renamed join_types (as was suggested by Peter Gulutzan) 2003-09-14 09:40:57 +03:00
sql_show.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
sql_sort.h
sql_state.c
sql_string.cc Remove 'extern' references from .cc files 2003-09-13 11:35:29 +03:00
sql_string.h SAPDB date/time finctions 2003-07-08 15:06:05 +05:00
sql_table.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
sql_test.cc merge with 4.0 2003-10-16 03:08:40 +03:00
sql_udf.cc merge with 4.0 for more memory allocation variables. 2003-10-13 15:50:30 +03:00
sql_udf.h hanged UDF interface to use clear() instead of reset() 2003-08-27 22:30:50 +03:00
sql_union.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
sql_update.cc Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
sql_yacc.yy Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
stacktrace.c
stacktrace.h
structs.h Scrum task 835 - text-to-datetime conversion function 2003-10-20 13:24:18 +05:00
table.cc merge with 4.0 for more memory allocation variables. 2003-10-13 15:50:30 +03:00
table.h Fix for BUG#1495: Evaluate items before setting a local variable with SELECT INTO. 2003-10-14 12:59:28 +02:00
thr_malloc.cc
time.cc Scrum task 835 - text-to-datetime conversion function 2003-10-20 13:24:18 +05:00
udf_example.cc after review patch (SCRUM) 2003-10-06 11:13:25 +03:00
uniques.cc Merge with 4.0.14 2003-08-11 22:44:43 +03:00
unireg.cc Remove FORCE_INIT_OF_VARS when compiling for valgrind/purify to spot wrong LINT_INIT() options 2003-06-30 13:23:54 +03:00
unireg.h WL #562: Change format of slow log in 4.1 2003-10-07 12:05:35 +05:00
watchdog_mysqld