mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
46613 commits 2788 branches 343 tags 1.7 GiB
Commit graph

46613 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
joerg@trift2.
8a0f37d559 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-05-21 20:34:42 +02:00
joerg@trift2.
bbae855c72 Prevent the failing "jp" suite from causing havoc in release builds (28563). 2007-05-21 20:24:34 +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
holyfoot/hf@hfmain.(none)
a61c5f7722 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-05-20 21:10:44 +05:00
msvensson@pilot.blaudden
4215eb8a50 Bug#28521 Upgrade from 5.1.17 to 5.1.18 breaks events 
- Add test for upgrading from 5.1.17 - it's a beta but anyway
   good to have a check oif upgrading new system tables for 5.1
 - Always put the "originator" column after "comment" to get correct
  order of columns in "events" table
 2007-05-19 18:55:38 +02:00
msvensson@pilot.blaudden
55cdaa7ef7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-05-19 18:25:33 +02:00
msvensson@pilot.blaudden
a518646603 Bug#28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE 
- Upgrade result file for 5.1
 2007-05-19 18:22:55 +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
45c202a3a3 Merge pilot.blaudden:/home/msvensson/mysql/bug28401/my50-bug28401 
into  pilot.blaudden:/home/msvensson/mysql/bug28401/my51-bug28401
 2007-05-19 18:15:40 +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)
e04000ec21 merging 2007-05-18 23:21:34 +05:00
holyfoot/hf@hfmain.(none)
44331376e7 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-05-18 22:12:06 +05: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@hfmain.(none)
e2abd12b79 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-05-18 20:04:39 +05:00
holyfoot/hf@hfmain.(none)
783c7071bf Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-05-18 20:04:01 +05: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
holyfoot/hf@hfmain.(none)
85d5dfedf6 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-05-18 20:00: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
cdef920866 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-05-18 13:01:05 +02: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
cea8860583 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-05-18 12:58:05 +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
joerg@trift2.
4c11cf2dce Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-05-18 12:01:54 +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
d7d56cb6ef Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-05-18 06:50:22 +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
e7977bab61 Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/mysql51
 2007-05-17 20:50:29 -04: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
b1304050e1 Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/mysql51
 2007-05-17 18:11:50 -04: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
0f7d068b05 Merge siva.hindu.god:/home/tsmith/m/bk/maint/50 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-05-17 14:27:14 -06: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
33181d075c Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-05-17 14:24:02 -06:00
tsmith@siva.hindu.god
4a4590cd49 Merge siva.hindu.god:/home/tsmith/m/bk/51 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-05-17 14:21:35 -06:00
dkatz@damien-katzs-computer.local
da10c5dd0b Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/mysql51
 2007-05-17 16:18:35 -04: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