konstantin@mysql.com
f4cc6c4d15
Merge mysql.com:/opt/local/work/mysql-5.0-merge
...
into mysql.com:/opt/local/work/mysql-5.1-merge
2006-01-05 00:38:51 +03:00
knielsen@mysql.com
64f7425ac9
Merge mysql.com:/usr/local/mysql/mysql-5.0-qnxfix
...
into mysql.com:/usr/local/mysql/mysql-5.0
2006-01-04 16:14:49 +01:00
knielsen@mysql.com
d75a9f537e
Merge mysql.com:/usr/local/mysql/mysql-5.0-qnxfix
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-04 16:04:21 +01:00
knielsen@mysql.com
f6b1f10707
Fix QNX test abort in release builds and pushbuild, avoid killing our
...
parent when we are not the process group leader.
2006-01-04 16:02:41 +01:00
knielsen@mysql.com
6f6480b064
BUG#14931: Temporarily add synchronization to avoid sporadic test failures until
...
the bug is fixed.
2006-01-04 15:25:51 +01:00
knielsen@mysql.com
85575904fa
BUG#14931: Temporarily add synchronization to avoid sporadic test failures until
...
the bug is fixed.
2006-01-04 15:25:32 +01:00
mats@mysql.com
588eee80a8
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/bkroot/mysql-5.1-new
2006-01-04 14:10:34 +01:00
mats@mysql.com
c3d029bde5
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/b15924-mysql-5.1-new
2006-01-04 14:05:50 +01:00
mats@mysql.com
e6bd8be4f3
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/b15924-mysql-5.1-new
2006-01-04 14:00:35 +01:00
mats@mysql.com
d2277ec43d
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/b15942-mysql-5.1-new
2006-01-04 13:57:02 +01:00
holyfoot@mysql.com
42dd692212
Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb
2006-01-04 14:28:41 +04:00
holyfoot@deer.(none)
e8697cf428
Big patch to make embedded-server working in 5.x
...
Now it supports queries returning several results
(particularly important with the SP)
2006-01-04 14:20:28 +04:00
knielsen@mysql.com
c2937a3117
Merge mysql.com:/usr/local/mysql/mysql-5.0-qnxtestsock
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-04 10:36:54 +01:00
knielsen@mysql.com
b6faf80f20
Merge mysql.com:/usr/local/mysql/mysql-5.0-qnxtestsock
...
into mysql.com:/usr/local/mysql/mysql-5.0
2006-01-04 10:34:47 +01:00
knielsen@mysql.com
3524b80092
Avoid double slash (//) in socket paths, breaks on QNX.
2006-01-04 10:32:52 +01:00
sergefp@mysql.com
56ba8abd12
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/psergey/mysql-5.1-ppruning-r4
2006-01-04 11:25:48 +03:00
sergefp@mysql.com
93669bfe0b
WL#2985 "Partition Pruning":
...
- post-...-post review fixes
- Added "integer range walking" that allows to do partition pruning for "a <=? t.field <=? b"
by finding used partitions for a, a+1, a+2, ..., b-1, b.
2006-01-04 11:09:01 +03:00
knielsen@mysql.com
a410de984a
BUG#16167: Disable mysqlslap test case until bug is fixed.
2006-01-03 23:37:29 +01:00
gluh@eagle.intranet.mysql.r18.ru
8ce6f3e6ca
Fix for bug#15533 crash, information_schema, function, view
...
enable view prepared mode during getting metedata for I_S table
2006-01-03 14:25:19 +04:00
jonas@perch.ndb.mysql.com
8d756c5bdd
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-01-02 14:49:02 +01:00
mats@mysql.com
23e84337db
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/bkroot/mysql-5.1-new
2006-01-02 14:41:40 +01:00
jonas@perch.ndb.mysql.com
805655d889
bug#16125 - ndb bitfield of exact 32 bits, incorrect assertion (i.e. only noticable in debug compiled)
2006-01-02 14:38:38 +01:00
knielsen@mysql.com
0d58795f7d
Fix mysqlslap problems when running multiple tests in parallel, by setting
...
the mysqlslap lock directory to value of --tmpdir.
2006-01-02 14:14:48 +01:00
mats@mysql.com
19d5515c44
Bug#13115 (CREATE TABLE t2 SELECT a inside SP is not replicated when using RBR):
...
Test passes. Bug was probably fixed in the implementation of WL#2867.
2006-01-02 13:20:17 +01:00
brian@zim.(none)
522a62446c
Cleaned up memory allocation to be a little more staight forward (though I suspect someone will hate my sizeof() increment).
...
Nothing really to see here. Updated comments in code.
More comments are probably needed, but isn't that always the case?
2006-01-01 20:08:45 -08:00
brian@zim.(none)
d4a3fe6e68
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/slap-5.1
2006-01-01 16:47:03 -08:00
brian@zim.(none)
7ce1981bbd
Now uses a single pass testing loop. Dual pass made no sense.
...
Now does averaging when running iterations.
Realligned a bunch of code and continued to remove global variables.
Added CSV output along with printable.
Structures are now provided for print options so adding XML, HTML, ... should now be trivial.
2006-01-01 16:40:02 -08:00
knielsen@mysql.com
6b2771fe92
Revert error in changeset "1.1979 05/12/22 06:39:02 lars@mysql.com" which
...
caused wrong permissions in "make dist".
2006-01-01 22:57:48 +01:00
bar@mysql.com
6ff211329f
WL#1324 table name to file name encoding
...
- Encoding itself, implemented as a charset
"filename". Originally planned to use '.'
as an escape character, but now changed to '@'
for two reasons: "ls" does not return
file names starting with '.' considering them
as a kind of hidden files; some platforms
do not allow several dots in a file name.
- replacing many calls of my_snprintf() and
strnxmov() to the new build_table_filename().
- Adding MY_APPEND_EXT mysys flag, to append
an extention rather that replace it.
- Replacing all numeric constants in fn_format
flag arguments to their mysys definitions, e.g.
MY_UNPACK_FILENAME,
- Predictability in several function/methods:
when a table name can appear with or withot .frm
extension. Some functions/methods were changed
so accept names strictly with .frm, other - strictly
without .frm extensions. Several DBUG_ASSERTs were
added to check whether an extension is passed.
Many files:
table name to file name encoding
mysql_priv.h:
Prototypes for new table name encoding tools.
ctype-utf8.c:
Implementing "filename" charset for
table name to file name encoding.
row0mysql.c:
Fixing table name prefix.
mf_format.c:
Adding MY_APPEND_EXT processing.
Many files:
Fixing tests.
my_sys.h:
Adding new flag to append rather than replace an extension.
m_ctype.h:
Adding "filename" charset definition.
2005-12-31 09:01:26 +04:00
bar@mysql.com
83d8979ca2
backup.result, backup.test:
...
t4 was not dropped, which made the "backup" test fail
if one of the previous tests using t4 (e.g. "archive") failed.
2005-12-30 14:55:56 +04:00
ingo@mysql.com
49e294de70
Merge mysql.com:/home/mydev/mysql-5.0-bug15591
...
into mysql.com:/home/mydev/mysql-5.1-bug15591
2005-12-29 13:37:37 +01:00
ingo@mysql.com
2547cdc7a3
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug15591
2005-12-29 11:07:27 +01:00
msvensson@neptunus.(none)
1faa256931
Merge neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2005-12-29 09:55:09 +01:00
msvensson@neptunus.(none)
43a559ac70
Improved error message for failing with wrong error
2005-12-29 09:48:43 +01:00
msvensson@neptunus.(none)
6de9519966
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug15775_part2/my41-bug15775_part2
2005-12-29 09:19:25 +01:00
sergefp@mysql.com
f2d603c245
WL#2985 "Partition Pruning": post-review fixes: Better comments
2005-12-29 09:32:46 +03:00
msvensson@devsrv-b.mysql.com
0583507f88
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15775_part2/my51-bug15775_part2
...
into devsrv-b.mysql.com:/space/magnus/my51-bug15775_part2
2005-12-28 23:28:45 +01:00
ingo@mysql.com
b1214d232e
Bug#15591 Occasional test suite abort due to port in use
...
If the server is started with --port-open-timeout=#
retry to bind the TCP port if it fails with EADDRINUSE.
Use the new option in mysql-test-run.sh.
2005-12-28 20:30:57 +01:00
evgen@moonbone.local
5a3ce237af
Merge moonbone.local:/work/14583-bug-5.0-mysql
...
into moonbone.local:/work/14583-bug-5.1-new-mysql
2005-12-28 19:47:56 +03:00
msvensson@devsrv-b.mysql.com
45864dbf4b
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2
...
into devsrv-b.mysql.com:/space/magnus/my50-bug15775_part2
2005-12-28 17:37:28 +01:00
evgen@moonbone.local
45abf0dabd
Manual merge
2005-12-28 17:23:08 +03:00
msvensson@neptunus.(none)
6717a17fe7
Merge neptunus.(none):/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2
...
into neptunus.(none):/home/msvensson/mysql/bug15775_part2/my51-bug15775_part2
2005-12-28 14:46:00 +01:00
msvensson@neptunus.(none)
e1ef24e38c
Bug #15775 "drop user" command does not refresh acl_check_hosts
...
- Update patch for 5.0
- Added common function to be called when 'acl_users' has been modified
2005-12-28 14:43:50 +01:00
evgen@moonbone.local
535b23bec5
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/14583-bug-4.1-mysql
2005-12-28 16:00:10 +03:00
msvensson@neptunus.(none)
cdd1f5c6fc
Merge neptunus.(none):/home/msvensson/mysql/bug15775_part2/my41-bug15775_part2
...
into neptunus.(none):/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2
2005-12-28 09:31:40 +01:00
msvensson@neptunus.(none)
2fb6cb5a5a
BUG#15775 "drop user" command does not refresh acl_check_hosts
...
- DROP USER command didn't reload the acl_check_hosts cache causing subsequent
connect's via TCP to fail randomly.
- 4.1 version
2005-12-28 09:23:27 +01:00
stewart@mysql.com
cac298e07b
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
...
into mysql.com:/home/stewart/Documents/MySQL/5.1/new
2005-12-28 13:55:59 +11:00
ingo@mysql.com
bd1b724bbf
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug5390
2005-12-27 19:25:54 +01:00
evgen@moonbone.local
d91cbf34ff
Fix bug#14583
...
When InnoDB compares varchar field in ucs2 with given key using bin collation,
it calls my_strnncollsp_ucs2_bin() to perform comparison.
Because field length was lesser than length of key field should be padded
with trailing spaces in order to get correct result.
Because my_strnncollsp_ucs2_bin() was calling my_strnncollp_ucs2_bin(), which
doesn't pads field, wrong comparison result was returned. This results in
wrong result set.
my_strnncollsp_ucs2_bin() now compares fields like my_strnncollsp_ucs2 do,
but using binary collation.
2005-12-27 20:16:59 +03:00
stewart@mysql.com
efbdf7b225
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
2005-12-28 00:57:18 +11:00