holyfoot/hf@mysql.com/deer.(none)
db5db841a9
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/home/hf/work/mysql-4.1-mrg
2006-11-16 20:44:37 +04:00
msvensson@neptunus.(none)
3eff32965d
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-13 13:33:33 +01:00
msvensson@neptunus.(none)
0ef85c5d8d
Remove the tmp file produced when checking abi
2006-11-13 13:32:39 +01:00
lars@mysql.com/black.(none)
c5d56416ba
Merge mysql.com:/home/bkroot/mysql-5.0-rpl
...
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
2006-11-13 12:44:53 +01:00
msvensson@neptunus.(none)
b6eef63081
remove remnants of abi-check.ic
2006-11-10 16:07:27 +01:00
petr/cps@outpost.site
e06f74f9f9
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191
2006-11-10 15:05:38 +03:00
msvensson@neptunus.(none)
1717e280e0
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-11-08 11:40:33 +01:00
msvensson@neptunus.(none)
546250e244
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-07 12:57:30 +01:00
lars/lthalmann@mysql.com/dl145h.mysql.com
aea1e14ef8
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-11-07 12:02:53 +01:00
anozdrin/alik@alik.
7cf65fd309
Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-rt
...
into alik.:/mnt/raid/alik/MySQL/devel/5.0-merged-5.0-rt
2006-11-07 13:45:56 +03:00
msvensson@neptunus.(none)
9d13ee4c04
Make --mem settable with environment variable MTR_MEM and make it possible to pass the directory to use. I.e --mem=<directory>
2006-11-07 11:07:27 +01:00
holyfoot/hf@mysql.com/deer.(none)
7ddb8b68fa
bug #19491 (5.0-related additional fixes)
2006-11-06 22:33:18 +04:00
petr/cps@outpost.site
bfbf1cdee9
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into outpost.site:/home/cps/mysql/trees/5.0-runtime-bug9191
2006-11-06 00:11:34 +03:00
petr/cps@outpost.site
8de747b0c7
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1-runtime
...
into outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191
2006-11-06 00:05:02 +03:00
msvensson@neptunus.(none)
39a346b79a
Updates for abi_check
2006-11-04 09:23:19 +01:00
msvensson@neptunus.(none)
74496f8d01
Remove sql_state-h from list of include files. (Merge error from 4.1)
2006-11-03 13:02:16 +01:00
msvensson@neptunus.(none)
580b540d25
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-03 11:50:59 +01:00
cmiller@zippy.cornsilk.net
af5acac047
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-11-02 17:39:52 -05:00
cmiller@zippy.cornsilk.net
c34f3219b3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-11-02 17:27:42 -05:00
msvensson@neptunus.(none)
a2e38573bd
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-01 16:11:56 +01:00
petr/cps@mysql.com/owlet.local
7974bf90aa
Merge mysql.com:/home/cps/mysql/trees/4.1-runtime-bug9191
...
into mysql.com:/home/cps/mysql/trees/5.0-runtime-bug9191
2006-11-01 17:35:35 +03:00
petr/cps@mysql.com/owlet.local
3ec542dfbd
Fix Bug #9191 "TIMESTAMP/from_unixtime() no longer accepts 2^31-1"
...
(4.1 version, with post-review fixes)
The fix for another Bug (6439) limited FROM_UNIXTIME() to
TIMESTAMP_MAX_VALUE which is 2145916799 or 2037-12-01 23:59:59 GMT,
however unix timestamp in general is not considered to be limited
by this value. All dates up to power(2,31)-1 are valid.
This patch extends allowed TIMESTAMP range so, that max
TIMESTAMP value is power(2,31)-1. It also corrects
FROM_UNIXTIME() and UNIX_TIMESTAMP() functions, so that
max allowed UNIX_TIMESTAMP() is power(2,31)-1. FROM_UNIXTIME()
is fixed accordingly to allow conversion of dates up to
2038-01-19 03:14:07 UTC. The patch also fixes CONVERT_TZ()
function to allow extended range of dates.
The main problem solved in the patch is possible overflows
of variables, used in broken-time representation to time_t
conversion (required for UNIX_TIMESTAMP).
2006-11-01 16:47:40 +03:00
dlenev@mockturtle.local
5961d4721f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mockturtle.local:/home/dlenev/src/mysql-5.0-hash-2
2006-11-01 16:20:15 +03:00
dlenev@mockturtle.local
bd1b57f930
Small cleanup in code handling stored routines/table prelocking.
...
Use lazy initialization for Query_tables_list::sroutines hash.
This step should significantly decrease amount of memory consumed
by stored routines as we no longer will allocate chunk of memory
required for this HASH for each statement in routine.
2006-11-01 15:41:48 +03:00
bar@mysql.com/bar.intranet.mysql.r18.ru
d18fcb3a0f
Bug#20404: SHOW CREATE TABLE fails with Turkish I
...
Problem: SHOW CREATE TABLE printed garbage in table
name for tables having TURKISH I
(i.e. LATIN CAPITABLE LETTER I WITH DOT ABOVE)
when lower-case-table-name=1.
Reason: In some cases during lower/upper conversion in utf8,
the result string can be shorter the original string
(including the above letter). Old implementation of caseup_str()
and casedn_str() didn't handle the result length properly,
assuming that length cannot change.
This fix changes the result type of cs->cset->casedn_str()
and cs->cset->caseup_str() from VOID to UINT, to return
the result length, as well as put '\0' terminator on a
proper place.
Also, my_caseup_str_utf8() and my_casedn_str_utf8() were
rewritten not to use strlen() for performance purposes.
It was done with help of adding of new functions - my_utf8_uni_no_range()
and my_uni_utf8_no_range() - for null terminated strings.
2006-10-30 14:40:15 +04:00
msvensson@neptunus.(none)
abc1c05449
Update the rules for abi_check
2006-10-27 15:57:00 +02:00
msvensson@neptunus.(none)
6e70b126ed
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-26 22:54:25 +02:00
msvensson@neptunus.(none)
b5b39a4afb
Bug#23427 incompatible ABI change in 5.0.26?
...
- Improve icheck rules in Makefile.am
2006-10-26 22:20:43 +02:00
tsmith/tim@siva.hindu.god
514fd098f2
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-10-25 16:28:42 -06:00
tsmith/tim@siva.hindu.god
3af2089b13
Merge siva.hindu.god:/usr/home/tim/m/bk/g50
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-10-24 14:42:08 -06:00
msvensson@neptunus.(none)
23700ab32b
Update the reference file for mysql API/ABI for 5.0
2006-10-24 22:00:08 +02:00
msvensson@neptunus.(none)
e0985bef96
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 21:05:35 +02:00
msvensson@neptunus.(none)
1a7676fa65
WL#3462 Add testing of MySQL client ABI to prevent unintentional ABI breaks
...
BUG#23427 incompatible ABI change in 5.0.26?
- Use the icheck tool if avaliable and compare the current mysql.h to a version
controlled reference file
2006-10-24 20:32:07 +02:00
holyfoot/hf@mysql.com/deer.(none)
887e6af60c
Merge mysql.com:/home/hf/work/0current_stmt/my41-current_stmt
...
into mysql.com:/home/hf/work/current_stmt/my50-current_stmt
2006-10-24 17:50:46 +05:00
holyfoot/hf@mysql.com/deer.(none)
d0ef58b6a4
Bug #23427 (incompatible ABI change)
...
the incompatibility was caused by current_stmt member added to the MYSQL
structure.
It's possible to move it to THD structure instead which saves ABI
2006-10-24 17:19:02 +05:00
gkodinov@dl145s.mysql.com
b1bd09cbfa
Merge bk-internal:/home/bk/mysql-5.0
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-10-21 09:33:53 +02:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f97fe50dbb
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0.27-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2006-10-21 01:13:50 +02:00
cmiller@zippy.cornsilk.net
482712bf83
Merge zippy.cornsilk.net:/home/cmiller/emergency/mysql-5.0.26a-release
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-10-20 17:30:28 -04:00
cmiller@zippy.cornsilk.net
b96ab282ea
Bug #23427 : incompatible ABI change in 5.0.26?
...
Revert 1 June change enough to restore ABI compatibility with previous
versions.
2006-10-20 17:17:24 -04:00
gkodinov@dl145s.mysql.com
a93cc1b70b
Merge bk-internal:/home/bk/mysql-5.0
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-10-20 11:02:56 +02:00
gkodinov@dl145s.mysql.com
892495acaf
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-10-19 14:37:49 +02:00
istruewing@chilla.local
11d453cc33
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-merge
2006-10-19 09:59:01 +02:00
gkodinov/kgeorge@macbook.gmz
660d724f25
Merge bk-internal:/home/bk/mysql-5.0-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/B22367-5.0-opt-merge
2006-10-17 10:58:01 +03:00
gkodinov/kgeorge@macbook.gmz
a1310d84be
Bug #22367 : Optimizer uses ref join type instead of eq_ref for simple join on
...
strings
MySQL is setting the flag HA_END_SPACE_KEYS for all the keys that reference
text or varchar columns with collation different than binary.
This was done to handle correctly the situation where a lookup on such a key
may return more than 1 row because of the presence of many rows that differ
only by the amount of trailing space in the table's string column.
Inserting such values however appears to violate the unique checks on
INSERT/UPDATE. Thus that flag must not be set as it will prevent the optimizer
from choosing a faster access method.
This fix removes the setting of the HA_END_SPACE_KEYS flag.
2006-10-16 18:09:58 +03:00
msvensson@shellback.(none)
889e7147f6
Add ATTRIBUTE_FORMAT specifier to _db_doprnt, which is used by DBUG_PRINT
...
This will hopefully avoiid annoying crashes when running with --debug
Fix warnings from the above in mysqltest.c
2006-10-12 20:15:56 +02:00
msvensson@shellback.(none)
21e257b9af
Add ATTRIBUTE_FORMAT for _db_doprnt, it will catch problems
...
with DBUG_PRINT format specifiers
2006-10-12 20:02:17 +02:00
holyfoot/hf@mysql.com/deer.(none)
edc9026842
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/home/hf/mysql-5.0.mrg
2006-10-12 13:50:22 +05:00
kaa@polly.local
2667443173
Merge polly.local:/tmp/maint/bug11655/my50-bug11655
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2006-10-12 11:28:44 +04:00
istruewing@chilla.local
3ee35a7618
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-bug8283-one
2006-10-11 22:28:06 +02:00
istruewing@chilla.local
35c94b6e2d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-bug8283
2006-10-11 17:57:47 +02:00