msvensson@neptunus.(none)
960410274c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-07 20:21:17 +02:00
mskold@mysql.com
b716302860
Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage, post review fix
2005-04-07 20:08:01 +02:00
mskold@mysql.com
b135b175fa
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-07 17:51:53 +02:00
mskold@mysql.com
89b140340c
Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage
2005-04-07 17:44:09 +02:00
sergefp@mysql.com
3f6cdec788
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug8877
2005-04-07 17:47:37 +04:00
sergefp@mysql.com
0cd5877b02
Post-review fixes: local variable renamed
2005-04-07 17:44:48 +04:00
mskold@mysql.com
934f458140
Added missing DBUG_RETURNs
2005-04-07 12:12:03 +02:00
jimw@mysql.com
699c35c80e
Merge mysql.com:/home/jimw/my/mysql-4.0-clean
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-06 11:02:20 -07:00
jimw@mysql.com
9dfc87e270
Merge mysql.com:/home/jimw/my/mysql-4.0-9492
...
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-04-06 10:53:09 -07:00
marko@hundin.mysql.fi
f32fe9c154
InnoDB: Avoid test suite failures caused by a locking conflict
...
between two server instances at server shutdown/startup.
This conflict on advisory locks appears to be the result of a bug
in the operating system; these locks should be released when the
files are closed, but somehow that does not always happen
immediately in Linux. (Bug #9381 )
2005-04-06 15:09:15 +03:00
kent@mysql.com
34284d9354
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-04-06 13:45:14 +02:00
kent@mysql.com
57d8914287
Makefile.am:
...
Include the Perl version of mysql-test-run
rpl_rewrite_db.test, rpl_rewrite_db.result:
Added missing database cleanup
mysql-test-run.pl:
Embedded result files no longer needed
2005-04-06 12:20:55 +02:00
gluh@mysql.com
85bf400612
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
2005-04-06 15:19:02 +05:00
bar@mysql.com
1c46a02069
Minor clean-ups for the previous commit.
2005-04-06 15:12:44 +05:00
gluh@mysql.com
decfc86fbb
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
2005-04-06 14:14:13 +05:00
gluh@eagle.intranet.mysql.r18.ru
6f18d7d26f
Fix for bug #9286 : SESSION/GLOBAL should be disallowed for user variables
2005-04-06 14:13:06 +05:00
msvensson@neptunus.(none)
9586a06f85
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-06 10:56:51 +02:00
heikki@hundin.mysql.fi
0c2caeb4d8
row0sel.c, btr0pcur.c, btr0pcur.ic, btr0pcur.h:
...
Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context
2005-04-06 10:27:40 +03:00
bar@mysql.com
0134a2b286
Adding a new parameter for well_formed_length to
...
return error. We'll use it for better warnign reporting.
2005-04-06 11:53:15 +05:00
serg@serg.mylan
014c8829cb
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-04-05 20:04:31 +02:00
serg@serg.mylan
8790645b48
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-04-05 19:45:04 +02:00
serg@serg.mylan
4962ba7f8a
merged
2005-04-05 19:44:39 +02:00
msvensson@neptunus.(none)
e0793aba5e
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-05 18:35:51 +02:00
serg@serg.mylan
3c3defaa0a
add changeset key to the bk commit mail
2005-04-05 15:16:15 +02:00
pekka@mysql.com
114b421c8b
ndb - csc#4847 release scan op early to save memory
2005-04-05 13:14:03 +02:00
msvensson@neptunus.(none)
4c55238e46
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug6762
2005-04-05 13:11:21 +02:00
msvensson@neptunus.(none)
f8275510ed
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-05 13:08:00 +02:00
msvensson@neptunus.(none)
36120cd6af
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug6762
2005-04-05 13:07:46 +02:00
msvensson@neptunus.(none)
f22b8930c3
Fix swedish error message
2005-04-05 13:01:16 +02:00
jani@ua141d10.elisa.omakaista.fi
6ed11e3bb3
A fix for Netware.
2005-04-05 13:15:04 +03:00
joerg@mysql.com
45ba58ab20
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-04-05 11:25:42 +02:00
msvensson@neptunus.(none)
f8ae1e53c8
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug6762
2005-04-05 11:23:17 +02:00
heikki@hundin.mysql.fi
9db3965924
dict0dict.c:
...
Add a note that ENUM in new tables cannot reference ENUM in old tables, in FOREIGN KEY constraints
2005-04-05 11:35:03 +03:00
joerg@mysql.com
cc06b6c12c
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-04-05 09:06:57 +02:00
jimw@mysql.com
247f2ac563
Merge new tests
2005-04-04 18:29:18 -07:00
jimw@mysql.com
59b1a1f62f
Merge mysql.com:/home/jimw/my/mysql-4.1-9472b
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-04 18:27:27 -07:00
jimw@mysql.com
1f1c44779a
Merge mysql.com:/home/jimw/my/mysql-4.1-8866
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-04 18:26:39 -07:00
sergefp@mysql.com
53e0b5b5db
Removed extra comment
2005-04-05 03:34:39 +04:00
sergefp@mysql.com
d0c9b36224
Fix for BUG#8877: Implementation of
...
"Early NULL-values filtering for ref access" (attempt2+post-review fixes)
1. update_ref_and_keys() accumulates info about null-rejecting
predicates in in KEY_FIELD::null_rejecting, add_key_part saves
these to KEYUSE.
2. create_ref_for_key copies them to TABLE_REF.
3. add_not_null_conds adds "x IS NOT NULL" to join_tab->select_cond of
appropiate JOIN_TAB members.
Includes code cleanups:
* add_key_field() params: s/COND/Item_func/ (as only Item_funcs are
passed to it)
* add_key_fields() params: JOIN_TAB *stat removed (wasn't used)
2005-04-05 02:42:23 +04:00
jimw@mysql.com
fc3c7d5f74
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-04 12:46:43 -07:00
joerg@mysql.com
36a034d36a
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-04-04 19:00:40 +02:00
heikki@hundin.mysql.fi
73a8d1bcad
ha_innodb.cc:
...
Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do not dare to allow InnoDB sometimes to see the type as an integer type for those old tables
2005-04-04 19:41:52 +03:00
heikki@hundin.mysql.fi
63aa88638a
ha_innodb.cc:
...
Fix bug #9526 in InnoDB: the internal type of an ENUM or SET is an unsigned integer type, not a character string
2005-04-04 19:27:28 +03:00
jimw@mysql.com
0f007e5c73
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-04 08:42:30 -07:00
msvensson@neptunus.(none)
71ccc569ae
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug6762
2005-04-04 17:09:53 +02:00
bar@mysql.com
d9f8b501db
ctype_uca.result:
...
fixing test results accordingly.
ctype-uca.c:
It appeared that in traditional Spanish collation
'RR' is not equal to 'R', as Unicode and Mimer state.
We'll go Oracle and IBM way instead:
No special rules to 'RR'.
2005-04-04 17:55:12 +05:00
msvensson@neptunus.(none)
41c036a60b
BUG#6762 ALTER TABLE gives weird results and error message
...
- Better error message when table definition has changed
2005-04-04 12:26:05 +02:00
dlenev@mysql.com
da53d7bc88
Manual merge of fix for bug #8894 "TIMESTAMP values scrambled/misaligned
...
when using --new" into 4.1 tree.
2005-04-03 10:05:01 +04:00
dlenev@mysql.com
a663889569
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dlenev/src/mysql-4.0-bg8894
2005-04-03 09:48:09 +04:00
serg@serg.mylan
ddee2fa7fb
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-04-02 21:45:02 +02:00