database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-18 07:48:43 +03:00
Code Activity
57,505 Commits 3,279 Branches 1,097 Tags
b22d02ad42880f37a4fe896fc69a0a33798eaeda
Commit Graph

24084 Commits

Author SHA1 Message Date
gluh@eagle.(none)
237383f0fe Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-10-23 18:51:43 +05:00
kaa@polly.(none)
173108956a Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt 
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
 2007-10-23 16:24:56 +04:00
kaa@polly.(none)
6832d2cc1b Merge polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550 
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
 2007-10-23 16:07:03 +04:00
kaa@polly.(none)
23c65a3b01 Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
 2007-10-23 16:03:48 +04:00
kaa@polly.(none)
17a533e0d0 Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 
into  polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550
 2007-10-23 15:52:27 +04:00
gkodinov/kgeorge@magare.gmz
58bce232a8 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-5.1-opt
 2007-10-23 14:28:50 +03:00
gkodinov/kgeorge@magare.gmz
7ac179bc34 merge 5.0-opt -> 5.1-opt for bug 30825 2007-10-23 14:26:57 +03:00
gkodinov/kgeorge@magare.gmz
7c344185bd Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B28687-5.1-opt
 2007-10-23 14:21:50 +03:00
gshchepa/uchum@gleb.loc
5adc332c63 Fixed bug #31663: if the FIELDS TERMINATED BY string 
in the SELECT INTO OUTFILE clause starts with a special
character (one of n, t, r, b, 0, Z or N) and ENCLOSED BY
is empty, every occurrence of this character within a
field value is duplicated.

Duplication has been avoided.
New warning message has been added: "First character of
the FIELDS TERMINATED string is ambiguous; please use
non-optional and non-empty FIELDS ENCLOSED BY".
 2007-10-23 16:16:59 +05:00
msvensson@pilot.mysql.com
2f852c126f Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
 2007-10-23 13:16:31 +02:00
msvensson@pilot.mysql.com
d3527572d5 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
 2007-10-23 13:16:15 +02:00
msvensson@pilot.mysql.com
a8fedcb4d4 Merge pilot.mysql.com:/data/msvensson/mysql/bug30560/my50-bug30560 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
 2007-10-23 13:15:35 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
a24102a099 Merge mysql.com:/home/ram/work/b31615/b31615.5.0 
into  mysql.com:/home/ram/work/b31615/b31615.5.1
 2007-10-23 16:14:06 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
08a7c95ad3 Merge mysql.com:/home/ram/work/b31615/b31615.4.1 
into  mysql.com:/home/ram/work/b31615/b31615.5.0
 2007-10-23 16:04:32 +05:00
msvensson@pilot.mysql.com
2595a8d01b Merge pilot.mysql.com:/data/msvensson/mysql/bug30560/my50-bug30560 
into  pilot.mysql.com:/data/msvensson/mysql/bug30560/my51-bug30560
 2007-10-23 12:54:26 +02:00
tnurnberg@white.intern.koehntopp.de
b3c2bc8cc4 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/scratch/tnurnberg/20901/51-20901
 2007-10-23 12:38:09 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
017ba8dadb Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b31604/b31604.5.1
 2007-10-23 15:26:14 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
dbadc0e2cc Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b31349/b31349.5.0
 2007-10-23 15:14:58 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
ccb83d681e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b31349/b31349.5.1
 2007-10-23 15:13:47 +05:00
gkodinov/kgeorge@magare.gmz
62737d6d42 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
 2007-10-23 13:10:35 +03:00
msvensson@pilot.mysql.com
acd497ad71 Bug#30560 Valgrind option to mysql-test-run with spaces in cause strange error 2007-10-23 11:52:55 +02:00
kaa@polly.(none)
e10f699931 Merge polly.(none):/home/kaa/src/maint/bug30453/my51-bug28878 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-10-23 13:39:31 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
30b8fdf535 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b31604/b31604.5.1
 2007-10-23 14:31:53 +05:00
kaa@polly.(none)
0aa8710037 Merge polly.(none):/home/kaa/src/maint/bug30453/my50-bug28878 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-10-23 13:31:24 +04:00
kaa@polly.(none)
5fe9f0f7dd Merge polly.(none):/home/kaa/src/maint/bug30453/my50-bug28878 
into  polly.(none):/home/kaa/src/maint/bug30453/my51-bug28878
 2007-10-23 13:19:54 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
488e3e4943 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b31349/b31349.5.1
 2007-10-23 14:07:44 +05:00
gluh@mysql.com/eagle.(none)
29ea825e57 Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
 2007-10-23 14:06:56 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
d035e5c8f9 Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b31349/b31349.5.0
 2007-10-23 14:06:26 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
c7528dff69 Merge mysql.com:/home/ram/work/b31349/b31349.5.0 
into  mysql.com:/home/ram/work/b31349/b31349.5.1
 2007-10-23 13:55:06 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
a3bc9cd136 Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b31604/b31604.5.1
 2007-10-23 13:54:40 +05:00
gkodinov/kgeorge@magare.gmz
3553f6eac2 Merge magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B30825-5.1-opt
 2007-10-23 11:44:14 +03:00
gkodinov/kgeorge@magare.gmz
d066e2173c Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
 2007-10-23 11:26:37 +03:00
gkodinov/kgeorge@magare.gmz
0a14d1a19b Merge magare.gmz:/home/kgeorge/mysql/work/B28687-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B28687-5.1-opt
 2007-10-23 11:22:59 +03:00
gluh@mysql.com/eagle.(none)
ffea2073b1 Bug#31633 Information schema = NULL queries crash the server 
added correct handling of NULL values for lookup fields
 2007-10-23 13:20:51 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
4b7a4efa4f Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b31285/b31285.5.1
 2007-10-23 13:05:40 +05:00
tnurnberg@mysql.com/white.intern.koehntopp.de
e9229319c9 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/scratch/tnurnberg/20901/51-20901
 2007-10-23 08:54:20 +02:00
tnurnberg@mysql.com/white.intern.koehntopp.de
b7599f4b1b Merge mysql.com:/scratch/tnurnberg/20901/50-20901 
into  mysql.com:/scratch/tnurnberg/20901/51-20901
 2007-10-23 07:09:56 +02:00
tnurnberg@mysql.com/white.intern.koehntopp.de
90f391c013 Bug #20901: CREATE privilege is enough to insert into a table 
CREATE TABLE IF NOT EXISTS ... SELECT let you insert into an existing
table as long as you had the CREATE privilege.  CREATE ... SELECT
variants now always require INSERT privilege on target table.
 2007-10-23 07:09:16 +02:00
tnurnberg@mysql.com/white.intern.koehntopp.de
30de60877c Merge mysql.com:/scratch/tnurnberg/20901/41-20901 
into  mysql.com:/scratch/tnurnberg/20901/50-20901
 2007-10-23 07:00:13 +02:00
tnurnberg@mysql.com/white.intern.koehntopp.de
c085e424f6 Bug #20901: CREATE privilege is enough to insert into a table 
CREATE TABLE IF NOT EXISTS ... SELECT let you insert into an existing
table as long as you had the CREATE privilege.  CREATE ... SELECT
variants now always require INSERT privilege on target table.
 2007-10-23 06:54:31 +02:00
dkatz@damien-katzs-computer.local
5b01a77c9c Bug #31332 --event-scheduler option misbehaving 
Changed the behaviour of the --event-scheduler option when used without an arguments. It
now turns the option on.
 2007-10-22 15:16:43 -04:00
aelkin/elkin@koti.dsl.inet.fi
271c98d067 Bug #30594 rpl.rpl_skip_error is nondeterministic 
Non-determinism in the tests was due to results of SBR are different from those gained
with row binlog format.

Because tests effectively verify skipping only ER_DUP_ENTRY it is explicitly required
to run the test on in mixed and stmt binlog format.
ER_DUP_ENTRY is automatically ignored when happened in RBR because of implicit rule
favoring reentrant reading from binlog rule
which means that a Write_rows_log_event overwrites a slave's row
if the one has the same primary key.

If future we might have skipping error due to applying of row-based events.
The comments added saying a new file would be needed for that: rpl_row_skip_error or smth.
 2007-10-22 21:45:21 +03:00
mleich@four.local.lan
51fd4937c4 This changeset contains the following stuff: 
- Fix for
    Bug#28827 Partition test needs archive engine
    Bug#26669 Two tests on partition fail while blackhole engine is missing
  Solution: Move ARCHIVE and BLACKHOLE sub test cases to their own main test.
- The two bugs above + the fact that CSV could be also sometimes not
  available --> Move also CSV sub tests out.
- Minor cleanups
  - Replace error numbers with error names
  - fix typos, wrong comments
  - remove redundant sub test cases
  - add missing drop database
  - SET GLOBAL general_log = default is wrong, = 1 is correct
 2007-10-22 20:10:51 +02:00
serg@janus.mylan
f86510e45e Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-10-22 20:05:06 +02:00
gkodinov/kgeorge@magare.gmz
52b35112cf Bug #28687: Search fails on '0000-00-00' date after sql_mode change 
When doing indexed search the server constructs a key image for 
faster comparison to the stored keys. While doing that it must not
perform (and stop if they fail) the additional date checks that can 
be turned on by the SQL mode because there already may be values in 
the table that don't comply with the error checks.
Fixed by ignoring these SQL mode bits while making the key image.
 2007-10-22 19:32:18 +03:00
kaa@polly.(none)
53a9e7f478 Fix for bug #31742: delete from ... order by function call that causes 
an error, asserts server

In case of a fatal error during filesort in find_all_keys() the error
was returned without the necessary handler uninitialization.
Fixed by changing the code so that handler uninitialization is performed
before returning the error.
 2007-10-22 16:10:08 +04:00
joerg@trift2.
242fdacdfe Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-10-22 11:18:01 +02:00
joerg@trift2.
5779d062e2 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-10-22 11:08:55 +02:00
mats@kindahl-laptop.dnsalias.net
b65a9888c0 Post-merge fixes. 2007-10-22 10:32:35 +02:00
mats@kindahl-laptop.dnsalias.net
105a9c3e67 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b28618-mysql-5.1-rpl
 2007-10-22 08:50:08 +02:00