Commit graph

19871 commits

Author SHA1 Message Date
kaa@polly.(none)
8f13b541a7 Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-12-01 10:53:50 +03:00
kaa@polly.(none)
109c0439c0 Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
2007-12-01 10:29:43 +03:00
kaa@polly.(none)
7fd9135bb8 Fix for bug #26788 "mysqld (debug) aborts when inserting specific
numbers into char fields" and bug #12860 "Difference in zero padding of
exponent between Unix and Windows"

Rewrote the code that determines what 'precision' argument should be
passed to sprintf() to fit the string representation of the input number
into the field.
We get finer control over conversion by pre-calculating the exponent, so
we are able to determine which conversion format, 'e' or 'f', will be
used by sprintf().
We also remove the leading zero from the exponent on Windows to make it
compatible with the sprintf() output on other platforms.
2007-12-01 10:05:59 +03:00
tnurnberg@white.intern.koehntopp.de
7c0c9db590 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/misc/mysql/24907/51-24907
2007-11-17 19:44:19 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
909fcea6e1 Bug#24907: unpredictable (display) precission, if input precission increases
post-merge fixes: some things work differently in 5.1
2007-11-17 19:42:16 +01:00
tnurnberg@white.intern.koehntopp.de
18fc735701 Merge mysql.com:/misc/mysql/24907/50-24907
into  mysql.com:/misc/mysql/24907/51-24907
2007-11-17 19:12:36 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
6889c82997 Bug#24907: unpredictable (display) precission, if input precission increases
Server failed in assert() when we tried to create a DECIMAL() temp field
with a scale of more than the allowed 30. Now we limit the scale to the
allowed maximum. A truncation warning is thrown as necessary.
2007-11-17 19:05:31 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
1a67f6d702 Merge mysql.com:/home/ram/work/mysql-5.1-maint
into  mysql.com:/home/ram/work/b26447/b26447.5.1
2007-11-14 11:58:41 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
2691d9b1a9 manual merge. 2007-11-10 18:57:09 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
c102112f09 Merge mysql.com:/home/ram/work/b32137/b32137.5.0
into  mysql.com:/home/ram/work/b32137/b32137.5.1
2007-11-10 18:43:44 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
f3813c920e manual merge. 2007-11-10 18:27:57 +04:00
msvensson@pilot.mysql.com
04ed1811e3 Bug#32217 rpl_ssl fails with different number of records on master and slave
- Add debug queries
2007-11-09 11:16:47 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
dc8d3d0bec Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB
and auto_increment keys

Problems: 
  1. ALTER TABLE ... ORDER BY... doesn't make sence if there's a 
     user-defined clustered index in the table.
  2. using a secondary index is slower than using a clustered one 
     for a table scan.

Fixes:
  1. raise a warning.
  2. use the clustered index.
2007-11-07 19:59:58 +04:00
msvensson@pilot.mysql.com
64019f014d Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
2007-11-06 11:07:30 +01:00
msvensson@pilot.mysql.com
f6ffb2cf8c Bug#30630 mysql-test-run all tests fail with MySQL 5.0.41 & 5.0.45 on Mac OS X Server 10.5 2007-11-01 19:40:27 +01:00
msvensson@pilot.mysql.com
925f4dac99 Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
2007-11-01 16:55:16 +01:00
msvensson@pilot.mysql.com
441bb13e0d Bug#27753 enable mysql-test-run.pl to ignore tests based on wildcard
- Fix problem in first implementation
2007-11-01 11:02:28 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
c41f8b65b5 Merge mysql.com:/home/ram/work/mysql-5.1-maint
into  mysql.com:/home/ram/work/b30679/b30679.5.1
2007-10-31 11:40:53 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
030d1a1945 Merge mysql.com:/home/ram/work/mysql-5.1-maint
into  mysql.com:/home/ram/work/b30654/b30654.5.1
2007-10-31 11:01:52 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
52b3e4a7e2 Merge mysql.com:/home/ram/work/mysql-5.0-maint
into  mysql.com:/home/ram/work/b30654/b30654.5.0
2007-10-31 11:01:06 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
0a11bc2a1f Merge mysql.com:/home/ram/work/b30654/b30654.5.0
into  mysql.com:/home/ram/work/b30654/b30654.5.1
2007-10-31 10:57:10 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
38b3b36754 Fix for bug #30654: mysqlcheck fails during upgrade of tables whose
names include backticks or blank

Problem: mysqlcheck doesn't escape backtick characters in the table names.

Fix: escape them.
2007-10-30 12:51:57 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
15e5e92383 Merge mysql.com:/home/ram/work/mysql-5.0-maint
into  mysql.com:/home/ram/work/b31137/b31137.5.0
2007-10-29 20:43:57 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
9d57de144f after-merge fix-up. 2007-10-29 20:31:03 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
16744e2ee9 Merge mysql.com:/home/ram/work/mysql-5.0-maint
into  mysql.com:/home/ram/work/b30782/b30782.5.0
2007-10-29 13:42:02 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
1317a63b40 Merge mysql.com:/home/ram/work/b30782/b30782.5.0
into  mysql.com:/home/ram/work/b30782/b30782.5.1
2007-10-29 13:16:26 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
98a4d99961 Fix for bug #30782: Truncated UNSIGNED BIGINT columns only in SELECT w/ CASE,
JOIN, and ORDER BY

Problem: improper maximum length calculation of the CASE function leads to 
decimal value truncation (storing/retrieving decimal field values).

Fix: accurately calculate maximum length/unsigned flag/decimals parameters 
of the CASE function.
2007-10-29 12:20:21 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
8ec674dd0c Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0,
file .\ha_innodb.

Problem: if a partial unique key followed by a non-partial one we declare
the second one as a primary key.

Fix: sort non-partial unique keys before partial ones.
2007-10-26 15:37:38 +05:00
kaa@polly.(none)
7fab2f1414 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-24 23:07:10 +04:00
kaa@polly.(none)
63ca7570af Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-24 21:39:00 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
bb79b4662f Fix for bug #30679: 5.1 name encoding not performed for views during upgrade
Problem: we skip views perfoming --fix-table-names.

Fix: rename views as well.
2007-10-24 22:36:57 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
1cf8aaff52 Merge mysql.com:/home/ram/work/mysql-5.0-maint
into  mysql.com:/home/ram/work/b31615/b31615.5.0
2007-10-24 21:57:51 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
d05c05a8ca Merge mysql.com:/home/ram/work/mysql-5.1-maint
into  mysql.com:/home/ram/work/b31615/b31615.5.1
2007-10-24 21:56:32 +05:00
msvensson@pilot.mysql.com
d3293988d8 Merge bk-internal:/home/bk/mysql-5.1-maint
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
2007-10-24 08:35:22 +02:00
msvensson@pilot.mysql.com
2f852c126f Merge bk-internal:/home/bk/mysql-5.1-maint
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
2007-10-23 13:16:31 +02:00
msvensson@pilot.mysql.com
d3527572d5 Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
2007-10-23 13:16:15 +02:00
msvensson@pilot.mysql.com
a8fedcb4d4 Merge pilot.mysql.com:/data/msvensson/mysql/bug30560/my50-bug30560
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
2007-10-23 13:15:35 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
a24102a099 Merge mysql.com:/home/ram/work/b31615/b31615.5.0
into  mysql.com:/home/ram/work/b31615/b31615.5.1
2007-10-23 16:14:06 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
08a7c95ad3 Merge mysql.com:/home/ram/work/b31615/b31615.4.1
into  mysql.com:/home/ram/work/b31615/b31615.5.0
2007-10-23 16:04:32 +05:00
msvensson@pilot.mysql.com
2595a8d01b Merge pilot.mysql.com:/data/msvensson/mysql/bug30560/my50-bug30560
into  pilot.mysql.com:/data/msvensson/mysql/bug30560/my51-bug30560
2007-10-23 12:54:26 +02:00
tnurnberg@white.intern.koehntopp.de
b3c2bc8cc4 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/scratch/tnurnberg/20901/51-20901
2007-10-23 12:38:09 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
017ba8dadb Merge mysql.com:/home/ram/work/mysql-5.1-maint
into  mysql.com:/home/ram/work/b31604/b31604.5.1
2007-10-23 15:26:14 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
dbadc0e2cc Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/ram/work/b31349/b31349.5.0
2007-10-23 15:14:58 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
ccb83d681e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/home/ram/work/b31349/b31349.5.1
2007-10-23 15:13:47 +05:00
msvensson@pilot.mysql.com
acd497ad71 Bug#30560 Valgrind option to mysql-test-run with spaces in cause strange error 2007-10-23 11:52:55 +02:00
kaa@polly.(none)
e10f699931 Merge polly.(none):/home/kaa/src/maint/bug30453/my51-bug28878
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-23 13:39:31 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
30b8fdf535 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/home/ram/work/b31604/b31604.5.1
2007-10-23 14:31:53 +05:00
kaa@polly.(none)
0aa8710037 Merge polly.(none):/home/kaa/src/maint/bug30453/my50-bug28878
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-10-23 13:31:24 +04:00
kaa@polly.(none)
5fe9f0f7dd Merge polly.(none):/home/kaa/src/maint/bug30453/my50-bug28878
into  polly.(none):/home/kaa/src/maint/bug30453/my51-bug28878
2007-10-23 13:19:54 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
488e3e4943 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/home/ram/work/b31349/b31349.5.1
2007-10-23 14:07:44 +05:00