mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
36582 commits 2784 branches 343 tags 1.6 GiB
Commit graph

36582 commits

This branch
This branch
All branches
Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
709cfbc1f8 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-05-21 08:50:21 +02:00
tomas@whalegate.ndb.mysql.com
11feedf073 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-05-21 08:49:49 +02:00
tomas@whalegate.ndb.mysql.com
9f1cba8ec0 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2007-05-21 08:49:15 +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
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
jonas@perch.ndb.mysql.com
990c584e71 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
 2007-05-18 11:43:43 +02:00
jonas@perch.ndb.mysql.com
c50adc2639 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-05-18 11:40:07 +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
jonas@perch.ndb.mysql.com
aa2d7a3f3b Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2007-05-18 11:35:24 +02:00
jonas@perch.ndb.mysql.com
3019b64801 ndb - bug#28443 
review comment 2, atleast 1 signal need for test prg
 2007-05-18 11:34:57 +02:00
jonas@perch.ndb.mysql.com
01bace0468 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-05-18 11:17:27 +02:00
jonas@perch.ndb.mysql.com
0cca72782d Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2007-05-18 11:07:00 +02:00
jonas@perch.ndb.mysql.com
91f3074e31 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
 2007-05-18 11:06:35 +02:00
jonas@perch.ndb.mysql.com
b9fd34a9ff ndb - bug#28443 
review comment
  if some tcp-transporter has data, then do select with timeout 0
 2007-05-18 11:06:03 +02:00
jonas@perch.ndb.mysql.com
a083748c64 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-05-18 10:20:05 +02:00
jonas@perch.ndb.mysql.com
db6f46437f Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
 2007-05-18 10:16:16 +02:00
jonas@perch.ndb.mysql.com
85b607cc20 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2007-05-18 09:56:00 +02:00
jonas@perch.ndb.mysql.com
b26bbbb8ff ndb - bug#28443 
Make sure that data can not e left lingering in receive buffer
 2007-05-18 09:48:52 +02: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
svoj@mysql.com/june.mysql.com
8a809def0a Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-engines
 2007-05-17 15:27:56 +05:00
svoj@mysql.com/june.mysql.com
f6a111dfef Addition to fix for 
BUG#25712 - insert delayed and check table run together report crashed
            tables
Fixed wrongly applied patch.
 2007-05-17 15:23:59 +05:00
svoj@mysql.com/june.mysql.com
cc9d6534e8 Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-engines
 2007-05-17 12:48:10 +05:00
svoj@mysql.com/june.mysql.com
4f11124c48 Addition to fix for 
BUG#25712 - insert delayed and check table run together report
            crashed tables

Let MY_THREADSAFE have distinct value. Some functions call my_seek
passing MyFlags argument directly to it. This may cause unnecessary
locks, which may finally lead to a dead-lock (specifically see my_lock).
 2007-05-17 12:43:52 +05: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
svoj@mysql.com/april.(none)
bf473b1069 Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-engines
 2007-05-17 00:40:26 +05: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