mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
52771 commits 2794 branches 343 tags 1.5 GiB
Commit graph

52771 commits

This branch
This branch
All branches
Author SHA1 Message Date
mkindahl@dl145h.mysql.com
da73cb9930 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2008-01-11 16:32:31 +01:00
mkindahl@dl145h.mysql.com
431199b7a3 Post-merge changes to make tests pass. 2008-01-11 16:26:03 +01:00
kent@kent-amd64.(none)
8ed5fb5aba Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  mysql.com:/home/kent/bk/build/mysql-5.1-build
 2008-01-11 16:25:43 +01:00
dfischer/mysqldev@mysql.com/production.mysql.com
68fb45049b configure.in: 
adjust version string
 2008-01-11 14:47:31 +01:00
mkindahl@dl145h.mysql.com
940ecc23c6 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2008-01-11 14:20:06 +01:00
thek@adventure.(none)
77569d6708 Fixed faulty test case caused by race condition. 2008-01-11 14:16:46 +01:00
serg/mysqldev@janus.mylan/production.mysql.com
c8bbc6ab1e Merge mysql.com:/data0/mysqldev/my/mysql-5.0-release 
into  mysql.com:/data0/mysqldev/users/serg/mysql-5.0-release
 2008-01-11 13:45:20 +01:00
mkindahl@dl145h.mysql.com
d801920c56 Post-merge fixes to make tests pass. 2008-01-11 13:25:26 +01:00
serg/mysqldev@production.mysql.com
fb67e59eb3 Merge janus.mylan:/data0/mysqldev/users/serg/mysql-5.0-release 
into  janus.mylan:/data0/mysqldev/users/serg/mysql-5.1-release
 2008-01-11 13:23:02 +01:00
serg/mysqldev@janus.mylan/production.mysql.com
1cb6ad3c8c Bug#33814 - yassl problems 2008-01-11 13:20:03 +01:00
mkindahl@dl145h.mysql.com
4324a5b6a3 Post-merge fixes to make binlog test suite pass. 2008-01-11 12:35:35 +01:00
gshchepa/uchum@host.loc
32d13ab23d Bug#33699: The UPDATE statement allows NULL as new value on a NOT NULL 
columns (default datatype value is assigned).

The mysql_update function has been modified to generate
an error when trying to set a NOT NULL field to NULL rather than a warning
in the set_field_to_null_with_conversions function.
 2008-01-11 05:06:08 +04:00
kaa@kaamos.(none)
0ef58cfe6b Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-01-10 22:33:29 +03:00
kaa@kaamos.(none)
0cec5f8e4b Merge kaamos.(none):/data/src/mysql-5.1 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-01-10 20:44:23 +03:00
kaa@kaamos.(none)
f8ade5e91b Merge kaamos.(none):/data/src/mysql-5.0 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-01-10 20:43:05 +03:00
epotemkin@bk-internal.mysql.com
a714053711 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2008-01-10 18:03:26 +01:00
evgen@moonbone.local
7f933eb3e0 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/work/33675-bug-5.0-opt-mysql
 2008-01-10 19:23:36 +03:00
evgen@moonbone.local
830b8f0e30 filesort.cc: 
Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
  server crash.
  Free smaller buffer before allocating bigger one.
 2008-01-10 18:54:34 +03:00
sven@riska.(none)
617ea4d631 BUG#27779: Slave cannot read old rows log events. 
Problem: Replication fails when master is mysql-5.1-wl2325-5.0-drop6 and
slave is mysql-5.1-new-rpl. The reason is that, in
mysql-5.1-wl2325-5.0-drop6, the event type id's were different than in
mysql-5.1-new-rpl.
Fix (in mysql-5.1-new-rpl):
 (1) detect that the server that generated the events uses the old
format, by checking the server version of the format_description_log_event
This patch recognizes mysql-5.1-wl2325-5.0-drop6p13-alpha,
mysql-5.1-wl2325-5.0-drop6, mysql-5.1-wl2325-5.0, mysql-5.1-wl2325-no-dd.
 (2) if the generating server is old, map old event types to new event
types using a permutation array.

I've also added a test case which reads binlogs for four different
versions.
 2008-01-10 16:39:44 +01:00
kaa@kaamos.(none)
e11a62776d Post-merge fix after merging 5.0 -> 5.1. Replaced 'byte' with 'uchar'. 2008-01-10 15:07:55 +03:00
kaa@kaamos.(none)
36773c170d Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-01-10 14:35:11 +03:00
kaa@kaamos.(none)
6e60a185d3 Merge kaamos.(none):/data/src/opt/mysql-4.1-opt 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-01-10 14:01:25 +03:00
kaa@kaamos.(none)
df8832bbea Merge kaamos.(none):/data/src/opt/bug33305/my51-bug33305 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-01-10 13:46:34 +03:00
kaa@kaamos.(none)
749157d66e Merge kaamos.(none):/data/src/opt/bug33305/my50-bug33305 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-01-10 13:45:11 +03:00
kaa@kaamos.(none)
8db61db7e1 Merge kaamos.(none):/data/src/opt/bug33305/my50-bug33305 
into  kaamos.(none):/data/src/opt/bug33305/my51-bug33305
 2008-01-10 13:37:54 +03:00
evgen@moonbone.local
165dfa3eba Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/work/33675-bug-5.0-opt-mysql
 2008-01-09 23:19:46 +03:00
gkodinov/kgeorge@macbook.gmz
76c0aefcc2 merge of the fix for bug 33133 to 5.1-opt 2008-01-09 18:00:12 +02:00
gkodinov/kgeorge@macbook.gmz
83012461f0 Merge macbook.gmz:/Users/kgeorge/mysql/work/B33133-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B33133-5.1-opt
 2008-01-09 17:10:09 +02:00
gkodinov/kgeorge@magare.gmz
5a01be841a Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B33133-5.0-opt
 2008-01-09 16:52:11 +02:00
hhunger@hh-nb.hungers
2038eeb82b fixed sorting differences in results. 2008-01-09 15:50:36 +01:00
gkodinov/kgeorge@macbook.gmz
2fc45f017d Bug #33133: Views are not transparent 
When resolving references we need to take into consideration
the view "fields" and allow qualified access to them.
Fixed by extending the reference resolution to process view
fields correctly.
 2008-01-09 16:49:13 +02:00
mats@capulet.kindahl.net
6e94fb84ae Post-merge fixes to make tests pass. 2008-01-09 12:55:04 +01:00
hhunger@hh-nb.hungers
10ba1a635a Disabled storedproc_06 for all engines due to bug 33464. 2008-01-09 10:38:56 +01:00
evgen@moonbone.local
ce111a0d73 Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused 
server crash.

The filesort implementation has an optimization for subquery execution which
consists of reusing previously allocated buffers. In particular the call to
the read_buffpek_from_file function might be skipped when a big enough buffer
for buffer descriptors (buffpeks) is already allocated. Beside allocating
memory for buffpeks this function fills allocated buffer with data read from
disk. Skipping it might led to using an arbitrary memory as fields' data and
finally to a crash.

Now the read_buffpek_from_file function is always called. It allocates
new buffer only when necessary, but always fill it with correct data.
 2008-01-09 00:40:41 +03:00
mats@unknown.kindahl.net
e4bad7a8d0 Post-merge fixes to make tests pass. 2008-01-08 22:22:40 +01:00
davi@mysql.com/endora.local
025aadce8a Bug#29770 Two handlers are allowed to catch an error in an stored procedure. 
Add test case.
 2008-01-08 18:43:25 -02:00
hhunger@hh-nb.hungers
c47c143464 WL#4084: Code changes due to enabled the disabled tests (including other improvements). 2008-01-08 13:56:01 +01:00
gkodinov/kgeorge@macbook.gmz
5b9e61b282 merge of bug 33256 5.0-opt -> 5.1-opt 2008-01-08 12:27:15 +02:00
gkodinov/kgeorge@macbook.gmz
2710053416 Merge macbook.gmz:/Users/kgeorge/mysql/work/B33256-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B33256-5.1-opt
 2008-01-08 11:49:40 +02:00
tsmith@ramayana.hindu.god
c654ac5609 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2008-01-08 00:33:24 -07:00
thek@adventure.(none)
3cd3a40d4d Fixed test layout error. 2008-01-07 21:06:18 +01:00
gkodinov/kgeorge@magare.gmz
7fe932ed82 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B33256-5.0-opt
 2008-01-07 18:55:05 +02:00
hezx@mail.hezx.com
87abfe06e3 Replace one overlooked return with DBUG_RETURN in function log_loaded_block 2008-01-06 20:16:28 +08:00
hezx@mail.hezx.com
e2676d0f1c Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/5.0 
into  mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/mysql-5.0-rpl
 2008-01-06 15:39:46 +08:00
hezx@mail.hezx.com
5a5672d630 Fixed some test case after push of BUG#32205 2008-01-06 15:27:42 +08:00
hezx@mail.hezx.com
44a318efd5 Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#28908/5.0 
into  mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/mysql-5.0-rpl
 2008-01-06 15:18:45 +08:00
hezx@mail.hezx.com
287b981c87 Add missing include test file for rpl_server_id test 2008-01-06 15:17:47 +08:00
hezx@mail.hezx.com
987b67cd01 Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/5.0 
into  mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/mysql-5.0-rpl
 2008-01-06 13:20:52 +08:00
tsmith@ramayana.hindu.god
68980477dd Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2008-01-04 19:59:37 -07:00
tsmith@ramayana.hindu.god
e122756433 Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2008-01-04 19:59:01 -07:00