Commit graph

8355 commits

Author SHA1 Message Date
bell@sanja.is.com.ua
3abe558fa8 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2004-10-24 11:32:08 +03:00
bell@sanja.is.com.ua
ce93a3c202 postreview fixes 2004-10-22 22:51:04 +03:00
bell@sanja.is.com.ua
bc68cd7d32 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.0
2004-10-22 22:10:52 +03:00
bell@sanja.is.com.ua
23ba4c325c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2004-10-22 22:08:46 +03:00
dlenev@mysql.com
6b6692dc4d Part of fix for bug #6081 "Call to deprecated mysql_create_db() function
crashes server"

(in 4.0 we fix only connection stalling in case of error, crash itself is
fixed in 4.1, the test case for this code is also there).
2004-10-22 19:27:43 +04:00
heikki@hundin.mysql.fi
dd1b2ace33 os0file.c:
Add typecast from ulint to ssize_t in pread and pwrite, so that the type is according to the Linux man page; this will probably not help to fix the HP-UX 32-bit pwrite failure, since the compiler should do the appropriate typecasts anyway
2004-10-22 10:45:00 +03:00
heikki@hundin.mysql.fi
215cd1e4a3 row0mysql.c, row0ins.c:
Fix bug #5961: release the dictionary latch during a long cascaded FOREIGN KEY operation, so that we do not starve other users
2004-10-22 00:25:57 +03:00
bell@sanja.is.com.ua
ded12c828d Check of temporary tables hiding for query fetched from QC (BUG#6084) 2004-10-21 23:56:12 +03:00
monty@mysql.com
b32ffec8fd Fix test case for innodb-lock 2004-10-20 16:04:28 +03:00
monty@mysql.com
9f8d47d81a Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-10-20 11:25:46 +03:00
monty@mysql.com
1f8b3d0f22 Code cleanups (done during review of new code)
Rename innodb_table_locks_old_behavior -> innodb_table_locks
Set innodb_table_locks to off by default to get same behaviour as in MySQL 4.0.20
(This means that Innodb ignore table locks by default, which makes it easier to combine MyISAM and InnoDB to simulate a transaction)
2004-10-20 11:24:08 +03:00
heikki@hundin.mysql.fi
20ac420eb1 trx0rec.c:
test
2004-10-19 18:58:53 +03:00
paul@ice.snake.net
462aed6c99 libmysql.c:
Add note to mysql_hex_string() comment.
2004-10-19 07:44:20 -05:00
bell@sanja.is.com.ua
72fca68a1d fixed retsult code 2004-10-19 11:54:33 +03:00
bar@mysql.com
c01c8f99ea libmysql.c:
New function mysql_hex_string()
2004-10-19 09:50:47 +05:00
dellis@goetia.(none)
34e5df0d36 Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.0
2004-10-17 18:47:08 -05:00
dellis@goetia.(none)
b9509655a5 mysqld.cc:
BUG #5731 key_buffer_size not properly restricted to 4GB; use UINT_MAX32 for clarity.
2004-10-17 18:44:51 -05:00
hartmut@mysql.com
64c293fdaa Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/hartmut/projects/mysql/dev/4.0
2004-10-16 21:04:57 +02:00
paul@ice.snake.net
1524f2d89d texi2html:
Change parsing of @image argument.
2004-10-15 23:16:02 -05:00
hartmut@mysql.com
b50688d5e9 the $^ directive is a GNU make extension and not really needed here
so lets get rid of it (Bug #6112)
2004-10-15 15:33:30 +02:00
marko@hundin.mysql.fi
90528cbaaa Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-10-15 14:38:59 +03:00
ingo@mysql.com
4082bea2a4 Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-bug5625
2004-10-14 20:04:47 +02:00
ingo@mysql.com
150ab94e0a BUG#5625 - MyISAM Index corruption on ALTER TABLE x ENABLE KEYS due to full tmpdir.
Added a try to a normal repair() if repair_by_sort() failed.
This was not done with ENABLE KEYS and OPTIMIZE TABLE.
Fixed error code handling in mysql_alter_table().
2004-10-14 20:02:56 +02:00
marko@hundin.mysql.fi
edb93ca441 Added startup option and settable session variable
innodb_table_locks_old_behavior: do not acquire an
InnoDB table lock for LOCK TABLES, as in mysql-4.0.18
and earlier.
2004-10-13 22:54:21 +03:00
heikki@hundin.mysql.fi
41ab008a36 ha_innodb.cc:
Change error code to HA_ERR_ROW_IS_REFERENCED if we cannot DROP a parent table referenced by a FOREIGN KEY constraint; this error number is less misleading than the previous value HA_ERR_CANNOT_ADD_FOREIGN, but misleading still; we should introduce to 5.0 a proper MySQL error code
2004-10-12 18:12:00 +03:00
heikki@hundin.mysql.fi
1ddec876d6 Merge heikki@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.0
2004-10-12 18:07:55 +03:00
sergefp@mysql.com
d86b33c641 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/mnt/tmp/mysql-4.0-bug-myisampack
2004-10-11 21:30:25 +04:00
guilhem@mysql.com
c84737d6e8 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-10-11 11:02:24 +02:00
guilhem@mysql.com
13af58aab6 Fix for BUG#5949 "error code 1223 in binlog when using innobackup":
when one connection had done FLUSH TABLES WITH READ LOCK, some updates, and then COMMIT,
it was accepted but my_error() was called and so, while client got no error, error was logged in binlog.
We now don't call my_error() in this case; we assume the connection know what it does.
This problem was specific to 4.0.21. The change is needed to make replication work with existing versions of innobackup.
2004-10-11 11:01:38 +02:00
heikki@hundin.mysql.fi
af3681f2d9 trx0rec.c:
Fix bug #5960: if one updated a column so that its size changed, or updated it to an externally stored (TEXT or BLOB) value, then ANOTHER externally stored column would show up as 512 bytes of good data + 20 bytes of garbage in a consistent read that fetched the old version of the row
2004-10-09 14:13:40 +03:00
monty@mysql.com
d2a5548431 Using MySQL 4.0 with privilege tables from 5.0 caused a crash.
(Fixed this by backporting some logic from 4.1)
2004-10-08 16:32:56 +03:00
jani@a80-186-41-201.elisa-laajakaista.fi
c73cd9ff8a Fixed Bug#5575, mysqlhotcopy is broken when using --noindices 2004-10-07 20:30:30 +03:00
marko@hundin.mysql.fi
badf8e715a InnoDB: tolerate system clock glitches a little better
in the error monitor thread.  (Bug #5898)
2004-10-07 15:58:47 +03:00
rburnett@build.mysql.com
9954abef02 Merge build.mysql.com:/home/bk/mysql-4.0
into build.mysql.com:/users/rburnett/mysql-4.0
2004-10-06 22:03:20 +02:00
monty@mysql.com
97febc4dc4 Code cleanups while doing review of pushed code 2004-10-06 17:20:39 +03:00
ram@gw.mysql.r18.ru
0944bed7fc Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5733
2004-10-06 12:49:56 +05:00
monty@mysql.com
992b04d3d8 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-10-06 01:25:55 +03:00
monty@mysql.com
c27d22b44e Reverted patch for new usage of open_count as it caused more problems than it solved
Cleaned up patch for checking locks for multi-table updates
2004-10-06 01:24:21 +03:00
hf@deer.(none)
7ce60487d9 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0
2004-10-05 21:21:27 +05:00
hf@deer.(none)
ee3b6340b0 Fix for #5730 (Query cache crashes server)
Recusive part leads to stack overflow
2004-10-05 21:19:40 +05:00
marko@hundin.mysql.fi
8ade0f9a14 Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-10-05 17:12:16 +03:00
marko@hundin.mysql.fi
42f3c0eb5b Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-10-05 15:15:45 +03:00
Sinisa@sinisa.nasamreza.org
19c112dfb5 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-10-05 14:54:40 +03:00
Sinisa@sinisa.nasamreza.org
2ffb87f6a5 Fix for wrongly calculated Examined_rows in 4.0 UNION's. 2004-10-05 14:47:10 +03:00
ingo@mysql.com
ca6533dbae Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0
2004-10-05 12:05:13 +02:00
joerg@mysql.com
1b39262a8b Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M40/push-4.0 2004-10-05 11:33:57 +02:00
ingo@mysql.com
c546074e21 Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-bug4286
2004-10-05 11:33:13 +02:00
rburnett@build.mysql.com
b4ee4d358a Bug #5829 mysqlimport garbles path of the file to be imported
Original code was checking ! unix_socket for local_file flag.  This doesn't work and so was removed.  Now
to import a local file, you must use the --local command line option.

mysqlimport.c:
  Removed check of unix_socket to set local_file
2004-10-04 20:26:43 +02:00
vva@eagle.mysql.r18.ru
91e8afac37 patch fixing after review on patch-fixing of
Bug #5492 
"set @@session.read_rnd_buffer_size=33554432" crashes server on query

1. added warning comments for uint3korr (need one more byte allocated)
2. unsigned long in uint3korr was replaced by unsigned int to 
   avoid problems on 64-bits platforms
3. shorten warning comments in init_rr_cache in sql/records.cc
2004-10-04 23:26:42 +05:00
vva@eagle.mysql.r18.ru
d3dc011844 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_5492/mysql-4.0
2004-10-04 21:30:45 +05:00