istruewing@chilla.local
f7657f47c5
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2006-12-01 23:01:33 +01:00
istruewing@chilla.local
cc4e2a85c6
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2006-12-01 22:59:51 +01:00
istruewing@chilla.local
763fdea487
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-01 18:49:20 +01:00
istruewing@chilla.local
341bd06408
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-01 18:38:08 +01:00
df@kahlann.erinye.com
6dc7e55e9c
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
2006-12-01 10:39:48 +01:00
monty@narttu.mysql.fi
693b906f6e
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-11-30 23:27:16 +02:00
gkodinov@dl145s.mysql.com
af74fd07b4
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-11-30 17:59:14 +01:00
gkodinov/kgeorge@macbook.gmz
8b8e820224
Merge bk-internal:/home/bk/mysql-5.0-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/B11927-5.0-opt
2006-11-30 18:49:50 +02:00
gkodinov/kgeorge@macbook.gmz
36e7fbc033
func_group.test, func_group.result, func_gconcat.result, func_gconcat.test:
...
merge fix : removed undeterministic warnings
2006-11-30 18:47:59 +02:00
gkodinov@dl145s.mysql.com
7c94b8012c
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-11-30 12:29:11 +01:00
gkodinov@dl145s.mysql.com
498791908a
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.1
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-11-30 12:27:04 +01:00
gkodinov@dl145s.mysql.com
03431eb78a
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-11-30 12:22:32 +01:00
gkodinov/kgeorge@macbook.gmz
7464a20bc8
func_gconcat.result, func_gconcat.test:
...
disabled warnings because their order is undeterministic
2006-11-30 12:58:05 +02:00
baker@bk-internal.mysql.com
082de8dfce
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-11-30 01:45:16 +01:00
kostja@bodhi.local
bdf6d15f4b
A post-merge fix.
2006-11-30 02:51:41 +03:00
kostja@bodhi.local
9fa2b75804
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-11-30 02:36:18 +03:00
monty@narttu.mysql.fi
717284b85c
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2006-11-29 23:07:15 +02:00
kostja@bodhi.local
966c569b94
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-11-29 23:36:26 +03:00
patg@radha.local
7ce83bc36a
federated.test:
...
fixed test to replace port to SLAVE_PORT in result file
federated.result:
new result file
2006-11-29 13:56:59 -05:00
baker@bk-internal.mysql.com
94dc5d5379
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-11-29 18:31:13 +01:00
gkodinov@dl145s.mysql.com
96181cd2c5
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.1-opt
2006-11-29 16:34:25 +01:00
gkodinov@dl145s.mysql.com
1405ed13fe
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt
2006-11-29 16:32:13 +01:00
monty@mysql.com/narttu.mysql.fi
8aec636ba8
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-11-29 17:25:23 +02:00
evgen@moonbone.local
ecc63d81b8
view_grant.result:
...
Small fix for a test case
2006-11-29 18:12:08 +03:00
gkodinov@dl145s.mysql.com
48764da66f
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.1-opt
2006-11-29 15:24:51 +01:00
gkodinov@dl145s.mysql.com
fd28e74aa6
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt
2006-11-29 15:21:28 +01:00
gkodinov@dl145s.mysql.com
40027fb712
func_in.result, group_min_max.result:
...
merged 5.0 testcases
2006-11-29 14:51:22 +01:00
evgen@moonbone.local
595d8c5bcb
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/work/20327-bug-5.0-opt-mysql
2006-11-29 15:03:53 +03:00
evgen@moonbone.local
e851a9eaea
Bug#20327: Marking of a wrong field leads to a wrong result on select with view,
...
prepared statement and subquery.
When a field of a view from an outer select is resolved the find_field_in_view
function creates an Item_direct_view_ref object that references the
corresponding view underlying field. After that the view_ref is marked
as a dependent one. While resolving view underlying field it also get
marked as a dependent one due to current_select still points to the subselect.
Marking the view underlying field is wrong and lead to attaching conditions
to a wrong table and thus to the wrong result of the whole statement.
Now mark_select_range_as_dependent() function isn't called for fields from a
view underlying table.
2006-11-29 14:52:11 +03:00
evgen@moonbone.local
1314ab222f
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/work/17254-bug-5.0-opt-mysql
2006-11-29 14:44:24 +03:00
gkodinov@dl145s.mysql.com
b58b551810
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.1-opt
2006-11-29 11:48:44 +01:00
gkodinov@dl145s.mysql.com
43c3dfeb27
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt
2006-11-29 11:25:22 +01:00
kostja@bodhi.local
2525e16c73
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-11-29 11:44:37 +03:00
kostja@bodhi.local
5fea0724bc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2006-11-29 02:44:12 +03:00
baker@bk-internal.mysql.com
f175a892ab
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-11-28 22:22:52 +01:00
gkodinov@dl145s.mysql.com
32c9e11df9
Merge bk-internal:/home/bk/mysql-5.1
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-11-28 17:14:16 +01:00
gkodinov/kgeorge@rakia.gmz
a2af397180
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B24156-5.0-opt
2006-11-28 18:09:15 +02:00
gkodinov/kgeorge@macbook.gmz
a6574ac693
Bug#24156: Loose index scan not used with CREATE TABLE ...SELECT and similar
...
statements
Currently the optimizer evaluates loose index scan only for top-level SELECT
statements
Extend loose index scan applicability by :
- Test the applicability of loose scan for each sub-select, instead of the
whole query. This change enables loose index scan for sub-queries.
- allow non-select statements with SELECT parts (like, e.g.
CREATE TABLE .. SELECT ...) to use loose index scan.
2006-11-28 18:06:47 +02:00
gkodinov/kgeorge@rakia.gmz
fb41ec6f22
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B11927-5.0-opt
2006-11-28 15:47:53 +02:00
gkodinov/kgeorge@macbook.gmz
42cd956752
BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
...
When implicitly converting string fields to numbers the
string-to-number conversion error was not sent to the client.
Added code to send the conversion error as warning.
We also need to prevent generation of warnings from the places
where val_xxx() methods are called for the sole purpose of updating
the Item::null_value flag.
To achieve that a special function is added (and called) :
update_null_value(). This function will set the no_errors flag and
will call val_xxx(). The warning generation in Field_string::val_xxx()
will use the flag when generating the conversion warnings.
2006-11-28 15:44:11 +02:00
monty@mysql.com/nosik.monty.fi
93f246d4c1
Fixed portablity problem
...
Removed warnings from mysqltest scripts
2006-11-28 05:43:30 +02:00
monty@mysql.com/nosik.monty.fi
9c3a2a0d8e
Increased heap max length to > 4G for 64 bit machines
...
Initialize key_part->type on open. This caused key_copy() to fail for bit_fields. (key_copy is used in HANDLER and opt_range)
2006-11-28 00:47:21 +02:00
monty@mysql.com/nosik.monty.fi
73238029bc
Disabled syncronization test at it fails on multiple platforms. (Bug #24529 )
...
Fixed that test_thr_alarm works
2006-11-27 23:19:53 +02:00
gkodinov@dl145s.mysql.com
e74c9add47
Merge bk-internal:/home/bk/mysql-5.0
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-11-27 16:25:52 +01:00
evgen@moonbone.local
b5b7b03ff3
Bug#17254: Error for DEFINER security on VIEW provides too much info
...
If a view was created with the DEFINER security and later the definer user
was dropped then a SELECT from the view throws the error message saying that
there is no definer user is registered. This is ok for a root but too much
for a mere user.
Now the st_table_list::prepare_view_securety_context() function reveals
the absence of the definer only to a superuser and throws the 'access denied'
error to others.
2006-11-27 16:15:32 +03:00
monty@nosik.monty.fi
313f23a93a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into mysql.com:/home/my/mysql-5.1
2006-11-27 14:07:52 +02:00
monty@mysql.com/nosik.monty.fi
fa81a82e7f
Fixed a LOT of compiler warnings
...
Added missing DBUG_RETURN statements (in mysqldump.c)
Added missing enums
Fixed a lot of wrong DBUG_PRINT() statements, some of which could cause crashes
Removed usage of %lld and %p in printf strings as these are not portable or produces different results on different systems.
2006-11-27 01:47:38 +02:00
jani/jamppa@bk-internal.mysql.com
e394d254fb
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2006-11-24 16:46:27 +01:00
anozdrin/alik@booka.
ea47e05f3c
Fix for BUG##24415: Instance manager test im_daemon_life_cycle
...
fails randomly.
The problem was that the test case used command line tool (mysql)
without specifying connect_timeout argument. In some cases,
this lead to hanging of the test case.
The fix is to specify --connect_timeout=1 when starting mysql.
Also, the patch contains polishing and various cleanups to simplify
analyzing of the problems further.
The patch affects only test suite, no server codebase has been
touched.
2006-11-23 22:55:36 +03:00
monty@nosik.monty.fi
89570bf966
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2006-11-22 14:11:36 +02:00