monty@mysql.com
dec2607e1d
Ensure that we reset auto-increment cache if we have to do an UPDATE becasue of REPLACE
...
This fixes bug #11080 : Multi-row REPLACE fails on a duplicate key error
2005-06-06 20:41:52 +03:00
monty@mysql.com
b46f2ecf2f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-06-06 19:43:07 +03:00
lenz@mysql.com
80fbb13e97
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/my/mysql-5.0
2005-06-06 18:03:16 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
db23a7ec29
A logger patch for Netware.
2005-06-06 19:00:50 +03:00
monty@mysql.com
22d20f89e5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-06-06 18:48:01 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
03526f1c2c
A fix for Metrowerks compiler.
2005-06-06 18:34:44 +03:00
monty@mysql.com
8c1c166487
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-06-06 18:31:38 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
ea7f982ef0
Some fixes for Netware.
2005-06-06 18:30:59 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
fb5333120f
Some fixes for Netware builds.
2005-06-06 17:59:00 +03:00
monty@mysql.com
e43cbebc59
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-06-06 16:54:56 +03:00
lenz@mysql.com
13afa9129b
Some Windows compile improvements:
...
- removed some unreferenced variables
- fixed the libmysql project file by removing a duplicate file reference (merge error)
2005-06-06 15:23:04 +02:00
igor@rurik.mysql.com
6ee824705e
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-06 06:15:09 -07:00
igor@rurik.mysql.com
f2405d71eb
sp.test, sp.result:
...
Added a test case for bug #6866 .
sql_select.cc:
Fixed bug #6866 .
Bug was due to the fact that on_expr was not backed up
for the second execution of the stored procedure.
2005-06-06 06:05:11 -07:00
bar@mysql.com
9bbad19dd4
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.turk
2005-06-06 16:55:06 +05:00
bar@mysql.com
2df945d87b
Bug#8610: The ucs2_turkish_ci collation fails with upper('i')
...
UPPER/LOWER now can return a string with different length.
mi_test1.c:
Adding new arguments.
Many files:
Changeing caseup/casedn to return a result with different
length than argument.
sql_string.h:
Removing unused method,
mysql_priv.h:
Removing unused method
2005-06-06 16:54:15 +05:00
konstantin@mysql.com
95da927081
Portability fix, mySTL on Sun Forte 5.4.
2005-06-06 15:52:45 +04:00
monty@mysql.com
db4dc60d5c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-06-06 14:36:21 +03:00
monty@mysql.com
e18bb16ee5
Fixed wrong key length when using MIN() optimization (non fatal, but caused InnoDB to write warnings to the log file)
...
This fixed bug #11039 : InnoDB: Warning: using a partial-field key prefix in search
2005-06-06 14:03:33 +03:00
konstantin@mysql.com
b6e895ad9f
Futher fixes for aCC.
2005-06-06 14:52:43 +04:00
konstantin@mysql.com
dcae1d174f
Futher yaSSL portability fixes: hp3750 (HP aCC + HPUX).
2005-06-06 14:43:21 +04:00
konstantin@mysql.com
b24269103c
Fix yaSSL compilation failure on ds20 (DEC CXX + Linux)
2005-06-06 14:28:00 +04:00
ramil@mysql.com
c956ed5494
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b10539
2005-06-06 13:14:20 +05:00
lenz@mysql.com
ae97cc1c92
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/my/mysql-5.0
2005-06-06 08:46:15 +02:00
ramil@mysql.com
592d8f8d41
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b10539
2005-06-06 11:30:15 +05:00
ramil@mysql.com
417447ae82
Merge
2005-06-06 10:39:21 +05:00
konstantin@mysql.com
c2f7e4d610
Fix broken linking when building with ha_federated
2005-06-05 23:00:45 +04:00
kent@mysql.com
b7696f414c
sp_rcontext.cc, sp_pcontext.cc, sp_head.cc, sp_cache.cc, ha_federated.cc:
...
Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION
2005-06-05 16:20:22 +02:00
monty@mysql.com
4b7882dc73
merge
2005-06-05 17:19:50 +03:00
monty@mysql.com
25a2c4a71e
Cleanup during review
...
Simple optimization for 2 argument usage to function of variable arguments
Fix stack overrun when using 1+1+1+1+1+1+1+....
Update crash-me results for 5.0
Don't call post_open if pre_open() fails (optimization)
2005-06-05 17:01:20 +03:00
serg@serg.mylan
10f8d83dcb
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-04 11:15:36 +02:00
konstantin@mysql.com
ada8f09186
Add missing STMT_ATTR_PREFETCH_ROWS to mysql_stmt_attr_get
2005-06-04 12:37:10 +04:00
serg@serg.mylan
74f2ffc6d2
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-04 10:23:44 +02:00
jimw@mysql.com
0f8c2e2a4b
Merge mysql.com:/home/jimw/my/mysql-5.0-10590
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-03 16:06:51 -07:00
serg@serg.mylan
d26c13b439
client/mysql.cc
...
make print_field_types() somewhat more useful
2005-06-03 21:59:33 +02:00
hartmut@mysql.com
4208f74948
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-06-03 20:08:38 +02:00
hartmut@mysql.com
1e5f1078c6
Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-06-03 19:15:16 +02:00
lenz@mysql.com
852a57300d
- include/config-win.h: removed double HAVE_CHARSET_cp932 #define
...
- mysql-test/Makefile.am: added a pattern match for t/*.sql
(t/mysql_delimiter.sql was missing from the source distribution)
2005-06-03 18:20:25 +02:00
serg@serg.mylan
7288ef873f
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-03 15:00:53 +02:00
serg@serg.mylan
91f6308d00
yassl template instantiation - don't do too much
...
mysys/my_access.c: remove incorrect fix
comments
2005-06-03 13:43:17 +02:00
pem@mysql.com
0d5e311176
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-06-03 12:58:23 +02:00
pem@mysql.comhem.se
5370ffc9c1
Post review fix of BUG#10969.
2005-06-03 12:56:51 +02:00
hartmut@mysql.com
03056a2892
check-cpu fixes/improvements (Bug #11065 )
...
- support additional platforms (OpenBSD, Darwin)
- make use of /proc/cpuinfo CPU flag information
(needed to distinguish EMT64 Xeons from normal ones)
- chose the right CPU related options depending on
GCC version and target architecture
- check if the chosen CPU type is actually supported
by the GCC version , fallback to CPUs predecessor
until test compile succeeds
2005-06-03 11:21:43 +02:00
hartmut@mysql.com
5f2f34079b
Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-06-03 10:35:14 +02:00
hartmut@mysql.com
082a3ec958
bundle the check-cpu helper script with source packages.
...
BUG#10696
2005-06-03 10:30:58 +02:00
bar@mysql.com
4876612ae3
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-06-03 11:20:43 +05:00
bar@mysql.com
618934fe5f
Merge
2005-06-03 09:44:13 +05:00
mskold@mysql.com
a6df700259
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-06-03 06:40:40 +02:00
bar@mysql.com
1002a9416b
ctype_utf8.result, ctype_utf8.test:
...
adding test
field.cc:
bug#10714 Inserting double value into utf8 column crashes server:
sprintf was executed with too big length, which caused
crash on some Windows platforms.
2005-06-03 09:37:53 +05:00
bar@mysql.com
fdc7d4cc07
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-06-03 09:29:20 +05:00
serg@serg.mylan
639f8ceb25
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-02 23:00:58 +02:00