Commit graph

10521 commits

Author SHA1 Message Date
monty@mysql.com
e0cc6799ec Merge with 4.0.17 2003-12-17 17:35:34 +02:00
monty@mysql.com
30e318311b Fixes for last pull 2003-12-16 14:40:57 +02:00
hf@deer.(none)
0462f48b34 Missed header added 2003-12-16 16:36:12 +04:00
monty@mysql.com
87f7fe5714 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/my/mysql-4.0
2003-12-16 12:20:48 +01:00
monty@mysql.com
56f0abf7bb Portability fixes (mostly test suite)
Make ENGINE= an alias for TYPE= (Compabiltiy with 4.1)
Fix when using symlinked data files and realpath() is not working
2003-12-16 13:20:17 +02:00
guilhem@mysql.com
e56c8c61d8 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-12-16 11:12:40 +01:00
guilhem@mysql.com
db2d812d1b Fix for BUG#2083
"EE_ error codes (EE_DELETE, EE_WRITE) end up in the binlog, making slave stop".
The problem was that during execution of the command on the master, an error
can occur (for example, not space left on device, then mysqld waits and when
there is space it completes successfully: so finally it worked but the error
EE_WRITE remains in thd->net.last_errno and thd->net.last_error).
To know if finally the command succeeded, we test the 'error' variable in
every place, and if it shows no failure we reset thd->net.last_err* using
the function THD::clear_error() which is backported from 4.1.
A new test to see if now only real errors get to the binlog (note: the test
uses "rm").

Also a bit of memory free/alloc saving in log_event.cc (do not free the whole
mem_root after every query in the slave SQL thread: we can keep the initial
block of it; which will be freed when the thread terminates).
2003-12-16 11:10:50 +01:00
jani@rhols221.adsl.netsonic.fi
90a2456faf Some minor code clean up. 2003-12-16 11:44:22 +02:00
jani@rhols221.adsl.netsonic.fi
96555b5f90 Added support for multi statement tests. Use mysqltest internal
command delimiter to change the default delimiter (;) to something
else, a string upto 16 characters is allowed. Separate the sub
queries with ';' and end the whole statement with your own delimiter.
2003-12-16 06:09:44 +02:00
monty@mysql.com
cde713023a Cleanup 2003-12-16 02:23:40 +02:00
monty@mysql.com
3f4b1023d7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-12-15 23:18:40 +01:00
monty@mysql.com
b24671ee2d Updated results 2003-12-15 18:10:46 +01:00
ram@gw.mysql.r18.ru
05c0c4ff26 part one of the fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly 2003-12-15 21:01:38 +04:00
Sinisa@sinisa.nasamreza.org
5310897786 Merge 2003-12-15 18:14:07 +02:00
monty@mysql.com
76eb219781 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-12-15 18:02:29 +02:00
monty@mysql.com
2742701574 Added missing timeout function for named pipes and shared memory (fixes core dump on windows)
Signed auto_increment keys for HASH tables (like for MyISAM tables in 4.0)
nitialize system_charset_info() early. Fixes core dump when starting windows service
2003-12-15 17:58:15 +02:00
monty@mysql.com
217226f9af Portablity fix 2003-12-14 21:31:02 +01:00
monty@mysql.com
427ce41c3c Fixed bug in last push found by valgrind 2003-12-14 08:12:07 -05:00
monty@mysql.com
d47deebb58 Extend max_allowed_packet to 2G in mysql and mysqldump (Bug #2105)
Don't dump data for MRG_ISAM or MRG_MYISAM tables. (Bug #1846)
Ensure that 'lower_case_table_names' is always set on case insensitive file systems. (Bug #1812)
One can now configure MySQL as windows service as a normal user. (Bug #1802)
Database names is now compared with lower case in ON clause when lower_case_table_names is set. (Bug #1736)
IGNORE ... LINES option didn't work when used with fixed length rows. (Bug #1704)
Change INSERT DELAYED ... SELECT... to INSERT .... SELECT (Bug #1983)
Safety fix for service 'mysql start' (Bug #1815)
2003-12-14 06:39:52 +02:00
miguel@hegel.local
6e4329cbe6 Translation update 2003-12-13 18:00:15 -04:00
serg@serg.mylan
68416cc42a Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-12-13 18:49:45 +01:00
serg@serg.mylan
f8ed7ebbe1 insert table select * from table2 now converts charsets correctly 2003-12-13 18:49:10 +01:00
Sinisa@sinisa.nasamreza.org
35b8a0cde9 Already approved bug fix for #1561.
Bug happens in INTERVAL function when number of compared arguments
is 8 or more.
2003-12-13 17:20:35 +02:00
Sinisa@sinisa.nasamreza.org
923422c247 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-12-13 15:41:20 +02:00
Sinisa@sinisa.nasamreza.org
b5f0d76b8a Changing a maxumum value for a variable at a request of one
customer and Dean Ellis.
2003-12-13 14:51:05 +02:00
monty@mysql.com
7443d9ca57 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/my/mysql-4.0
2003-12-13 13:34:40 +02:00
lenz@mysql.com
9f9510026f - Output redirection does not work with run_command(), use system()
instead.
2003-12-13 04:33:36 +01:00
lenz@mysql.com
8411769272 - added missing space for previous commit 2003-12-13 04:23:07 +01:00
lenz@mysql.com
1483e8d372 - fixed file permissions for the server RPM docs directory (BUG 1672) 2003-12-13 03:52:19 +01:00
lenz@mysql.com
2f34b764b1 - Some small Perl enhancements for Do-compile: use more Perl builtins. 2003-12-13 03:49:50 +01:00
monty@mysql.com
6ac169c815 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/my/mysql-4.0
2003-12-13 04:05:54 +02:00
lenz@mysql.com
a85165912b Merge 2003-12-13 03:04:40 +01:00
lenz@mysql.com
90b5c7cf68 Merge 2003-12-13 03:04:39 +01:00
monty@mysql.com
bd92d9b9ae Merge 2003-12-13 04:04:38 +02:00
igor@rurik.mysql.com
e12a31168a Merge rurik.mysql.com:/home/igor/mysql-4.0
into rurik.mysql.com:/home/igor/dev/mysql-4.0-1
2003-12-12 18:04:38 -08:00
vva@eagle.mysql.r18.ru
500192aef3 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2023/mysql-4.0
2003-12-12 22:04:37 -04:00
vva@eagle.mysql.r18.ru
5eb8fa9eaf refixed last vva patch with monty's instructions 2003-12-12 22:02:50 -04:00
vva@eagle.mysql.r18.ru
00d339c4de added checking for old cuted value in Field_enum::store
(bug #2023)
2003-12-12 21:26:44 -04:00
Sinisa@sinisa.nasamreza.org
15ab5d2ada Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-12-13 01:32:00 +02:00
hf@deer.(none)
b4f34fdd2f Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0.1224
2003-12-13 03:32:00 +04:00
heikki@hundin.mysql.fi
6d9aca5069 btr0cur.c, row0umod.c:
Fix bug: if one updated a secondary index column so that its alphabetical value did not change (e.g., abc -> aBc) and rolled back the update, InnoDB failed to return the value in the secondary index to its original value
row0upd.h:
  Correct typing error
sync0sync.ic:
  Remove inadvertently pushed sync debug code
2003-12-13 01:31:59 +02:00
vva@eagle.mysql.r18.ru
c7d940e195 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1951/mysql-4.0
2003-12-12 19:31:58 -04:00
lenz@mysql.com
6876df424c - Reworked the Do-rpm build script to be more flexible
- Reworked testing for gcc3 in the RPM spec file a bit
2003-12-12 23:06:26 +01:00
vva@eagle.mysql.r18.ru
700de3ebec changed %ld on %lu for output of mysql_thread_id(&mysql)
as is thread_id has type ulong
(bug #1951 thread id is printed as "signed" instead of "unsigned" in 'mysql')
2003-12-12 17:18:48 -04:00
igor@rurik.mysql.com
15e70c5480 sql_delete.cc, sql_update.cc, sql_class.h:
Simplification of the previous fix for multi-update/delete.
2003-12-12 13:14:59 -08:00
monty@mysql.com
f995a5f4aa Fix autoincrement for signed columns (Bug #1366)
Fixed problem with char > 128 in QUOTE() function. (Bug #1868)
Disable creation of symlinks if my_disable_symlink is set
Fixed searching of TEXT with end space. (Bug #1651)
Fixed caching bug in multi-table-update where same table was used twice. (Bug #1711)
Fixed problem with UNIX_TIMESTAMP() for timestamps close to 0. (Bug #1998)
Fixed timestamp.test
2003-12-12 22:26:58 +02:00
serg@serg.mylan
28709e8f7e Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-12-12 19:43:52 +01:00
hf@deer.(none)
0abfaa9840 Fix #2093
Update after discussion with Monty
2003-12-12 22:13:57 +04:00
hf@deer.(none)
e6e0937dc4 Proposed fix for #2093
it happens because of the LEFT JOINT optimization in add_key_part()
This optimization does exactly the same in JOIN and in WHERE conditions 
Not right.
I moved that optimization one level upper.
2003-12-12 21:26:20 +04:00
hf@deer.(none)
1485d9b438 Edited fix for #1224.
strcpy changed to strmake
2003-12-12 18:27:25 +04:00