holyfoot/hf@hfmain.(none)
db2b40b426
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/hf/work/29687/my51-29687
2007-07-19 21:03:26 +05:00
holyfoot/hf@hfmain.(none)
1657b9e356
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/29687/my51-29687
2007-07-19 21:02:11 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
d0272fe1d5
test case for memory leak added
2007-07-19 20:59:11 +05:00
holyfoot/hf@hfmain.(none)
a49bc17fe8
Merge mysql.com:/home/hf/work/29687/my50-29687
...
into mysql.com:/home/hf/work/29687/my51-29687
2007-07-19 20:58:04 +05:00
gshchepa/uchum@gleb.loc
dfd82a6b74
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-19 20:06:55 +05:00
gshchepa/uchum@gleb.loc
35a2a20160
Merge gleb.loc:/home/uchum/work/bk/5.1
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-19 20:01:13 +05:00
gshchepa/uchum@gleb.loc
d5f2133bc3
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-07-19 19:57:53 +05:00
gshchepa/uchum@gleb.loc
d5c8c8cc66
mysqldump.result:
...
Post-merge fix.
2007-07-19 14:56:04 +05:00
gshchepa/uchum@gleb.loc
7481113f1b
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-19 14:23:53 +05:00
gshchepa/uchum@gleb.loc
77ec161c42
Merge gleb.loc:/home/uchum/work/bk/5.0-opt-28524
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-07-19 10:54:39 +05:00
gkodinov/kgeorge@magare.gmz
d5a0cf134b
5.0-opt -> 5.1-opt merge
2007-07-18 18:08:05 +03:00
gshchepa/uchum@gleb.loc
3f91aedadb
Fixed bug #28524 .
...
For each view the mysqldump utility creates a temporary table
with the same name and the same columns as the view
in order to satisfy views that depend on this view.
After the creation of all tables, mysqldump drops all
temporary tables and creates actual views.
However, --skip-add-drop-table and --compact flags disable
DROP TABLE statements for those temporary tables. Thus, it was
impossible to create the views because of existence of the
temporary tables with the same names.
2007-07-18 19:14:48 +05:00
gkodinov/kgeorge@magare.gmz
aeddb42304
Merge magare.gmz:/home/kgeorge/mysql/work/B29325-my_errno-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/merge-5.0-5.1-opt
2007-07-18 15:57:17 +03:00
gkodinov/kgeorge@magare.gmz
f6225e2048
Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/merge-5.0-5.1-opt
2007-07-18 15:56:29 +03:00
gkodinov/kgeorge@magare.gmz
94535ca828
Bug #29325 : create table overwrites .MYD file of other
...
table (datadir)
Set errno when retunring an error in my_create_with_symlink.
2007-07-18 15:33:41 +03:00
sergefp@mysql.com
4f579b8d0e
Mark deadcode for gcov
2007-07-18 11:12:15 +04:00
sergefp@mysql.com
2e21c6e771
Mark deadcode for gcov
2007-07-18 00:29:25 +04:00
sergefp@mysql.com
b38206978d
Small comments fix
2007-07-17 22:46:51 +04:00
sergefp@pylon64.mylan
82973c72ae
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.0-bug29740
2007-07-17 19:53:33 +04:00
sergefp@mysql.com
651e6ffa66
[pb problem]: ha_heap->clone() fails on windows because of mess with
...
'/' and '\' in path delimiters:
- Fix this by creating new handler with exactly the same path line as
was passed to ha_create/ha_open.
2007-07-17 19:51:50 +04:00
kostja@bodhi.(none)
0d027edd6a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-17 13:32:19 +04:00
kostja@bodhi.(none)
19a19f81e8
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-17 13:13:49 +04:00
kostja@bodhi.(none)
6b3784870c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-17 13:10:02 +04:00
kostja@bodhi.(none)
948ba7b7fb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-07-17 13:08:23 +04:00
svoj@june.mysql.com
cb995365fb
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into mysql.com:/home/svoj/devel/mysql/test/mysql-5.1-engines
2007-07-17 13:20:32 +05:00
istruewing@chilla.local
db2884a530
Disabled a test case that reports an error on OSX.
2007-07-17 09:52:55 +02:00
istruewing@chilla.local
ba177535f5
Post-merge fixes
...
Disabled test cases that produce errors in a "server log".
2007-07-17 09:25:01 +02:00
kostja@bodhi.(none)
97bdd8030b
Fix a build break on 64 bit (uint and size_t are distinct types).
2007-07-17 01:30:57 +04:00
istruewing@chilla.local
dd7e9b9a42
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-07-16 23:21:08 +02:00
istruewing@chilla.local
acd2c62fd1
Merge chilla.local:/home/mydev/mysql-5.1-amain
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-07-16 23:19:45 +02:00
kostja@bodhi.(none)
0e92e434d1
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-17 01:06:47 +04:00
kostja@bodhi.(none)
b8fc731804
Post-merge fixes (merge from the main).
2007-07-17 00:59:21 +04:00
kostja@bodhi.(none)
7989c712a6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-07-16 23:41:28 +04:00
kostja@bodhi.(none)
c8a651bb41
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-16 23:38:55 +04:00
kostja@bodhi.(none)
1ecb226efa
Bug#29050 Creation of a legal stored procedure fails if a database is not
...
selected prior: ensure the fix also works for information_schema
tables.
2007-07-16 23:37:02 +04:00
kostja@bodhi.(none)
88fc7cab26
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-16 23:31:36 +04:00
istruewing@chilla.local
62620ecb4e
Merge chilla.local:/home/mydev/mysql-5.0-amain
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-07-16 20:39:05 +02:00
kostja@bodhi.(none)
06d656b808
Fix ndb_cache* test failures in the -runtime tree.
...
Do not try to acquire structure_guard_mutex for the second time
when invalidating a table from send_result_to_client.
2007-07-16 22:34:36 +04:00
istruewing@chilla.local
7f6bf17bab
Post-merge fix
...
Disabled a test that reports Slave SQL error in warnings file.
2007-07-16 16:12:05 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
dfc38479ea
Bug #29687 mysql_stmt_store_result memory leak in libmysqld
...
In embedded server we use result->alloc to store field data for the
result, but we didn't clean the result->alloc if the query returned
an empty recordset. Cleaning for the empty recordset enabled
2007-07-16 19:08:07 +05:00
kostja@bodhi.(none)
be4f73c44f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-16 17:22:33 +04:00
kostja@bodhi.(none)
eec9f7c59d
A follow up after the fix for Bug#21074 - fix NDB tests breaking on
...
asserts.
The patch for Bug#21074 replaces acquisition of the global LOCK_open lock
with exclusive locks on table names in such operations ad DROP TABLE
and RENAME TABLE.
Unfortunately, NDB internally assumes that LOCK_open is acquired and
tries to release it.
This dependency should be fixed by a separate (and significant in size)
patch. For now we just satisfy it - after all, the original
goal of the patch for Bug#21074 was to move query_cache_invalidate
outside of the scope of LOCK_open, and we still can do that.
This fixes some failing NDB tests in the runtime tree.
2007-07-16 15:57:20 +04:00
df@pippilotta.erinye.com
28a620213f
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
2007-07-16 12:42:14 +02:00
dfischer/mysqldev@mysql.com/production.mysql.com
c04ae188f5
Raise version number after cloning 5.0.46
2007-07-16 12:42:12 +02:00
svoj@mysql.com/june.mysql.com
ee13e03ca0
BUG#29807 - innodb_mysql.test: Cannot find table test/t2 from the
...
internal data dictionary
- re-enabled innodb_mysql test;
- added a rule to through away expected warning to mtr_report.pl;
- fixed a test case to produce unique warning.
2007-07-16 15:09:46 +05:00
evgen@moonbone.local
17654758a4
item_cmpfunc.cc:
...
A typo fixed.
2007-07-16 01:03:58 +04:00
evgen@moonbone.local
49db78b382
item_cmpfunc.cc:
...
Fixed compiler warning.
2007-07-16 00:59:47 +04:00
evgen@moonbone.local
9dc929f2b4
item_cmpfunc.cc:
...
A comment changed.
2007-07-15 23:40:57 +04:00
evgen@moonbone.local
975d22327e
Extended fix for the bug#29555.
...
The get_time_value function is added. It is used to obtain TIME values both
from items the can return time as an integer and from items that can return
time only as a string.
The Arg_comparator::compare_datetime function now uses pointer to a getter
function to obtain values to compare. Now this function is also used for
comparison of TIME values.
The get_value_func variable is added to the Arg_comparator class.
It points to a getter function for the DATE/DATETIME/TIME comparator.
2007-07-15 21:51:36 +04:00
istruewing@chilla.local
e819c326ed
Post-merge fixes
...
Disabled tests which break automatic merging due to
non-empty warnings file.
2007-07-15 18:47:57 +02:00