mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 21:42:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
36459 commits 2784 branches 343 tags 1.6 GiB
Commit graph

36459 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@pilot.blaudden
3545f28c91 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-05-24 22:26:49 +02:00
msvensson@pilot.blaudden
374de2c7cb Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-05-24 20:51:37 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
6369ff54b7 Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b28464.new/b28464.new.5.0
 2007-05-24 20:21:04 +05:00
msvensson@pilot.blaudden
a99fe7f3d6 Merge pilot.blaudden:/home/msvensson/mysql/bug27438/my50-bug27438 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-05-24 12:04:03 +02:00
msvensson@pilot.blaudden
93b1fe65d8 Bug#26664 test suite times out on OS X 64bit 
- The "mysql client in mysqld"(which is used by
   replication and federated) should use alarms instead of setting
   socket timeout value if the rest of the server uses alarm. By
   always calling 'my_net_set_write_timeout'
   or 'my_net_set_read_timeout' when changing the timeout value(s), the
   selection whether to use alarms or timeouts will be handled by
   ifdef's in those two functions. 
 - Move declaration of 'vio_timeout' into "vio_priv.h"
 2007-05-24 11:21:27 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
6224867b16 Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b28509/b28509.5.0
 2007-05-23 16:31:22 +05:00
msvensson@shellback.(none)
61ed6da11f Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2007-05-23 12:20:11 +02:00
msvensson@shellback.(none)
b34660a877 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
 2007-05-23 12:15:25 +02:00
msvensson@shellback.(none)
933afe6cb4 Bug#27396 Wrong check for root priveledge 
- Check that filemode was set to 0000
 2007-05-23 12:13:49 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
1f9b403b45 Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b28509/b28509.5.0
 2007-05-23 13:48:31 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
f1ae9793a7 Fix for bug #21476: stack overflow crashes server; error-message stack reservation too small 
Increase STACK_BUFF_ALLOC to avoid execution_constants test failure on the hpita2.
 2007-05-22 11:16:29 +05:00
tsmith@quadxeon.mysql.com
b3a84ddd89 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-05-21 20:55:10 +02:00
tsmith@quadxeon.mysql.com
99488b31b9 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-05-21 20:50:08 +02:00
tsmith@quadxeon.mysql.com
2c3bebc570 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
 2007-05-21 20:49:24 +02:00
msvensson@pilot.blaudden
3ad9c30039 Bug#27438 rpl_rotate_logs fails on Windows 
- Fix test case to work also when filesystem time differs
   from mysqld' time. I.e when running with data files on a
   network share.
 2007-05-21 11:33:58 +02:00
msvensson@pilot.blaudden
a3bd588435 Merge pilot.blaudden:/home/msvensson/mysql/bug28401/my50-bug28401 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-05-19 18:22:08 +02:00
msvensson@pilot.blaudden
bc69d072f3 Bug #28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE 
- The SQL commands used by mysql_upgrade are written to be run
    with sql_mode set to '' - thus the scripts should change sql_mode
    for the session to make sure the SQL is legal.
 2007-05-19 18:15:08 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
d5685d4cc4 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-05-18 22:09:15 +05:00
serg@sergbook.mysql.com
c7a4547361 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
 2007-05-18 18:22:38 +02:00
serg@sergbook.mysql.com
11e5fa8f71 added cleanup to some tests 2007-05-18 17:48:44 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
093b0deb06 Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-05-18 20:02:55 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
8b21517de4 Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-05-18 20:02:27 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
38c8951d11 Merge bk@192.168.21.1:mysql-4.1 
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
 2007-05-18 20:01:49 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
11a2fd422b Fox for bug #28509: strange behaviour: passing a decimal value to PS 
Set parameter's type to Item::DECIMAL_ITEM assigning a decimal value.
 2007-05-18 18:16:51 +05:00
msvensson@pilot.blaudden
01ae08078e Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-05-18 12:58:28 +02:00
msvensson@pilot.blaudden
7bc79da2c8 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-05-18 12:58:11 +02:00
msvensson@pilot.blaudden
c3f407a07a Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-05-18 12:56:52 +02:00
msvensson@pilot.blaudden
e05aa94353 WL#2247 mysqltest: add option for sorting results 
- Final touchups
 2007-05-18 12:50:23 +02:00
evgen@moonbone.local
835189cb85 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/28261-bug-5.0-opt-mysql
 2007-05-18 13:39:34 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
63b2e8d9df Fix for bug #28464: a string argument to 'limit ?' PS - replication fails 
Problem: we may get syntactically incorrect queries in the binary log 
if we use a string value user variable executing a PS which 
contains '... limit ?' clause, e.g.
prepare s from "select 1 limit ?"; 
set @a='qwe'; execute s using @a;
  
Fix: raise an error in such cases.
 2007-05-18 12:08:07 +05:00
tsmith@quadxeon.mysql.com
58b409f31a Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-05-18 06:27:07 +02:00
tsmith@quadxeon.mysql.com
ad2b6aea7e my_time.c: 
in number_to_datetime(), zero out the MYSQL_TIME structure
  before setting values, to ensure that all fields are initialized; in
  particular, ensure that ->neg is set to zero (fixes valgrind warning
  "Conditional jump ... depends on uninitialised value" in make_date_time)
 2007-05-18 06:14:37 +02:00
dkatz@damien-katzs-computer.local
89e28d00b0 Bug #27119 server crash with integer division by zero during filesort on huge result 
Fixed a problem and compiler warning on 64bit platforms so that they only allocated UINT_MAX number of BUFFPEKS.
 2007-05-17 20:45:33 -04:00
igor@olga.mysql.com
2189c571b2 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28337
 2007-05-17 16:06:57 -07:00
dkatz@damien-katzs-computer.local
155a098be6 Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/50_div_zero
 2007-05-17 18:02:03 -04:00
dkatz@damien-katzs-computer.local
971d8d0077 Bug #27119 server crash with integer division by zero during filesort on huge result 
Fixed a compiler warning on platforms where uint != ulong from the first pushed fix.
 2007-05-17 17:54:31 -04:00
tsmith@siva.hindu.god
74f00959f0 Merge siva.hindu.god:/home/tsmith/m/bk/maint/41 
into  siva.hindu.god:/home/tsmith/m/bk/maint/50
 2007-05-17 14:26:04 -06:00
tsmith@siva.hindu.god
07c7a25e30 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  siva.hindu.god:/home/tsmith/m/bk/maint/50
 2007-05-17 14:24:52 -06:00
tsmith@siva.hindu.god
30bc713c77 Merge siva.hindu.god:/home/tsmith/m/bk/50 
into  siva.hindu.god:/home/tsmith/m/bk/maint/50
 2007-05-17 14:17:50 -06:00
tsmith@siva.hindu.god
81adc6a5ff Merge siva.hindu.god:/home/tsmith/m/bk/41 
into  siva.hindu.god:/home/tsmith/m/bk/maint/41
 2007-05-17 14:16:33 -06:00
dkatz@damien-katzs-computer.local
c21c22d85f Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/50_div_zero
 2007-05-17 16:07:44 -04:00
evgen@moonbone.local
0e3c4f6729 Bug#28261: Wrong DATETIME comparison result when the GET_USER_VAR function 
is involved.

The Arg_comparator::compare_datetime() comparator caches its arguments if
they are constants i.e. const_item() returns true. The
Item_func_get_user_var::const_item() returns true or false based on
the current query_id and the query_id where the variable was created.
Thus even if a query can change its value its const_item() still will return
true. All this leads to a wrong comparison result when an object of the
Item_func_get_user_var class is involved.

Now the Arg_comparator::can_compare_as_dates() and the
get_datetime_value() functions never cache result of the GET_USER_VAR()
function (the Item_func_get_user_var class).
 2007-05-17 23:09:45 +04:00
tsmith@siva.hindu.god
2703da69ff ps_6bdb.result: 
Fix bad merge of test results
 2007-05-17 12:55:59 -06:00
igor@olga.mysql.com
8c34ae268c Fixed bug #28337: wrong results for grouping queries with correlated 
subqueries in WHERE conditions.
This bug was introduced by the patch for bug 27321.
 2007-05-16 23:42:10 -07:00
dkatz@damien-katzs-computer.local
41dac22271 Bug #27119 server crash with integer division by zero during filesort on huge result 
Added checks to detect integer overflow and fixed other bugs on the error path.
 2007-05-16 16:14:13 -04:00
joerg@trift2.
c90682326e Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  trift2.:/MySQL/M50/push-5.0
 2007-05-16 21:24:54 +02:00
joerg@trift2.
a231b0574b Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-05-16 21:23:15 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
4ac1e98630 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/hf/work/8663/my50-8663
 2007-05-17 00:10:39 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
28eddbe12b Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/8663/my50-8663
 2007-05-17 00:09:43 +05:00
msvensson@pilot.blaudden
4998976d22 Bug#28473 Does mysql-test-run.pl handle LD_LIBRARY_PATH wrong ? 
- Fix spelling error
 2007-05-16 17:51:28 +02:00