mariadb/sql
unknown fe3beec4a4 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into zim.(none):/home/brian/mysql/mysql-4.1


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-03-24 16:08:48 -08:00
..
examples new static archive_inited variable, so that archive_db_end() will do something only if archive_db_init() was run before 2005-02-12 19:17:33 +01:00
share merge 2005-03-03 23:07:20 +01:00
.cvsignore
add_errmsg
client_settings.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
field.cc Merge bk-internal.mysql.com:/home/bk/mysql-4.1 2005-02-22 12:51:54 +02:00
field.h Fixed wrong memory references found by purify 2005-02-28 11:59:46 +02:00
field_conv.cc Merge changed tests 2005-01-18 12:25:56 -08:00
filesort.cc A fix (bug #8799: Killed filesorts can fail inited==RND assertion in ha_rnd_end). 2005-03-15 15:32:11 +04:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_berkeley.cc BUG#6554 Problem Building MySql on Fedora Core 3 2005-03-14 12:07:49 +01:00
ha_berkeley.h
ha_blackhole.cc Collection of changes per Bar and Serg. 2005-03-24 16:07:56 -08:00
ha_blackhole.h Collection of changes per Bar and Serg. 2005-03-24 16:07:56 -08:00
ha_heap.cc Partly reverty back patch (in heap-auto-increment-key detection) to ensure that auto_key and auto_key_type are calculated the same way 2005-03-16 01:15:45 +02:00
ha_heap.h
ha_innodb.cc ha_innodb.cc: 2005-03-04 15:53:05 +02:00
ha_innodb.h InnoDB: Commit inserts to the temporary tables created by 2005-03-01 16:09:22 +02:00
ha_isam.cc
ha_isam.h
ha_isammrg.cc
ha_isammrg.h
ha_myisam.cc merge 2005-03-03 23:07:20 +01:00
ha_myisam.h indexless boolean fulltext search was depending on default_charset_info - Bug#8159 2005-02-04 15:24:06 +01:00
ha_myisammrg.cc
ha_myisammrg.h
ha_ndbcluster.cc Added better comment for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index 2005-03-22 17:48:28 +01:00
ha_ndbcluster.h Extra fix for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index 2005-03-22 17:42:08 +01:00
handler.cc Additional storage engine called "blackhole". Customer request, and for that matter a Zawodny request. With this you can alter table to a type of table that would never store data. Its a /dev/null for a database. 2005-03-22 16:10:39 -08:00
handler.h Additional storage engine called "blackhole". Customer request, and for that matter a Zawodny request. With this you can alter table to a type of table that would never store data. Its a /dev/null for a database. 2005-03-22 16:10:39 -08:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc # Bug#8785 Problem with nested concats and 2005-03-15 17:15:47 +04:00
item.h Merge rurik.mysql.com:/home/igor/mysql-4.1 2005-03-16 17:50:03 -08:00
item_buff.cc
item_cmpfunc.cc Fixed wrong memory references found by purify 2005-02-28 11:59:46 +02:00
item_cmpfunc.h correct not_null_tables() for XOR and AND 2005-03-13 16:34:40 +01:00
item_create.cc type_blob.result, func_system.result, func_str.result, ctype_collate.result: 2005-03-04 14:20:49 +04:00
item_create.h
item_func.cc Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY() 2005-03-16 17:44:29 +04:00
item_func.h Fixed that LEFT OUTER JOIN was replaced with a regulat join 2005-03-24 18:10:46 +04:00
item_geofunc.cc
item_geofunc.h
item_row.cc Better bugfix for "HAVING when refering to RAND()" (Bug #8216) 2005-02-08 14:41:09 +02:00
item_row.h
item_strfunc.cc Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY() 2005-03-16 17:44:29 +04:00
item_strfunc.h Fixed that LEFT OUTER JOIN was replaced with a regulat join 2005-03-24 18:10:46 +04:00
item_subselect.cc reverted patch for BUG#7351 (because of performance ussie) 2005-02-09 21:08:08 +02:00
item_subselect.h
item_sum.cc Backport my_strntod() from 5.0 2005-02-22 12:51:23 +02:00
item_sum.h Backport my_strntod() from 5.0 2005-02-22 12:51:23 +02:00
item_timefunc.cc Merge bk-internal.mysql.com:/home/bk/mysql-4.1 2005-01-28 09:32:43 +03:00
item_timefunc.h Fix for bug #7899 "CREATE TABLE .. SELECT .. and CONVERT_TZ() function 2005-01-26 22:25:02 +03:00
item_uniq.cc
item_uniq.h
key.cc Merge 2005-03-17 10:59:25 +04:00
lex.h
lex_symbol.h
lock.cc FIx for BUG#8682 "flush_block_commit test hangs on HPUX": 2005-02-23 17:38:51 +01:00
log.cc Bug#8412: Setting error code to 0 on statements that cannot fail. 2005-02-23 20:59:00 +01:00
log_event.cc Merge quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon 2005-03-17 17:00:44 +01:00
log_event.h Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag 2004-12-31 12:04:35 +02:00
Makefile.am Additional storage engine called "blackhole". Customer request, and for that matter a Zawodny request. With this you can alter table to a type of table that would never store data. Its a /dev/null for a database. 2005-03-22 16:10:39 -08:00
matherr.c
mf_iocache.cc
my_lock.c
mysql_priv.h Additional storage engine called "blackhole". Customer request, and for that matter a Zawodny request. With this you can alter table to a type of table that would never store data. Its a /dev/null for a database. 2005-03-22 16:10:39 -08:00
mysqld.cc Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 2005-03-24 16:08:48 -08:00
mysqld_suffix.h
net_serv.cc Manual merge. 2005-03-07 10:29:50 +01:00
nt_servc.cc
nt_servc.h
opt_range.cc
opt_range.h
opt_sum.cc logging_ok: 2005-03-04 20:24:13 -08:00
password.c
procedure.cc
procedure.h Backport my_strntod() from 5.0 2005-02-22 12:51:23 +02:00
protocol.cc additional safety 2005-03-07 16:45:19 +01:00
protocol.h
protocol_cursor.cc
records.cc
repl_failsafe.cc
repl_failsafe.h
set_var.cc Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 2005-03-24 16:08:48 -08:00
set_var.h bug#6958 2005-02-17 15:04:04 +04:00
slave.cc "After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication": 2005-03-23 19:19:36 +01:00
slave.h "After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication": 2005-03-23 19:19:36 +01:00
spatial.cc
spatial.h
sql_acl.cc Fix bug in checking of table-specific grats that caused IP/NETMASK 2005-03-02 16:30:24 -08:00
sql_acl.h fixes/cleanups according to Coverity report 2005-01-24 15:48:25 +01:00
sql_analyse.cc fixes/cleanups according to Coverity report 2005-01-24 15:48:25 +01:00
sql_analyse.h
sql_base.cc Merge mysql.com:/home/jimw/my/mysql-4.1-8355 2005-02-17 13:48:34 -08:00
sql_bitmap.h
sql_cache.cc Merge hundin.mysql.fi:/home/heikki/mysql-4.0 2005-02-13 21:05:18 +02:00
sql_cache.h
sql_class.cc merging 2005-02-28 19:59:38 +04:00
sql_class.h Fix for BUG#8218: 2005-02-12 22:58:54 +03:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_db.cc After review fixes 2005-02-02 15:52:19 +04:00
sql_delete.cc Manual merge 2005-02-15 21:03:17 -08:00
sql_derived.cc removed wrong distinct UNION detection (BUG#6565) 2005-02-14 02:06:21 +02:00
sql_do.cc
sql_error.cc BUG#6662: Changes after Guilhems and Sergs review 2005-02-22 12:40:31 +01:00
sql_handler.cc
sql_help.cc
sql_insert.cc Fixed wrong memory references found by purify 2005-02-28 11:59:46 +02:00
sql_lex.cc Fix error in parsing string literals containing a backslash followed 2005-02-03 16:07:32 -08:00
sql_lex.h Fixed wrong memory references found by purify 2005-02-28 11:59:46 +02:00
sql_list.cc
sql_list.h Fix signatures of placement operator delete in places where placement 2005-02-15 03:55:44 +03:00
sql_load.cc Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag 2004-12-31 12:04:35 +02:00
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc BUG#9303 blob field with specified length < 256 does not create tinyblob 2005-03-24 13:48:38 +01:00
sql_prepare.cc Fix bug in INSERT DELAYED with prepared statements 2005-01-14 00:09:15 +02:00
sql_rename.cc
sql_repl.cc Fixed wrong memory references found by purify 2005-02-28 11:59:46 +02:00
sql_repl.h Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag 2004-12-31 12:04:35 +02:00
sql_select.cc Fixed newly introduced bug in ROLLUP 2005-03-22 02:36:31 +02:00
sql_select.h olap.result, olap.test: 2005-03-15 22:50:54 -08:00
sql_show.cc "After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication": 2005-03-23 19:19:36 +01:00
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h # Bug#8785 Problem with nested concats and 2005-03-15 17:15:47 +04:00
sql_table.cc Merge test and results 2005-03-11 11:07:32 -08:00
sql_test.cc
sql_udf.cc after merge fixes 2005-03-03 23:57:48 +01:00
sql_udf.h
sql_union.cc a fix for --ps-protocol (bug #6089: FOUND_ROWS returns wrong values when no table/view is used) 2005-03-02 20:00:48 +04:00
sql_update.cc Merge from 4.0 2005-02-18 14:19:08 +01:00
sql_yacc.yy Merge from 4.0 2005-02-18 14:19:08 +01:00
stacktrace.c
stacktrace.h
strfunc.cc - Housekeeping: removed a few unreferenced variables, noticed while doing 2005-01-11 15:38:03 +01:00
structs.h "After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication": 2005-03-23 19:19:36 +01:00
table.cc merge 2005-03-03 23:07:20 +01:00
table.h
thr_malloc.cc
time.cc
tzfile.h
tztime.cc Merge bk-internal.mysql.com:/home/bk/mysql-4.1 2005-01-28 09:32:43 +03:00
tztime.h
udf_example.cc
uniques.cc
unireg.cc
unireg.h Fixed bug in HAVING when refering to RAND() through alias 2005-02-07 18:13:57 +02:00
watchdog_mysqld