mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-12 18:18:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
47308 commits 2858 branches 349 tags 1.6 GiB
Commit graph

47308 commits

Author SHA1 Message Date
kaa@polly.local
7d2d483615 Corrected the error codes and messages for 5.1. This is to fix PB failures introduced by the patch for bug . 2007-05-31 16:04:58 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
04bdecfe6a merging 2007-05-31 17:01:10 +05:00
georg@bing.mysql.com
9a151eb3c5 fixed not matching if/endif (cmake) 2007-05-31 13:53:44 +02:00
kaa@polly.local
1239481b13 Merge polly.local:/home/kaa/src/maint/bug27643/my51-bug27643 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-05-31 15:05:11 +04:00
kaa@polly.local
054da00167 Merge polly.local:/home/kaa/src/maint/bug27643/my50-bug27643 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2007-05-31 15:01:49 +04:00
kaa@polly.local
16f7290359 Merge polly.local:/home/kaa/src/maint/bug27643/my50-bug27643 
into  polly.local:/home/kaa/src/maint/bug27643/my51-bug27643
 2007-05-31 14:58:22 +04:00
kaa@polly.local
d435b3ed74 Fix for bug "query failed : 1114 (The table '' is full) 
Problem:

HASH indexes on VARCHAR columns with binary collations did not ignore trailing spaces from strings before comparisons. This could result in duplicate records being successfully inserted into a MEMORY table with unique key constraints.

As a direct consequence of the above, internal MEMORY tables used for GROUP BY calculation in testcases for bug  contained duplicate rows which resulted in duplicate key errors when converting those temporary tables to MyISAM. Additionally, that error was incorrectly converted to the 'table is full' error.

Solution:

- ignore trailing spaces in VARCHAR fields with binary collations when calculating hashes.
- return a proper error from create_myisam_from_heap() when conversion fails.
 2007-05-31 14:54:44 +04:00
df@pippilotta.erinye.com
303058014f Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-05-31 12:31:30 +02:00
df@pippilotta.erinye.com
cf9ee7b1c3 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-05-31 12:29:06 +02:00
df@pippilotta.erinye.com
5d77288d3b Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-05-31 12:26:49 +02:00
df@pippilotta.erinye.com
8f4c174e10 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-nn
 2007-05-31 12:24:55 +02:00
df@pippilotta.erinye.com
fc1e038832 fix test case broken for ps-protocol by previous push 2007-05-31 12:21:55 +02:00
holyfoot/hf@hfmain.(none)
cdda302fc1 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-05-31 14:23:45 +05:00
gshchepa/uchum@gleb.loc
7b4ed8001a Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  gleb.loc:/home/uchum/work/bk/mysql-5.1-opt
 2007-05-31 14:02:50 +05:00
kaa@polly.local
f1029f99af Merge polly.local:/home/kaa/src/maint/bug28121/my51-bug28121 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-05-31 12:51:02 +04:00
lars/lthalmann@mysql.com/dl145j.mysql.com
685293b985 Disabled due to valgrind failure (talked to Tomas) 2007-05-31 10:34:22 +02:00
gshchepa/uchum@gleb.loc
89a4d89c26 Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/mysql-5.1-opt
 2007-05-31 13:28:43 +05:00
lars/lthalmann@dl145j.mysql.com
30179dd8c0 Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
 2007-05-31 10:27:53 +02:00
kaa@polly.local
b729e8e2ac Merge polly.local:/home/kaa/src/maint/bug28121/my50-bug28121 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2007-05-31 12:27:12 +04:00
lars/lthalmann@dl145j.mysql.com
73ca08a481 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
 2007-05-31 10:23:37 +02:00
kaa@polly.local
ab37c16a5a Merge polly.local:/home/kaa/src/maint/bug28121/my50-bug28121 
into  polly.local:/home/kaa/src/maint/bug28121/my51-bug28121
 2007-05-31 12:21:21 +04:00
df@pippilotta.erinye.com
ce12b17f0a after-merge fixes: test cases that were moved to extra/binlog_tests do not need to check for binlog being enabled 2007-05-31 10:21:19 +02:00
lars/lthalmann@dl145h.mysql.com
4e90009904 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
 2007-05-31 10:20:58 +02:00
df@pippilotta.erinye.com
d8ab95d8dd Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-05-31 10:13:46 +02:00
df@pippilotta.erinye.com
898b3319f3 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-05-31 10:13:06 +02:00
df@pippilotta.erinye.com
64c191aa44 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-05-31 10:12:37 +02:00
df@pippilotta.erinye.com
82dc913640 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn
 2007-05-31 10:09:34 +02:00
df@pippilotta.erinye.com
718314ff7e test case ps requires binlog for now 2007-05-31 10:07:35 +02:00
df@pippilotta.erinye.com
4f81444fd5 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-nn
 2007-05-31 10:00:49 +02:00
gshchepa/uchum@gleb.loc
be69f13dff Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-28598
 2007-05-31 12:43:59 +05:00
df@pippilotta.erinye.com
779a055ed0 some test cases cannot run with --skip-log-bin 2007-05-31 09:34:24 +02:00
gshchepa/uchum@gleb.loc
e16953dfd8 Fixed bug . 
mysqld crashed when a long-running explain query was killed from
another connection.

When the current thread caught a kill signal executing the function
best_extension_by_limited_search it just silently returned to  
the calling function greedy_search without initializing elements of
the join->best_positions array.
However, the greedy_search function ignored thd->killed status
after a calls to the best_extension_by_limited_search function, and
after several calls the greedy_search function used an uninitialized
data from the join->best_positions[idx] to search position in the
join->best_ref array. 
That search failed, and greedy_search tried to call swap_variables
function with NULL argument - that caused a crash.
 2007-05-31 12:10:21 +05:00
igor@olga.mysql.com
4fb062de84 Post merge fix. 2007-05-31 00:04:03 -07:00
malff/marcsql@weblab.(none)
b2d394787e Build warning cleanup 2007-05-30 17:46:28 -06:00
tsmith@quadxeon.mysql.com
c57839166c Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-05-31 01:02:56 +02:00
tsmith@quadxeon.mysql.com
298e5002e3 mysqldump.c: 
Fix harmless typo (caught thanks to warning)
 2007-05-31 00:40:56 +02:00
tsmith@quadxeon.mysql.com
e97729a38f mysqldump.c: 
Fix harmless typo (caught thanks to warning)
 2007-05-31 00:37:41 +02:00
tsmith@quadxeon.mysql.com
c1c60a17dc Merge tsmith.mysql.internal:m/bk/maint/b4858/51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-05-31 00:29:02 +02:00
tsmith@quadxeon.mysql.com
91c484339c Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-05-30 23:48:20 +02:00
tsmith@quadxeon.mysql.com
64f582396b Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-05-30 23:46:21 +02:00
tsmith@quadxeon.mysql.com
d12181e9d0 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
 2007-05-30 23:45:34 +02:00
dkatz@damien-katzs-computer.local
6490419bb6 Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/mysql51
 2007-05-30 16:45:54 -04:00
dkatz@damien-katzs-computer.local
1ac607be32 Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/50_dump
 2007-05-30 16:42:18 -04:00
kent@kent-amd64.(none)
05c5139854 Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
 2007-05-30 22:18:45 +02:00
kent@kent-amd64.(none)
a1f0ff4bb4 Merge mysql.com:/home/kent/bk/tmp3/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
 2007-05-30 22:15:13 +02:00
kent@mysql.com/kent-amd64.(none)
b217a9e898 Makefile.am, configure.in: 
Added --with-mysqld-libs configure flag
 2007-05-30 22:11:53 +02:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
4835204dcc Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
 2007-05-30 22:33:54 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
95b1be9eb1 bug#22725 
refining the test because of Bug  'reset master' does not reset binlogging on embeded server
 2007-05-30 22:29:15 +03:00
evgen@moonbone.local
85b6e3f00d Bug#28729: Field_enum wrongly reported an error while storing an empty string. 
ENUM fields internally store their values as integers and may use integer
values as indexes to their values. Invalid values are mapped to zero value.
When storing an empty string the ENUM field fails to find an appropriate value
and tries to convert the provided string to integer. The conversion also
fails and error is returned even if the thd->count_cuted_fields is set to
CHECK_FIELD_IGNORE. This makes the range optimizer wrongly decide that an
impossible range is present.

Now the Field_enum::store() returns error while storing an empty string only
if the thd->count_cuted_fields isn't set to CHECK_FIELD_IGNORE.
 2007-05-30 23:28:14 +04:00
kaa@polly.local
d30872b4b2 Got rid of log_01[], because we don't really need it. Division and log_10[] can always be used instead, which is also a more precise way. 
This is for bug .
 2007-05-30 22:47:52 +04:00