unknown 99515a3ac8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 ...

into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rt


mysql-test/r/sp.result:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/skip_grants.result:
  Merge 5.0 and 5.0-runtime.
mysql-test/t/skip_grants.test:
  Merge 5.0 and 5.0-runtime.

2006-03-07 14:28:09 +03:00

..

examples

documenting HA_STATUS_xxx flags

2005-11-26 08:54:13 +01:00

share

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

2006-02-22 01:20:47 +03:00

.cvsignore

…

add_errmsg

…

client_settings.h

…

custom_conf.h

…

derror.cc

…

des_key_file.cc

Many files:

2005-09-30 14:03:55 +02:00

discover.cc

…

field_conv.cc

Expanding a binary field should result in 0x00-filled positions, not 0x20

2006-03-02 20:49:10 -05:00

field.cc

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

2006-02-27 20:00:03 +03:00

field.h

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0

2006-02-27 19:26:31 +01:00

filesort.cc

Move handling of suffix_length from strnxfrm_bin() to filesort to ensure proper sorting of all kind of binary objects

2005-10-14 00:04:52 +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_archive.cc

Discoved while debugging in 5.1 that there was a bug where a certain crash could lead to two problems. 1) An additional share in memory that was allocated but did not have the correct use_count (so it would never be fulled deleted). Also discovered that a thread that called repair would write new rows, but would not see them. All other threads were ok, and the data was fine, but the thread doing the repair was unable to see the new rows.

2006-02-13 04:11:22 -08:00

ha_archive.h

Discoved while debugging in 5.1 that there was a bug where a certain crash could lead to two problems. 1) An additional share in memory that was allocated but did not have the correct use_count (so it would never be fulled deleted). Also discovered that a thread that called repair would write new rows, but would not see them. All other threads were ok, and the data was fine, but the thread doing the repair was unable to see the new rows.

2006-02-13 04:11:22 -08:00

ha_berkeley.cc

Inefficient usage of String::append() fixed.

2005-11-20 20:47:07 +02:00

ha_berkeley.h

Fixes during review of new code

2005-11-03 22:42:25 +02:00

ha_blackhole.cc

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0

2005-10-02 20:13:18 -07:00

ha_blackhole.h

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

2005-08-26 15:56:52 +03:00

ha_federated.cc

Bug#17377 Federated Engine returns wrong Data, always the rows with the highest ID

2006-02-28 11:17:40 +01:00

ha_federated.h

Bug#17377 Federated Engine returns wrong Data, always the rows with the highest ID

2006-02-28 11:17:40 +01:00

ha_heap.cc

Post-merge fixes.

2006-02-03 00:07:36 +03:00

ha_heap.h

Merge mysql.com:/opt/local/work/mysql-4.1-root

2006-02-02 18:17:18 +03:00

ha_innodb.cc

Fixed: BUG#15653, BUG#16157, BUG#16229, BUG#16298, BUG#16387, BUG#16582.

2006-01-31 21:41:48 +03:00

ha_innodb.h

Fixed: BUG#15653, BUG#16157, BUG#16229, BUG#16298, BUG#16387, BUG#16582.

2006-01-31 21:41:48 +03:00

ha_myisam.cc

many warnings (practically safe but annoying) corrected

2006-01-03 17:54:54 +01:00

ha_myisam.h

A fix and a test case for Bug#10760 and complementary cleanups.

2005-07-19 22:21:12 +04:00

ha_myisammrg.cc

BUG#17314: Can't use index_merge/intersection for MERGE tables

2006-02-11 21:51:43 +03:00

ha_myisammrg.h

A fix and a test case for Bug#10760 and complementary cleanups.

2005-07-19 22:21:12 +04:00

ha_ndbcluster.cc

Bug#16795 ndb_cache_multi2

2006-02-27 10:29:55 +01:00

ha_ndbcluster.h

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

2006-02-10 17:50:17 +01:00

handler.cc

WL#2645 (CHECK TABLE FOR UPGRADE)

2006-02-17 10:52:32 +04:00

handler.h

Fixed compiler warnings from gcc 4.0.2:

2006-02-25 17:46:30 +02: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

Merge mysql.com:/usr/home/ram/work/mysql-4.1

2006-03-03 15:32:00 +04:00

init.cc

Fixes during review of new pushed code

2005-08-12 13:54:42 +03:00

item_buff.cc

sql_select.cc:

2005-07-25 12:57:23 -07:00

item_cmpfunc.cc

Fix for bug#17826 'type_decimal' fails with ps-protocol

2006-03-03 15:29:39 +04:00

item_cmpfunc.h

Fixed compiler warnings from gcc 4.0.2:

2006-02-25 17:46:30 +02:00

item_create.cc

Fixed BUG#12963, BUG#13000: wrong VIEW creation with DAYNAME(),

2005-09-14 20:25:00 +04:00

item_create.h

Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs.

2005-08-25 17:34:34 +04:00

item_func.cc

Fix for bug #17615: invalid handling of function results in UPDATE...SET statement.

2006-03-02 15:05:55 +04:00

item_func.h

Merge april.(none):/home/svoj/devel/mysql/merge/mysql-4.1

2006-02-07 15:30:32 +04:00

item_geofunc.cc

Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1

2005-10-31 11:54:36 +02:00

item_geofunc.h

Merge neptunus.(none):/home/msvensson/mysql/bug10241

2005-05-09 11:26:48 +02:00

item_row.cc

Fixed bug #12762:

2005-10-15 14:32:37 -07:00

item_row.h

Name resolution context added (BUG#6443)

2005-07-01 07:05:42 +03:00

item_strfunc.cc

Merge mysql.com:/home/jimw/my/mysql-5.0-14676

2006-02-17 08:32:50 -08:00

item_strfunc.h

Fix for bug#16678 FORMAT gives wrong result if client run with default-character-set=utf8

2006-03-06 12:52:38 +04:00

item_subselect.cc

Merge rurik.mysql.com:/home/igor/mysql-5.0

2005-11-22 23:00:57 -08:00

item_subselect.h

Fix bug #15706 find_field_in_tables() returns field from outer select

2006-02-15 19:45:06 +03:00

item_sum.cc

Merge rurik.mysql.com:/home/igor/mysql-5.0

2005-12-02 20:42:36 -08:00

item_sum.h

Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was

2006-02-28 19:30:30 +03:00

item_timefunc.cc

Fixed BUG#17476: Stored procedure not returning data when it is called first

2006-03-02 14:54:04 +01:00

item_timefunc.h

Merge mysql.com:/home/mysql_src/mysql-4.1-gca

2005-11-10 15:13:12 +01:00

item_uniq.cc

Merge with 4.1

2005-06-07 00:31:53 +03:00

item_uniq.h

Inefficient usage of String::append() fixed.

2005-11-20 20:47:07 +02:00

item.cc

Merge mysql.com:/usr/home/bar/mysql-4.1.b15949

2006-03-06 16:20:15 +04:00

item.h

Fixed BUG#17476: Stored procedure not returning data when it is called first

2006-03-02 14:54:04 +01:00

key.cc

Inefficient usage of String::append() fixed.

2005-11-20 20:47:07 +02:00

lex_symbol.h

…

lex.h

WL#2645 (CHECK TABLE FOR UPGRADE)

2006-02-17 10:52:32 +04:00

lock.cc

Merge mysql.com:/opt/local/work/mysql-4.1-7209-new

2006-01-04 17:49:45 +03:00

log_event.cc

BUG#16217 fix partly backported from 5.0. It is different in mysqlbinlog part.

2006-02-10 15:12:27 +02:00

log_event.h

Fixed compiler warnings from gcc 4.0.2:

2006-02-25 17:46:30 +02:00

log.cc

Fix for BUG#16559 "Replication Problems with Non transactional tables inside an interrupted trans.":

2006-02-18 17:19:16 +01:00

Makefile.am

Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause

2006-01-11 02:07:40 +03:00

matherr.c

…

mf_iocache.cc

…

my_decimal.cc

Fix for bug #13573 (wrong data inserted for too big decimals)

2005-10-15 21:57:32 +05:00

my_decimal.h

Fix for bug #13573 (wrong data inserted for too big decimals)

2005-10-15 21:57:32 +05:00

my_lock.c

…

mysql_priv.h

Fix for BUG#16777: Can not create trigger nor view w/o definer

2006-03-02 14:17:13 +03:00

mysqld_suffix.h

…

mysqld.cc

Fixes to embedded server to be able to run tests with it

2006-02-24 18:34:15 +02:00

net_serv.cc

Make the define start at "start of line"

2006-03-02 10:55:55 +01:00

nt_servc.cc

…

nt_servc.h

…

opt_range.cc

Fixed compiler warnings from gcc 4.0.2:

2006-02-25 17:46:30 +02:00

opt_range.h

many warnings (practically safe but annoying) corrected

2006-01-03 17:54:54 +01:00

opt_sum.cc

Fixed bug #16016: MIN/MAX optimization was not applied to views.

2006-01-06 22:28:26 -08:00

parse_file.cc

Review fixes of new pushed code

2006-01-06 00:47:49 +02:00

parse_file.h

Fixed compiler warnings from gcc 4.0.2:

2006-02-25 17:46:30 +02:00

password.c

Merge mysql.com:/opt/local/work/mysql-4.1-root

2006-01-11 17:49:56 +03: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.cc

Fixes to embedded server to be able to run tests with it

2006-02-24 18:34:15 +02:00

protocol.h

Fixes to embedded server to be able to run tests with it

2006-02-24 18:34:15 +02:00

records.cc

Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1

2005-10-27 23:43:20 +03:00

repl_failsafe.cc

many warnings (practically safe but annoying) corrected

2006-01-03 17:54:54 +01:00

repl_failsafe.h

pthread_handler_decl() changed to be ctags-friendly

2005-10-08 16:39:55 +02:00

set_var.cc

Fix for BUG#13897 "failure to do SET SQL_MODE=N where N is a number > 31" (the original bug's title isn't the simplest

2006-02-18 17:32:15 +01:00

set_var.h

Many files:

2006-02-14 08:24:01 +04:00

slave.cc

WL#2645 (CHECK TABLE FOR UPGRADE)

2006-02-17 10:52:32 +04:00

slave.h

many warnings (practically safe but annoying) corrected

2006-01-03 17:54:54 +01:00

sp_cache.cc

Fix use of "%*s" *printf() specifiers that were really meant to be

2005-10-06 17:37:24 -07:00

sp_cache.h

BUG#12228: Post review fixes: Added test case, code cleanup.

2005-08-10 21:17:02 +00:00

sp_head.cc

Fix for BUG#13198: SP executes if definer does not exist.

2006-03-02 16:23:42 +03:00

sp_head.h

Implementation of WL#2897: Complete definer support in the stored routines.

2006-03-02 15:18:49 +03:00

sp_pcontext.cc

Fixed BUG#16887: Cursor causes server segfault

2006-02-15 12:11:29 +01:00

sp_pcontext.h

Fixed BUG#16887: Cursor causes server segfault

2006-02-15 12:11:29 +01:00

sp_rcontext.cc

Post-review fix for BUG#15011.

2006-02-01 16:00:11 +01:00

sp_rcontext.h

Fixed compiler warnings from gcc 4.0.2:

2006-02-25 17:46:30 +02:00

sp.cc

Implementation of WL#2897: Complete definer support in the stored routines.

2006-03-02 15:18:49 +03:00

sp.h

Fixed BUG#16303: erroneus stored procedures and functions should be droppable

2006-01-26 13:29:46 +01:00

spatial.cc

Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0

2005-11-21 21:15:48 +02:00

spatial.h

Fixed compiler warnings from gcc 4.0.2:

2006-02-25 17:46:30 +02:00

sql_acl.cc

4.1 -> 5.0 merge

2006-03-06 14:38:31 +04:00

sql_acl.h

WL#2486 - natural/using joins according to SQL:2003

2005-11-30 21:27:11 +02:00

sql_analyse.cc

Inefficient usage of String::append() fixed.

2005-11-20 20:47:07 +02:00

sql_analyse.h

Merge from 4.1

2005-05-26 21:01:55 +02:00

sql_array.h

Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs.

2005-08-25 17:34:34 +04:00

sql_base.cc

Merge mysql.com:/home/timka/mysql/src/5.0-virgin

2006-03-06 11:41:19 +02:00

sql_bitmap.h

Bug#10932 - Building server with key limit of 128, makes test cases fail

2005-07-19 14:13:56 +02:00

sql_cache.cc

Merge mysql.com:/opt/local/work/mysql-4.1-7209-new

2006-01-04 17:49:45 +03:00

sql_cache.h

Fixed compiler warnings from gcc 4.0.2:

2006-02-25 17:46:30 +02:00

sql_class.cc

Fixes to embedded server to be able to run tests with it

2006-02-24 18:34:15 +02:00

sql_class.h

Fixed compiler warnings from gcc 4.0.2:

2006-02-25 17:46:30 +02: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_cursor.cc

Fixes to embedded server to be able to run tests with it

2006-02-24 18:34:15 +02:00

sql_cursor.h

A fix and a test case for Bug#6513 "Test Suite: Values inserted by using

2005-09-22 02:11:21 +04:00

sql_db.cc

Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0

2006-03-01 17:43:55 +03:00

sql_delete.cc

Merge mysql.com:/home/mydev/mysql-5.0

2005-12-27 10:31:00 +01:00

sql_derived.cc

support of view underlying tables and SP functions security check added (BUG#9505) (WL#2787)

2005-10-28 00:18:23 +03:00

sql_do.cc

Name resolution context added (BUG#6443)

2005-07-01 07:05:42 +03:00

sql_error.cc

Additional fix for BUG#7049, after review.

2005-10-17 15:07:47 +02:00

sql_error.h

…

sql_handler.cc

Changed condition similar to code in 4.1.

2006-01-16 23:15:00 +02:00

sql_help.cc

many warnings (practically safe but annoying) corrected

2006-01-03 17:54:54 +01:00

sql_insert.cc

merged

2006-01-06 18:26:59 +01:00

sql_lex.cc

Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0

2006-02-02 21:23:36 -08:00

sql_lex.h

Implementation of WL#2897: Complete definer support in the stored routines.

2006-03-02 15:18:49 +03:00

sql_list.cc

a compiler must see '#pragma implementation' *before*

2005-06-05 19:38:52 +02:00

sql_list.h

WL#2486 - Natural/using join according to SQL:2003.

2005-11-28 21:57:50 +02:00

sql_load.cc

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

2006-02-07 00:06:28 +01:00

sql_manager.cc

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

2005-10-12 00:59:52 +03:00

sql_manager.h

…

sql_map.cc

WL#2286 - Compile MySQL w/YASSL support

2005-06-22 14:08:28 +05: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

Implementation of WL#2486 -

2005-08-12 17:57:19 +03:00

sql_parse.cc

Implementation of WL#2897: Complete definer support in the stored routines.

2006-03-02 15:18:49 +03:00

sql_prepare.cc

Fixes to embedded server to be able to run tests with it

2006-02-24 18:34:15 +02:00

sql_rename.cc

Fix for bug #13525 "Rename table does not keep info of triggers".

2006-02-24 23:50:36 +03:00

sql_repl.cc

many warnings (practically safe but annoying) corrected

2006-01-03 17:54:54 +01:00

sql_repl.h

…

sql_select.cc

Merge rurik.mysql.com:/home/igor/mysql-5.0

2006-02-19 17:26:06 -08:00

sql_select.h

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

2006-02-27 20:00:03 +03:00

sql_show.cc

Postfix for #15943. Explicit call of thd->clear_error() is added.

2006-02-27 16:52:14 +03:00

sql_sort.h

…

sql_state.c

…

sql_string.cc

Inefficient usage of String::append() fixed.

2005-11-20 20:47:07 +02:00

sql_string.h

Netware specific changes.

2005-12-14 01:21:56 +02:00

sql_table.cc

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

2006-02-27 20:00:03 +03:00

sql_test.cc

many warnings (practically safe but annoying) corrected

2006-01-03 17:54:54 +01:00

sql_trigger.cc

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

2006-03-07 14:28:09 +03:00

sql_trigger.h

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime

2006-02-26 16:38:48 +03:00

sql_udf.cc

Fixes bug #17595. UDFs are not initialized when running mysqld with

2006-02-27 16:27:34 +03:00

sql_udf.h

Name resolution context added (BUG#6443)

2005-07-01 07:05:42 +03:00

sql_union.cc

A fix and a test case for Bug#12736 "Server crash during a select".

2005-10-13 11:53:00 +04:00

sql_update.cc

Fixed compiler warnings from gcc 4.0.2:

2006-02-25 17:46:30 +02:00

sql_view.cc

Fix for BUG#16777: Can not create trigger nor view w/o definer

2006-03-02 14:17:13 +03:00

sql_view.h

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0

2005-11-03 16:43:05 +02:00

sql_yacc.yy

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

2006-03-07 14:28:09 +03:00

stacktrace.c

…

stacktrace.h

…

strfunc.cc

…

structs.h

Inefficient usage of String::append() fixed.

2005-11-20 20:47:07 +02:00

table.cc

Merge mysql.com:/home/timka/mysql/src/5.0-virgin

2006-03-06 11:41:19 +02:00

table.h

Merge mysql.com:/home/timka/mysql/src/5.0-virgin

2006-03-06 11:41:19 +02:00

thr_malloc.cc

…

time.cc

Fixes during review of new pushed code

2005-07-31 12:49:55 +03:00

tzfile.h

…

tztime.cc

Fixed compiler warnings from gcc 4.0.2:

2006-02-25 17:46:30 +02:00

tztime.h

Fixed compiler warnings from gcc 4.0.2:

2006-02-25 17:46:30 +02:00

udf_example.cc

Fixed BUG#16896: Stored function: unused AGGREGATE-clause in CREATE FUNCTION

2006-02-09 13:00:32 +01:00

uniques.cc

many warnings (practically safe but annoying) corrected

2006-01-03 17:54:54 +01:00

unireg.cc

A fix and a test case for Bug#14210 "Simple query with > operator on

2005-11-03 14:20:13 +03:00

unireg.h

Merge mysql.com:/home/mydev/mysql-5.0

2005-12-06 08:19:23 +01:00

watchdog_mysqld

…