igor@rurik.mysql.com
5833a5e54a
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-07 04:31:42 -07:00
heikki@hundin.mysql.fi
96ee8cc0d5
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-06-07 13:50:45 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
052a09fef3
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-06-07 13:50:44 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
6a3ee4192d
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-06-07 13:50:43 +03:00
lenz@mysql.com
12ad3e70d6
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/my/mysql-5.0
2005-06-07 12:50:43 +02:00
joreland@mysql.com
60474c8b0b
ndb - backup/restore, fix count of dist keys
...
better fix for bug#10190
2005-06-07 12:50:42 +02:00
igor@rurik.mysql.com
1d976dcb35
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-07 03:07:42 -07:00
igor@rurik.mysql.com
90dd86907e
sql_select.cc, item_buff.cc, item.h:
...
Fixed bug #11088 : a crash for queries with GROUP BY a BLOB column
+ COUNT(DISTINCT...) due to an attempt to allocate a too large
buffer for the BLOB field.
Now the size of the buffer is limited by max_sort_length.
group_by.test, group_by.result:
Added a test case for bug #11088 .
2005-06-07 03:05:57 -07:00
lenz@mysql.com
6e5818e977
- manual merge of mysql.spec.sh
2005-06-07 11:40:56 +02:00
heikki@hundin.mysql.fi
9fa55fb9be
innodb.result:
...
Update Monty's tests for AUTO-INC bug #11080 and bug #11005
2005-06-07 12:32:39 +03:00
heikki@hundin.mysql.fi
9ad74a806a
innodb.test:
...
Update Monty's tests for AUTO-INC bug #11080 and bug #11005
2005-06-07 12:29:49 +03:00
heikki@hundin.mysql.fi
64ed9d3adc
innodb.result, innodb.test:
...
Update Monty's tests for AUTO-INC bug #11080 and bug #11005
2005-06-07 12:27:37 +03:00
heikki@hundin.mysql.fi
8a3c1ae851
ha_innodb.cc:
...
Update the InnoDB internal auto-inc counter in ::write_row() if the statement is a REPLACE that fails in a duplicate key error: REPLACE will handle duplicate key error, and the insert will eventually succeed; note that we did NOT change InnoDB's behavior in an UPDATE, because updating the auto-inc counter in an UPDATE would require a bigger patch (Bug #11005 )
2005-06-07 11:51:27 +03:00
joreland@mysql.com
7050d08f18
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-06-07 10:50:27 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
0d4c57f262
Moved tc_log_page_waits outside HAVE_MMAP,
...
because it's used also outside.
2005-06-07 11:45:28 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
f2933263fb
A fix for systems that don't have HAVE_MMAP defined.
...
Moved some variable externs from sql_class.h to mysql_priv.h
2005-06-07 11:30:09 +03:00
lenz@mysql.com
1c21f84afb
- BUG#10676: don't install "make_win_src_distribution" and "make_win_binary_distribution"
...
when doing "make install" (they are not needed/useful) outside the build tree. Added
"mysql_client_test" to the "MySQL-bench" RPM.
- some small RPM spec file improvements (more variables than hard-coded values, cleanups)
2005-06-07 10:25:51 +02:00
gluh@mysql.com
ac76e6db6a
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Bugs/5.0.10964
2005-06-07 11:31:07 +05:00
stewart@mysql.com
ab96501e4c
merge
2005-06-07 12:44:00 +10:00
monty@mysql.com
068bd3eb97
After merge fixes
2005-06-07 05:43:59 +03:00
stewart@mysql.com
09212cc790
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/stewart/Documents/MySQL/4.1/main
2005-06-07 12:33:36 +10:00
monty@mysql.com
775f17667b
Merge with 4.1
2005-06-07 00:31:53 +03:00
monty@mysql.com
8c94b5fba7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-06-06 20:42:55 +03:00
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
reggie@monster.
d83c495b9e
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into monster.:D:/Work/mysql5.0
2005-06-06 11:45:42 -05: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
reggie@monster.
4283fdb170
fixes for compiler warnings from VC6
2005-06-06 11:34:52 -05:00
bar@mysql.com
abb2d7aa34
ctype_cp1250_ch.result, ctype_cp1250_ch.test:
...
Adding test.
ctype-win1250ch.c:
Bug #9759 Empty result with 'LIKE' and cp1250_czech_cs
Wrong min_sort_char fix.
2005-06-06 21:22:23 +05: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