mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-11 17:48:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
43434 commits 2852 branches 349 tags 1.6 GiB
Commit graph

43434 commits

Author SHA1 Message Date
kaa@polly.local
f289240525 Merge polly.local:/tmp/maint/bug20293/my51-bug20293 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-03-06 21:03:32 +03:00
kaa@polly.local
dc41c428c7 Merge polly.local:/tmp/maint/bug20293/my50-bug20293 
into  polly.local:/tmp/maint/bug20293/my51-bug20293
 2007-03-06 20:35:25 +03:00
ramil/ram@ramil.myoffice.izhnet.ru
361a15000a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b26038/b26038.5.1
 2007-03-05 18:22:36 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
ca66f604f4 Merge mysql.com:/home/ram/work/b26038/b26038.5.0 
into  mysql.com:/home/ram/work/b26038/b26038.5.1
 2007-03-05 17:12:37 +04:00
tnurnberg@sin.mysql.com
57e300af82 Merge mysql.com:/home/tnurnberg/21103/50-21103 
into  mysql.com:/home/tnurnberg/21103/51-21103
 2007-03-05 14:04:23 +01:00
tnurnberg@mysql.com/sin.mysql.com
b5aeef5dea Bug#21103: DATE column not compared as DATE 
When comparing a DATE field with a DATETIME constant, we now compare
as DATETIMEs, not as DATEs.  Fix BDB queries to still work.
 2007-03-05 14:02:29 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
b69493027e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b23616/b23616.5.1
 2007-03-05 11:57:51 +04:00
tnurnberg@sin.intern.azundris.com
edf3519b23 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/tnurnberg/21103/51-21103
 2007-03-03 00:56:21 +01:00
tnurnberg@sin.intern.azundris.com
36a5e0b3df Merge mysql.com:/home/tnurnberg/21103/50-21103 
into  mysql.com:/home/tnurnberg/21103/51-21103
 2007-03-02 15:25:06 +01:00
tnurnberg@mysql.com/sin.intern.azundris.com
f37267bb3c Bug : DATE column not compared as DATE 
If we compare two items A and B, with B being (a constant) of a
larger type, then A gets promoted to B's type for comparison if
it's a constant, function, or CAST() column, but B gets demoted
to A's type if A is a (not explicitly CAST()) column. This is
counter-intuitive and not mandated by the standard.
 
Disabling optimisation where it would be lossy so field value
will properly get promoted and compared as binary string (rather
than as integers).
 2007-03-02 15:23:13 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
363b0b6ff1 Merge mysql.com:/home/ram/work/b23616/b23616.5.0 
into  mysql.com:/home/ram/work/b23616/b23616.5.1
 2007-03-02 15:13:28 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
f165316cfc after merge fix (bug ) 
Item_func_geometry_from_text::val_str() should set null_value
in case of wrong data.
 2007-03-02 15:09:44 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
4a5dd6956d Merge mysql.com:/home/ram/work/b23616/b23616.4.1 
into  mysql.com:/home/ram/work/b23616/b23616.5.0
 2007-03-02 15:09:20 +04:00
msvensson@pilot.blaudden
4367b151c2 Switch back to master before cleanup of the created tables 
That causes test case for bug#6880 to be run on the master
instead of the slave and thus the result files need to be updated
 2007-03-01 15:25:42 +01:00
msvensson@pilot.blaudden
51a71fb667 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-01 14:53:32 +01:00
msvensson@pilot.blaudden
6b4a71659e Make sure tests drops objects created and restore variables to default 2007-03-01 14:16:38 +01:00
msvensson@pilot.blaudden
a49d6c5f51 There is no .sql files in mysql-test/lib/ anymore, don't try to copy from there 2007-03-01 07:23:37 +01:00
msvensson@pilot.blaudden
3110418d6f Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 22:27:17 +01:00
msvensson@pilot.blaudden
45fde92fb3 Bug mysql_upgrade test can't give consistent results 
- Remove from disabled list
 - Update test result
 2007-02-28 21:29:14 +01:00
msvensson@pilot.blaudden
ab61d07a30 Merge pilot.blaudden:/home/msvensson/mysql/bug25074/my50-bug25074 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-28 21:21:37 +01:00
msvensson@pilot.blaudden
dd710c17ec Merge pilot.blaudden:/home/msvensson/mysql/bug25074/my50-bug25074 
into  pilot.blaudden:/home/msvensson/mysql/bug25074/my51-bug25074-new
 2007-02-28 21:19:12 +01:00
msvensson@pilot.blaudden
cc7e77c5fd Bug mysql_upgrade test can't give consistent results 
- Tell the programs executed by mysql_upgrade to only read
  from the defaults file generated by msyql_upgrade
 - Fix memory leaks
 2007-02-28 21:05:39 +01:00
msvensson@pilot.blaudden
d56d34805c Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 20:45:07 +01:00
msvensson@pilot.blaudden
0b4598a4b3 Bug mysql-test-run.pl does not test system privilege tables creation 
- No .sql files in mysql-test/lib/ anymore, don't copy them
 2007-02-28 20:44:49 +01:00
msvensson@pilot.blaudden
bfb417533a Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Additional fixes caused by running without anonymous users
 2007-02-28 20:33:59 +01:00
msvensson@pilot.blaudden
400a58e9c8 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 16:46:30 +01:00
msvensson@pilot.blaudden
bb88d4a2b1 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 16:45:54 +01:00
msvensson@pilot.blaudden
3648941ecc Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-28 16:45:41 +01:00
msvensson@pilot.blaudden
9591b9e922 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 16:41:30 +01:00
msvensson@pilot.blaudden
162f0803bb Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint-bug20166 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 16:40:50 +01:00
msvensson@pilot.blaudden
6fac51be9f Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-28 16:40:03 +01:00
msvensson@pilot.blaudden
b0ab925389 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-28 16:39:26 +01:00
msvensson@pilot.blaudden
b6fd729beb Merge pilot.blaudden:/home/msvensson/mysql/bug24878/my41-bug24878 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-28 16:38:31 +01:00
msvensson@pilot.blaudden
6ca22c6672 Bug#24878 mysql server doesn't log incident time in "mysqld got signal 11" error messages 
- Add printout of current time when mysqld is killed by an
   unhandled signal
 2007-02-28 16:37:50 +01:00
msvensson@pilot.blaudden
fb36bf9562 Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Null merge 4.1 patch
 2007-02-28 15:15:38 +01:00
msvensson@pilot.blaudden
05ed84a3d2 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166
 2007-02-28 15:04:20 +01:00
msvensson@pilot.blaudden
3fc549d430 Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Build lib/init-db.sql from the output of mysql_create_system_tables
 - Remove mysql-test/init_db.sql and mysql-test/lib/init_db.sql
 - Leave netware/init_db.sql until 5.0 where we should soon have possibility
   to test with mysql-test-run.pl
 2007-02-28 15:03:47 +01:00
msvensson@pilot.blaudden
3fc963f169 Bug#20166 mysql-test-run.pl does not test system privilege tables creation 2007-02-28 14:58:19 +01:00
msvensson@pilot.blaudden
9cfd569174 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-28 14:41:57 +01:00
msvensson@pilot.blaudden
e391b86fb0 Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Split out initial data in mysql_system_tables.sql to  it's own file
 - Use file from mysql_install_db and mysql-test-run
 2007-02-28 14:26:58 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
d966a8ebd4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b25834/b25834.5.0
 2007-02-28 17:18:19 +04:00
msvensson@pilot.blaudden
f63240f901 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 13:48:43 +01:00
msvensson@pilot.blaudden
6ea41f355c Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-28 13:47:59 +01:00
msvensson@pilot.blaudden
c0da93cd97 When using a --mem=<dir> the memdir must be removed to assure 
afresh start
 2007-02-28 13:47:41 +01:00
gluh@mysql.com/eagle.(none)
2baf35b4fa added initialization of 'cmp_type' variable(to remove compiler warning) 2007-02-28 15:44:57 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
1b83d62f41 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b25834/b25834.5.1
 2007-02-28 14:57:05 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
ae7d65569d Merge mysql.com:/home/ram/work/b25834/b25834.5.0 
into  mysql.com:/home/ram/work/b25834/b25834.5.1
 2007-02-28 14:37:09 +04:00
msvensson@pilot.blaudden
d3a12073f9 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 11:21:54 +01:00
msvensson@pilot.blaudden
44c56e35b6 Merge pilot.blaudden:/home/msvensson/mysql/bug25197/my50-bug25197 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-28 11:21:29 +01:00
msvensson@pilot.blaudden
a3317f8554 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 10:53:34 +01:00