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

33718 commits

This branch
This branch
All branches
Author SHA1 Message Date
cmiller@zippy.cornsilk.net
d7ef5de57f Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-11-10 14:49:39 -05:00
cmiller@zippy.cornsilk.net
7197da9cc2 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20691/my50-bug20691 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-11-10 14:48:37 -05:00
joerg@trift2.
a19a5b5f03 Merge trift2.:/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-10 20:24:05 +01:00
tsmith@quadxeon.mysql.com
b2da711fbf Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
 2006-11-10 19:38:07 +01:00
joerg@trift2.
e47f753a85 Merge trift2.:/MySQL/M50/bug24023-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-10 19:11:26 +01:00
joerg@trift2.
32d9fdaa98 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-10 19:07:52 +01:00
msvensson@neptunus.(none)
b693d5fdb3 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-10 16:07:49 +01:00
msvensson@neptunus.(none)
b6eef63081 remove remnants of abi-check.ic 2006-11-10 16:07:27 +01:00
msvensson@neptunus.(none)
43ef5e6a0c Look for "mysqlmanager" also in "bin" directory 
Improve log message
 2006-11-10 15:58:38 +01:00
joerg@trift2.
743ab0c6a4 Merge trift2.:/MySQL/M41/bug17194-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2006-11-10 15:54:58 +01:00
joerg@trift2.
2ab3d0bfb4 Merge trift2.:/MySQL/M41/clone-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2006-11-10 15:52:53 +01:00
df@kahlann.erinye.com
a185c4f6ea Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-4.1
 2006-11-10 14:49:07 +01:00
df@kahlann.erinye.com
403ecf18c6 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
 2006-11-10 14:44:01 +01:00
df@kahlann.erinye.com
59e33edf22 Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
 2006-11-10 13:14:21 +01:00
df@kahlann.erinye.com
f1764fa99f add --report-features to mysql-test-run.pl 2006-11-10 13:12:08 +01:00
petr/cps@outpost.site
e06f74f9f9 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191
 2006-11-10 15:05:38 +03:00
ted@ted.mysql.internal
bc9ca699fb Memory allocation bug fixed 2006-11-10 07:21:10 +03:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
54f6fc07b9 Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2006-11-10 02:35:01 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
264beeff86 Merge mysql.com:/Users/kent/mysql/bk/lic/my41-lic 
into  mysql.com:/Users/kent/mysql/bk/lic/my50-lic
 2006-11-10 02:28:31 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f893128839 mysql-test-run.sh: 
Added --force-restart pseudo server argument to shell version as well
 2006-11-10 02:22:33 +01:00
cmiller@zippy.cornsilk.net
92e0b31978 Bug#20691: DATETIME col (NOT NULL, NO DEFAULT) may insert garbage when \ 
specifying DEFAULT

This was not specific to datetime.  When there is no default value 
for a column, and the user inserted DEFAULT, we would write 
uninitialized memory to the table.  

Now, insist on writing a default value, a zero-ish value, the same 
one that comes from inserting NULL into a not-NULL field.

(This is, at best, really strange behavior that comes from allowing 
sloppy usage, and serves as a good reason always to run one's server 
in a strict SQL mode.)
 2006-11-09 18:33:58 -05:00
iggy@rolltop.ignatz42.dyndns.org
5343242c67 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
 2006-11-09 15:36:13 -05:00
joerg@trift2.
dce6efd035 mysql-test/install_test_db.sh 
Adapt to the different path of the server program, if installation was by RPM.
    Missing in the first changeset for bug#17194.
 2006-11-09 17:43:31 +01:00
gkodinov/kgeorge@rakia.gmz
0be7e70399 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rakia.gmz:/home/kgeorge/mysql/autopush/B20191-5.0-opt
 2006-11-09 18:03:49 +02:00
gkodinov/kgeorge@macbook.gmz
e7ff881c6b Bug #20191: getTableName gives wrong or inconsistent result when using VIEWs 
When compiling GROUP BY Item_ref instances are dereferenced in 
setup_copy_fields(), i.e. replaced with the corresponding Item_field 
(if they point to one) or Item_copy_string for the other cases.
Since the Item_ref (in the Item_field case) is no longer used the information
about the aliases stored in it is lost.   
Fixed by preserving the column, table and DB alias on dereferencing Item_ref
 2006-11-09 16:55:42 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
4b823e045f Fix for bug #23653: Crash if last_day('0000-00-00') 
As get_arg0_date() in the Item_func_last_day::get_date() returns 
0000-00-00 date sometimes, we have to check ltime->month for 0 after the call.
 2006-11-09 16:17:50 +04:00
holyfoot/hf@mysql.com/deer.(none)
129fbca293 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/8663/my50-8663
 2006-11-09 16:08:31 +04:00
msvensson@neptunus.(none)
4c26bf9c1d Bug#19371 VARBINARY() have trailing zeros after upgrade from 4.1 
- Detect if a table has field of type MYSQL_TYPE_VAR_STRING while running
   "CHECK TABLE t FOR UPGRADE" and indicate it need to be fixed
   with "REPAIR TABLE t".
 - When running a "REPAIR TABLE t" or "ALTER TABLE t FORCE" on the above
   table, install a special copy function to trim off the trailing spaces
   which we safely can say that the pre 5.0 mysqld didn't put there.
 2006-11-09 12:00:27 +01:00
bar@mysql.com/bar.intranet.mysql.r18.ru
aa1c8a5826 Bug#21505 Create view - illegal mix of collation for operation 'UNION' 
The problem was that any VIEW columns had always implicit derivation.
  Fix: derivation is now copied from the original expression
  given in VIEW definition.
  For example:
  - a VIEW column which comes from a string constant
    in CREATE VIEW definition have now coercible derivation.
  - a VIEW column having COLLATE clause
    in CREATE VIEW definition have now explicit derivation.
 2006-11-09 14:41:34 +04:00
gkodinov/kgeorge@macbook.gmz
edd8ea538a Merge bk-internal:/home/bk/mysql-4.1-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/mem-test-4.1-opt
 2006-11-09 12:07:58 +02:00
msvensson@neptunus.(none)
fb25c02b17 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-09 11:01:37 +01:00
msvensson@neptunus.(none)
1ebb9dbd03 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-09 09:49:18 +01:00
msvensson@neptunus.(none)
023c0d03e6 Fix problem when running mysql_client_test in "binary dist", path should include the binary name 2006-11-09 09:48:50 +01:00
msvensson@neptunus.(none)
d9b1f2cfbf Merge bk-internal:/home/bk/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-09 09:46:35 +01:00
tsmith@quadxeon.mysql.com
e9b42a4b27 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/50
 2006-11-09 05:21:56 +01:00
tsmith@quadxeon.mysql.com
c2aca91b7f This ChangeSet must be null-merged to 5.0. Applied innodb-4.1-ss33 
Fixes:
- Bug #24089: Race condition in fil_flush_file_spaces()
 2006-11-09 05:03:35 +01:00
tsmith@quadxeon.mysql.com
f1e0cf9d28 This ChangeSet must be null-merged to 5.1. Applied innodb-5.0-ss982, -ss998, -ss1003 
Fixes:
- Bug #15815: Very poor performance with multiple queries running concurrently
- Bug #22868: 'Thread thrashing' with > 50 concurrent conns under an upd-intensive workloadw
- Bug #23769: Debug assertion failure with innodb_locks_unsafe_for_binlog
- Bug #24089: Race condition in fil_flush_file_spaces()
 2006-11-09 05:02:37 +01:00
tsmith@quadxeon.mysql.com
41117b1226 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
 2006-11-09 00:53:22 +01:00
tsmith@quadxeon.mysql.com
246ec19117 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41
 2006-11-09 00:47:48 +01:00
msvensson@neptunus.(none)
c3a2a93d0f Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-09 00:27:33 +01:00
msvensson@neptunus.(none)
02d60a4466 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-09 00:26:24 +01:00
tsmith@quadxeon.mysql.com
f663ba45e5 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
 2006-11-09 00:26:22 +01:00
msvensson@neptunus.(none)
f032a223b7 Fix warnings and NetWare compile failure 2006-11-09 00:17:22 +01:00
msvensson@neptunus.(none)
0ec6432636 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-08 23:24:16 +01:00
msvensson@neptunus.(none)
a620a3abd1 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-08 23:17:09 +01:00
msvensson@neptunus.(none)
90d8d7b5cf Update of --mem flag after comments 2006-11-08 23:16:44 +01:00
msvensson@neptunus.(none)
174bfe9dd6 No need to pass an additional arg to to mtr_add_arg when there is no % sign 2006-11-08 22:56:06 +01:00
msvensson@neptunus.(none)
4dfbc712ed Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-08 22:54:22 +01:00
msvensson@neptunus.(none)
1437500c1b Pass location of charsets dir to mysqltest to avoid using the charsetdir locally installed on machine. 2006-11-08 22:53:40 +01:00
msvensson@neptunus.(none)
34f2c99dfc Don't run mysqltest with both --silent and --verbose 2006-11-08 22:45:52 +01:00