knielsen@mysql.com
34cf139bd9
Fix race condition in test case wait_timeout.
...
Sometimes the helper connection (that is watching for the main connection
to time out) would itself time out first, causing the test to fail.
2006-06-24 13:11:09 +02:00
knielsen@mysql.com
f976f27a8f
Build fixes for Windows, Solaris, HPUX, AIX.
2006-06-24 07:45:23 +02:00
rburnett@bk-internal.mysql.com
b1f4ea4555
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-24 06:01:57 +02:00
ngrishakin@mysql.com
d672814403
updated test case ndb_dd_advance
2006-06-24 01:21:08 +02:00
knielsen@devsrv-b.mysql.com
2e08725994
Merge bk-internal:/home/bk/mysql-5.1
...
into mysql.com:/data0/knielsen/tmp-5.1
2006-06-24 00:12:34 +02:00
elliot@mysql.com
a5181fdcde
Post merge fix.
2006-06-23 17:59:24 -04:00
elliot@mysql.com
d4796d9df6
Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.1
2006-06-23 17:27:54 -04:00
ngrishakin@ndb15.mysql.com
bd3ff9eab6
Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/ndbdev/ngrishakin/mysql-5.1
2006-06-23 22:11:28 +02:00
iggy@mysql.com
55bd222b10
Merge mysql.com:/mnt/storeage/mysql-5.0-maint
...
into mysql.com:/mnt/storeage/mysql-5.0-maint_bug20616
2006-06-23 15:38:50 -04:00
iggy@mysql.com
f68b01e347
Bug#20616: drop_temp_table test fails on Windows platform
2006-06-23 12:15:39 -04:00
evgen@moonbone.local
c74cc18789
key.result:
...
After merge fix
2006-06-23 19:36:54 +04:00
andrey@lmy004.
e71ef73d53
Fix for bug #18897 "Events: unauthorized action possible with
...
alter event rename".
ALTER EVENT ... RENAME statement hasn't checked privileges
for the target database. It also caused server crashes when
target database was not specified explicitly and there was
no current database.
This fix adds missing privilege check and check for the case
when target database is not specified explicitly or implicitly.
2006-06-23 17:29:01 +02:00
elliot@mysql.com
d11c890bf1
BUG#20528 Added missing parenthesis to DBUG_PRINT statement
2006-06-23 11:21:57 -04:00
petr@owlet.
f25b7844b2
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/home/cps/mysql/devel/5.1-curs-bug
2006-06-23 18:21:56 +04:00
petr@mysql.com
0da59ab63d
remove links from bk to get rid of warnings on windows
2006-06-23 18:19:14 +04:00
rburnett@bk-internal.mysql.com
d9d2bf5b94
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-23 15:29:33 +02:00
knielsen@rt.int.sifira.dk
4966090d3f
Merge mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2
...
into mysql.com:/usr/local/mysql/tmp-5.1
2006-06-23 15:05:15 +02:00
knielsen@mysql.com
af9e69b512
Merge mysql.com:/usr/local/mysql/mysql-5.0-bug20622
...
into mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2
2006-06-23 14:59:40 +02:00
knielsen@mysql.com
d74a0457b6
Merge mysql.com:/usr/local/mysql/mysql-5.0-bug20622
...
into mysql.com:/usr/local/mysql/tmp-5.0
2006-06-23 14:52:04 +02:00
knielsen@mysql.com
98a5cdfe4c
BUG#20622: Fix one-byte buffer overrun in IM directory string handling.
...
The problem was a call to convert_dirname() with a destination buffer
that did not have room for the trailing slash added by that function.
This could cause the instance manager to crash in some cases.
2006-06-23 14:50:02 +02:00
evgen@moonbone.local
e74c47fb04
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-06-23 16:09:33 +04:00
evgen@moonbone.local
9a9224da68
Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-06-23 14:53:41 +04:00
bar@mysql.com
cfb08851f7
Bug#11228: DESC shows arbitrary column as "PRI"
...
An UNIQUE KEY consisting of NOT NULL columns
was displayed as PRIMARY KEY in "DESC t1".
According to the code, that was intentional
behaviour for some reasons unknown to me.
This code was written before bitkeeper time,
so I cannot check who and why made this.
After discussing on dev-public, a decision
was made to remove this code
2006-06-23 13:19:30 +05:00
monty@hasky.mysql.fi
ebe57fc707
Merge monty@192.168.0.9:/my/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-23 11:01:00 +03:00
monty@mysql.com
059c45d016
Suppress memory leak from 'kill_server'
...
(Happens if main thread exists before kill_server thread, which is ok)
2006-06-23 10:46:16 +03:00
andrey@lmy004.
ef5c261afe
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into lmy004.:/work/mysql-5.1-runtime-bug20624
2006-06-23 09:42:11 +02:00
andrey@lmy004.
08f9d359d4
disable events tests in embedded
...
(fix for bug#20290 Event mechanism incompatible with embedded server, but tests tried)
2006-06-23 09:40:06 +02:00
monty@mysql.com
7ec5a7ecc5
Fixed memory leak (found by rpl_row_inexist_tbl)
2006-06-23 10:35:45 +03:00
igor@rurik.mysql.com
aa3cebe143
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-06-22 20:48:49 -07:00
igor@rurik.mysql.com
faa48bf1a0
Added a test case for bug #18359 .
...
This was another manifestation of the problems fixed in the
patch for bug 16674.
Wrong calculation of length of the search prefix in the pattern
string led here to a wrong result set for a query in 4.1.
The bug could be demonstrated for any multi-byte character set.
2006-06-22 20:39:46 -07:00
monty@hasky.mysql.fi
a4f6871dbc
Merge monty@192.168.0.9:/my/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-23 03:36:16 +03:00
monty@mysql.com
fba475cc47
Fixed problem when compiling libmysqld (without replication)
...
This change allows us to use the stmt_binlog function in the code without ifdefs
(We should avoid having ifdefs in the .cc and .c files)
2006-06-23 03:21:12 +03:00
monty@hasky.mysql.fi
14e05051f1
Merge monty@192.168.0.9:/my/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-23 03:04:13 +03:00
monty@narttu.mysql.fi
a168d1396c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-23 03:03:03 +03:00
monty@mysql.com
4697deb436
Remove compiler warnings
...
Fixed wrong table flags type in ndbcluster that caused previous commit to fail
2006-06-23 02:49:19 +03:00
igor@rurik.mysql.com
98251c62d5
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-06-22 16:18:54 -07:00
igor@rurik.mysql.com
8940231491
Fixed bug #20076 .
...
Server crashed in some cases when a query required a MIN/MAX
agrregation for a 'ucs2' field.
In these cases the aggregation caused calls of the function
update_tmptable_sum_func that indirectly invoked
the method Item_sum_hybrid::min_max_update_str_field()
containing a call to strip_sp for a ucs2 character set.
The latter led directly to the crash as it used my_isspace
undefined for the ucs2 character set.
Actually the call of strip_sp is not needed at all in this
situation and has been removed by the fix.
2006-06-22 15:50:15 -07:00
kent@mysql.com
ef2860e8ff
mysql.spec.sh:
...
Disable the simplistic auto dependency scan for test/bench (bug#20078)
2006-06-23 00:37:31 +02:00
jmiller@mysql.com
3d445c52dd
disabled.def:
...
Enabled rpl_ndb_auto_inc per Tomas and Lars
2006-06-22 23:42:11 +02:00
tnurnberg@mysql.com
1a79cb56f5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/tnurnberg/mysql-5.0-maint-19409
2006-06-22 22:21:43 +02:00
konstantin@mysql.com
40a1c179e6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-runtime
2006-06-23 00:01:30 +04:00
monty@hasky.mysql.fi
9305db78f2
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-22 23:01:01 +03:00
monty@hasky.mysql.fi
2b55a2880e
Merge monty@192.168.0.9:/my/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-22 22:59:47 +03:00
monty@mysql.com
649157954b
Fixed failure with rpl_truncate_7ndb.test when using statement based replication.
...
is_injective -> table_flag() HA_HAS_OWN_BINLOGGING
(Faster and easier to understand)
Allow cluster_binlogging also in mixed replication mode.
2006-06-22 22:44:21 +03:00
pekka@orca.ndb.mysql.com
7524881b50
Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51
...
into clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug14935
2006-06-22 21:22:46 +02:00
pekka@clam.ndb.mysql.com
04b178f451
Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50
...
into clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug18781
2006-06-22 20:59:03 +02:00
tnurnberg@mysql.com
08e5b005b0
#19409 : Test 'func_timestamp' fails on Windows x64
...
- The setting of "ENV{'TZ'}" doesn't affect the timezone
used by MySQL Server on Windows.
- Explicitly set timezone in test cases before doing UTC/localtime
conversions so tests produce deterministic results
2006-06-22 20:50:38 +02:00
acurtis@ltamd64.xiphis.org
04f2451133
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into xiphis.org:/home/antony/work2/p4-bug12096.3
2006-06-22 11:49:35 -07:00
acurtis@bk-internal.mysql.com
bb6be1e196
Merge bk-internal.mysql.com:/data0/bk/tmp-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-engines
2006-06-22 20:47:23 +02:00
tnurnberg@mysql.com
8fd6830478
Bug#19408 Test 'func_time' fails on Windows x64
...
- The setting of "ENV{'TZ'}" doesn't affect the timezone
used by MySQL Server on Windows.
- Explicitly set timezone to "+03:00" in test case before
doing the calculatiosn to check that there is three hours
difference between utc and local time.
(Magnus' fix)
2006-06-22 20:23:22 +02:00