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

20628 commits

Author SHA1 Message Date
istruewing@stella.local
8506efa91e Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-12-12 19:52:52 +01:00
istruewing@stella.local
9217f01136 Dummy push to help pushbuild running again. 
Fixed case of comment.
 2007-12-12 19:49:08 +01:00
istruewing@stella.local
9b0ab3fc0f Merge stella.local:/home2/mydev/mysql-5.1-ateam 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-12-11 23:57:57 +01:00
istruewing@stella.local
34b317c883 Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-12-11 21:38:50 +01:00
istruewing@stella.local
03d99c5956 Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-12-11 21:37:33 +01:00
istruewing@stella.local
ba2d58ae5e Merge stella.local:/home2/mydev/mysql-5.0-amain 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2007-12-11 17:09:43 +01:00
mattiasj@witty.
749ded6feb Merge witty.:/Users/mattiasj/clones/mysql-5.1-bug32948 
into  witty.:/Users/mattiasj/clones/51_push32948
 2007-12-11 11:15:30 +01:00
df@pippilotta.erinye.com
3f79b0f108 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-12-10 10:46:00 +01:00
df@pippilotta.erinye.com
45c93a5866 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-12-10 10:42:58 +01:00
dkatz@damien-katzs-computer.local
71160422ee Bug#29830 Test case 'events_scheduling' fails on Mac OS X and Windows. 
Change LAST_EXECUTED time the execution start time, instead of the execution completion time. This ensures the END time always the same or later than the LAST_EXECUTED time.
 2007-12-07 19:27:45 -05:00
tsmith@ramayana.hindu.god
31a4940b3f Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-12-07 15:04:45 -07:00
tsmith@ramayana.hindu.god
4eb097ba12 Add a way to remove options which mysql-test-run.pl no longer uses. 2007-12-07 14:43:31 -07:00
mleich@five.local.lan
4fc04761b9 Merge five.local.lan:/work/merge/mysql-5.1-build 
into  five.local.lan:/work/merge/mysql-5.1-build-parts
 2007-12-07 18:45:09 +01:00
joerg@trift2.
fd5000f650 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-12-07 13:51:41 +01:00
joerg@trift2.
cc609742fa Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-12-07 12:33:48 +01:00
tsmith@ramayana.hindu.god
3d01ffd78d Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-12-07 03:56:03 -07:00
tsmith@ramayana.hindu.god
8c5f194505 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-12-07 03:51:23 -07:00
svoj@mysql.com/june.mysql.com
413112fb55 BUG#32817 - though CSV is marked as supported create table is rejected 
with error 1005.

CSV doesn't support nullable fields. Report descriptive error if create
table with nullable field is requested.
 2007-12-07 14:44:03 +04:00
tsmith@ramayana.hindu.god
04d363d1f6 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
 2007-12-07 03:42:39 -07:00
tsmith@ramayana.hindu.god
6835272b37 Make tests more robust (clean up better after grant.test) 2007-12-07 03:39:37 -07:00
tsmith@ramayana.hindu.god
45c7826088 Move the test case for bug #20901 from create.test to grant.test, so 
testing embedded server works correctly.
 2007-12-07 00:54:32 -07:00
mleich@five.local.lan
dba250956a Fix for 
Bug#32856 testsuite parts: partition_basic_myisam fails 
                              in pushbuild
Skip test if symlink support is missing.
 2007-12-06 18:26:50 +01:00
mattiasj@witty.ndb.mysql.com
c27d93c83a Bug#32948: FKs allowed to reference partitioned table 
Problem: when alter to partitioned table,
it does not see it as change of engine.

Solution: If alter includes partitioning, check if it is possible
to change engines (eg. is the table referenced by a FK)
 2007-12-06 14:43:06 +01:00
tsmith@ramayana.hindu.god
c3a0572d8e Post-merge fix (reorder tests in ctype_ucs.test) 2007-12-05 13:54:11 -07:00
tsmith@ramayana.hindu.god
8fc0bfb6b6 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
 2007-12-05 12:33:36 -07:00
mattiasj@witty.
5452a154d6 Merge witty.:/Users/mattiasj/clones/mysql-5.1-bug30822 
into  witty.:/Users/mattiasj/clones/51to_push
 2007-12-05 19:39:32 +01:00
davi@endora.local
aa5786eb0f Merge mysql.com:/Users/davi/mysql/bugs/32996-5.1 
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
 2007-12-05 11:25:51 -02:00
davi@mysql.com/endora.local
b79b57c645 Bug#32996 log_tables.test fails sporadically 
Only select entries from the general_log that were issued by the current
connection.
 2007-12-05 09:48:13 -02:00
tsmith@ramayana.hindu.god
10cab933b2 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-12-04 20:58:21 -07:00
anozdrin/alik@station.
1bfc9d692c Bug#32966 main.status fails. 
Disable failing test case.
 2007-12-04 18:52:43 +03:00
anozdrin/alik@station.
69792afb14 Bug#32965 main.ctype_create fails. 
Disable failing test case.
 2007-12-04 18:51:03 +03:00
kaa@polly.(none)
3ecbd79c88 Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-12-02 14:14:42 +03:00
kaa@polly.(none)
0e78354baa Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-12-02 14:11:36 +03:00
kaa@polly.(none)
a008572871 Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 
into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
 2007-12-02 13:51:39 +03:00
kaa@polly.(none)
d905aade4f Windows-specific fixes in floating point tests. 2007-12-02 13:49:12 +03:00
kaa@polly.(none)
9699c42ccc Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-12-01 15:40:59 +03:00
kaa@polly.(none)
2a52bb82e4 Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-12-01 15:37:25 +03:00
kaa@polly.(none)
c8226d732d Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 
into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
 2007-12-01 15:30:01 +03:00
kaa@polly.(none)
55acce7504 Fixed the floating point number tests on Windows. 2007-12-01 15:25:24 +03:00
kaa@polly.(none)
8f13b541a7 Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-12-01 10:53:50 +03:00
kaa@polly.(none)
b994abb997 Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-12-01 10:48:41 +03:00
kaa@polly.(none)
109c0439c0 Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 
into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
 2007-12-01 10:29:43 +03:00
kaa@polly.(none)
7fd9135bb8 Fix for bug #26788 "mysqld (debug) aborts when inserting specific 
numbers into char fields" and bug #12860 "Difference in zero padding of
exponent between Unix and Windows"

Rewrote the code that determines what 'precision' argument should be
passed to sprintf() to fit the string representation of the input number
into the field.
We get finer control over conversion by pre-calculating the exponent, so
we are able to determine which conversion format, 'e' or 'f', will be
used by sprintf().
We also remove the leading zero from the exponent on Windows to make it
compatible with the sprintf() output on other platforms.
 2007-12-01 10:05:59 +03:00
istruewing@stella.local
6bd5aac571 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  stella.local:/home2/mydev/mysql-5.1-bug30491
 2007-11-30 17:39:50 +01:00
davi@endora.local
af039c53f9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
 2007-11-30 14:07:36 -02:00
davi@endora.local
7bdb3219fe Merge mysql.com:/Users/davi/mysql/bugs/22312-5.1 
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
 2007-11-30 14:05:58 -02:00
istruewing@stella.local
b21a56aa24 Bug#30491 - MERGE doesn't report error when one table is Innodb 
1. A bad error message was given when a MERGE table with an
   InnoDB child table was tried to use.

2. After selecting from a correct MERGE table and then altering
   one of the children to InnoDB, incorrect results were returned.

These bugs have been fixed with the patch for bug 26379 (Combination
of FLUSH TABLE and REPAIR TABLE corrupts a MERGE table).

For verification, I added the test case from the bug report.
 2007-11-30 15:16:31 +01:00
anozdrin/alik@ibm.
609a1d0d2d BUG#32723 (grant3.test fails) can not be reproduced. 
Enabling the test case.
 2007-11-30 14:49:34 +03:00
davi@mysql.com/endora.local
ee9bafc1c5 Bug#22312 Syntax error in expression with INTERVAL() 
Parser rejects valid INTERVAL() expressions when associated with
arithmetic operators. The problem is the way in which the expression
and interval grammar rules were organized caused shift/reduce conflicts.

The solution is to tweak the interval rules to avoid shift/reduce
conflicts by removing the broken interval_expr rule and explicitly
specify it's content where necessary.

Original fix by Davi Arnaut, revised and improved rules by Marc Alff
 2007-11-30 09:34:25 -02:00
anozdrin/alik@ibm.
a1666e067a A test case for BUG#26676: VIEW using old table schema in a session. 
The following clarification should be made in The Manual:

Standard SQL is quite clear that, if new columns are added
to a table after a view on that table is created with
"select *", the new columns will not become part of the view.
In all cases, the view definition (view structure) is frozen
at CREATE time, so changes to the underlying tables do not
affect the view structure.
 2007-11-30 12:14:07 +03:00