mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34940 commits 2774 branches 343 tags 1.6 GiB
Commit graph

34940 commits

This branch
This branch
All branches
Author SHA1 Message Date
gluh@mysql.com/eagle.(none)
826178b0f2 Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-02-08 15:34:53 +04:00
gluh@mysql.com/eagle.(none)
e88351294b Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-02-08 15:34:22 +04:00
gluh@mysql.com/eagle.(none)
da9f2149de Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
 2007-02-08 14:54:49 +04:00
igor@olga.mysql.com
8d4027fd74 Fixed bug #25931. 
View check option clauses were ignored for updates of multi-table
views when the updates could not be performed on fly and the rows
to update had to be put into temporary tables first.
 2007-02-07 14:41:57 -08:00
antony@ppcg5.local
a3c3cda915 Bug#12204 
"CONNECTION is a reserved keyword"
  Allow connection to be used as an ordinary identifier
  Tests included.
 2007-02-07 14:22:19 -08:00
tomas@poseidon.mysql.com
097c8431e2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  poseidon.mysql.com:/home/tomas/mysql-4.1-ndb
 2007-02-08 00:25:30 +07:00
tomas@poseidon.mysql.com
d56756de0a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-02-08 00:00:14 +07:00
msvensson@pilot.mysql.com
eee38feda8 Avoid problem with "noinst_HEADERS" being sucked into "mysqld_LDADD" if openssl_libs and yassl_libs are empty strings 2007-02-07 15:11:03 +01:00
joerg@trift2.
4a97341436 Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-02-07 13:54:18 +01:00
joerg@trift2.
80ceb0690e Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-02-07 13:42:49 +01:00
mskold/marty@mysql.com/linux.site
77ab74831f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-02-07 12:33:36 +01:00
mskold/marty@mysql.com/linux.site
5df38bfc3e Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-02-07 12:29:34 +01:00
mskold/marty@mysql.com/linux.site
2d0bd82a06 NdbScanOperation.hpp, NdbScanOperation.cpp, ha_ndbcluster.cc: 
bug#25821  Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound
ha_ndbcluster.h:
  Removed stray mthod declaration
 2007-02-07 11:36:34 +01:00
mskold/marty@mysql.com/linux.site
259d3dce26 bug#25821 Excessive partition pruning for multi-range index scan in NDB API: post-review fix, added default value 2007-02-07 09:19:33 +01:00
igor@olga.mysql.com
5ed805bfd6 Fixed bug #26124: SELECT from a view wrapper over a table 
with a column of the DATETIME type could return a wrong 
result set if the WHERE clause included a BETWEEN condition
on the column.
Fixed the method Item_func_between::fix_length_and_dec
where the aggregation type for BETWEEN predicates calculated
incorrectly if the first argument was a view column of the
DATETIME type.
 2007-02-07 00:18:36 -08:00
antony@ppcg5.local
18ce758819 thd_lib_detected moved so that it is correctly declared as a data 
section symbol and not a common symbol on gcc 4.0.1 on darwin 8.8.0
PowerPC MacOS X 10.4.8
 2007-02-06 15:19:01 -08:00
mskold/marty@mysql.com/linux.site
0446aa9cbd Fix for bug#25821 Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range 2007-02-06 23:06:58 +01:00
msvensson@pilot.mysql.com
0ee93fdb02 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 23:01:48 +01:00
msvensson@pilot.mysql.com
b6da082559 Merge 192.168.0.10:mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 23:01:01 +01:00
msvensson@neptunus.(none)
2fb664cb38 Bug#25344 Segmentation violation when try to run the perror utility 
- strerror might return NULL on some platforms
 2007-02-06 23:00:18 +01:00
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
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
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
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)
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
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
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
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
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
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
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@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@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
jani@a88-113-38-195.elisa-laajakaista.fi
1dd93dda08 Test and bug fixes and removed unneccessary files. 2007-02-05 17:09:44 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
64a728ce0c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug10798/my41-bug10798
 2007-02-05 10:20:47 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
47ae650a57 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug10798/my50-bug10798
 2007-02-05 10:09:31 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b0977714a8 Merge mysql.com:/usr/home/ram/work/bug10798/my41-bug10798 
into  mysql.com:/usr/home/ram/work/bug10798/my50-bug10798
 2007-02-05 09:54:23 +04:00
igor@olga.mysql.com
5313db2d82 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug24035
 2007-02-03 10:37:45 -08:00
istruewing@chilla.local
b444566412 After merge fix 2007-02-03 09:26:11 +01:00