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

43117 commits

This branch
This branch
All branches
Author SHA1 Message Date
evgen@moonbone.local
968369906e Bug#19978: INSERT .. ON DUPLICATE erroneously reports some records were 
updated.

INSERT ... ON DUPLICATE KEY UPDATE reports that a record was updated when
the duplicate key occurs even if the record wasn't actually changed
because the update values are the same as those in the record.

Now the compare_record() function is used to check whether the record was
changed and the update of a record reported only if the record differs
from the original one.
 2007-02-07 00:46:03 +03:00
svoj@mysql.com/april.(none)
db8a7b513c Excluded wrongly merged changeset. 2007-02-07 01:37:21 +04:00
msvensson@pilot.mysql.com
07dd9a61c1 Bug#26015 valgrind warning PollGuard::unlock_and_signal()/NdbCondition_Destroy 
- Add variable "ndbcluster_binlog_terminating" and use that to signal
the cluster binlog thread it's time to shutdown. This allows
exact control of when the thread shutdown, previous implementation 
would start shutdown of the thread as soon as the mysqld started
shutdown. Now we will shutdown cluster binlog thread 
in 'ndbcluster_binlog_end'
 2007-02-06 22:06:13 +01:00
msvensson@pilot.mysql.com
5274fa7c9d Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-06 22:01:21 +01:00
msvensson@pilot.mysql.com
19771b410a Fix merge error 2007-02-06 22:00:48 +01:00
msvensson@pilot.mysql.com
e3a7ce7d3b Merge 192.168.0.5:mysql/bug25203/my50-bug25203 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-06 21:55:39 +01:00
msvensson@pilot.mysql.com
95aff07426 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-06 20:26:06 +01:00
msvensson@pilot.mysql.com
6050927f76 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-06 20:24:42 +01:00
msvensson@pilot.mysql.com
5959ca40d7 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-06 20:23:58 +01:00
msvensson@pilot.mysql.com
7006b2033e Merge 192.168.0.10:mysql/yassL-import/my51-yassL-import 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-06 20:23:28 +01:00
hhunger@hh-nb.hungers
28a05ea0ea copy from test-extra-5.0 to main tree 2007-02-06 19:07:48 +01:00
msvensson@pilot.mysql.com
5885fba43b Merge 192.168.0.10:mysql/yassL-import/my50-yassL-import 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-06 18:52:18 +01:00
msvensson@neptunus.(none)
5f5b0e9b39 Merge neptunus.(none):/home/msvensson/mysql/yassL-import/my50-yassL-import 
into  neptunus.(none):/home/msvensson/mysql/yassL-import/my51-yassL-import
 2007-02-06 17:34:06 +01:00
msvensson@neptunus.(none)
6fc734a768 Bug#24157 openssl_1 regression test is broken two different ways 
- Send output from 'ERR_print_errors_fp' to DBUG_FILE if --debug is used
 2007-02-06 17:33:11 +01:00
msvensson@pilot.mysql.com
324b136f4f Update result file for 5.1 2007-02-06 17:23:21 +01:00
msvensson@pilot.mysql.com
c481446873 Fix merge error 2007-02-06 17:22:56 +01:00
msvensson@pilot.mysql.com
836f777b55 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-06 16:38:56 +01:00
msvensson@pilot.mysql.com
b6bd53aa9d Correct the non working check for --skip-log-bin in "extra_opt" 2007-02-06 16:38:32 +01:00
msvensson@neptunus.(none)
38fa3ed693 Bug#25988 openssl_1 Test Case Fails 
- Small difference in output from 'X509_NAME_Oneline' between OpenSSL and yaSSL. OpenSSL uses
   an extension that allow's the email adress of the cert holder.   
 - Imported patch for yaSSL "add email to DN output"
 2007-02-06 16:28:36 +01:00
msvensson@pilot.mysql.com
d9439eda43 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-06 15:52:33 +01:00
msvensson@pilot.mysql.com
69510b7089 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-06 15:50:53 +01:00
msvensson@pilot.mysql.com
6ba81ba5eb Merge 192.168.0.10:mysql/mysql-5.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-06 15:50:24 +01:00
msvensson@neptunus.(none)
15008f6728 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2007-02-06 15:48:08 +01:00
msvensson@neptunus.(none)
e4001b3b5a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2007-02-06 15:46:17 +01:00
msvensson@pilot.mysql.com
f7e566c944 Fix windows build 2007-02-06 15:03:28 +01:00
msvensson@pilot.mysql.com
d018030b20 Merge 192.168.0.10:mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-06 14:48:22 +01:00
msvensson@neptunus.(none)
ede3afe470 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2007-02-06 14:45:08 +01:00
msvensson@pilot.mysql.com
256cb08ba9 Merge 192.168.0.10:mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 14:44:05 +01:00
msvensson@neptunus.(none)
6502f4300b Merge neptunus.(none):/home/msvensson/mysql/my41-nmj 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 14:42:40 +01:00
msvensson@pilot.mysql.com
f6d3ac52dd Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-06 14:32:08 +01:00
msvensson@pilot.mysql.com
61686e8556 Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-06 14:30:23 +01:00
msvensson@pilot.mysql.com
36207f8088 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 14:27:43 +01:00
msvensson@pilot.mysql.com
3f06339d7c Merge 192.168.0.10:mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 14:27:00 +01:00
msvensson@pilot.mysql.com
3a48e8ee27 Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805 
into  pilot.mysql.com:/home/msvensson/mysql/bug24805/my51-bug24805
 2007-02-06 14:22:48 +01:00
msvensson@pilot.mysql.com
958308a5cf Bug#24805 mtr.pl can't handle test with --disable-log-bin 
- Don't give mysqld the --log-bin argument if .opt file
  contains --skip-log-bin
- Enable flush2 test
 2007-02-06 14:19:07 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
878759b218 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b23782/b23782.5.0
 2007-02-06 17:18:43 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
8222657a1c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b23782/b23782.5.1
 2007-02-06 17:16:39 +04:00
msvensson@neptunus.(none)
8c37b28c0b Bug#8983 one place that isn't strict-aliasing-safe 
- Backport fix from 5.0
 2007-02-06 14:07:40 +01:00
ramil/ram@myoffice.izhnet.ru
d5b11a5e7a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug23938/my51-bug23938
 2007-02-06 17:06:19 +04:00
msvensson@neptunus.(none)
72fbdf2933 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2007-02-06 13:55:07 +01:00
hhunger@hh-nb.hungers
e6055e21f5 copy from test-extra-5.1 to main tree 2007-02-06 13:35:54 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
61ec25116e Merge mysql.com:/home/ram/work/b23782/b23782.5.0 
into  mysql.com:/home/ram/work/b23782/b23782.5.1
 2007-02-06 15:59:37 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
85f2f924fd Fix for bug #23782: Stored procedures: crash if variable in procedure 
analyse

We have to call fix_fields() for procedure analyse' arguments as they may   
not be
fixed in some circumstances.

(as the crash appears when mysqld starts skipping binlog, a test case
will be added when we can --skip-bin-log in -master.opt)
 2007-02-06 15:58:40 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
d69e5063b2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug23938/my41-bug23938
 2007-02-06 14:58:07 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a4bbd5bf76 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug23938/my50-bug23938
 2007-02-06 14:28:46 +04:00
ramil/ram@myoffice.izhnet.ru
6fea92a146 Merge mysql.com:/usr/home/ram/work/bug23938/my50-bug23938 
into  mysql.com:/usr/home/ram/work/bug23938/my51-bug23938
 2007-02-06 14:20:46 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
f103fde258 Merge mysql.com:/usr/home/ram/work/bug23938/my41-bug23938 
into  mysql.com:/usr/home/ram/work/bug23938/my50-bug23938
 2007-02-06 13:57:20 +04:00
gkodinov/kgeorge@macbook.gmz
5092f7ab26 Bug #22344: InnoDB keys act strange on datetime vs timestamp comparison 
Ignoring error codes from type conversion allows default (wrong) values to
 go unnoticed in the formation of index search conditions.
 Fixed by correctly checking for conversion errors.
 2007-02-06 11:08:57 +02:00
tomas@poseidon.mysql.com
78a208fb15 Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-06 15:02:48 +07:00
tomas@poseidon.mysql.com
6765e30aa0 ndb: only inject events (ACTIVE, NODE_FAILURE, CLUSTER_FAILURE) if bit shows connected 2007-02-06 15:01:24 +07:00