Commit graph

17178 commits

Author SHA1 Message Date
bell@sanja.is.com.ua
5e36e83164 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-01-23 21:58:24 +02:00
tomas@poseidon.ndb.mysql.com
e38381f241 backported from 5.0 extra option to ndb_waiter 2005-01-23 12:12:50 +01:00
kent@mysql.com
f15c329005 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-4.1-lenz
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-22 19:33:04 +01:00
igor@rurik.mysql.com
0b61a16fd2 Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-01-22 02:42:54 -08:00
igor@rurik.mysql.com
8527f256c0 select_found.result, select_found.test:
Added a test case for bug #7945.
sql_select.cc:
  Fixed bug #7945. If DISTINCT is used only with constants
  in a query with GROUP BY, we can apply an optimization
  that set LIMIT to 1 only in the case when there is 
  no SQL_CALC_FOUND_ROWS.
2005-01-22 02:40:27 -08:00
heikki@hundin.mysql.fi
e30b5f86e5 fil0fil.c:
Fix a race condition that could cause the assertion space->n_pending_flushes == 0 to fail in fil0fil.c, in fil_space_free(), in DROP TABLE or in ALTER TABLE
2005-01-22 04:45:22 +02:00
tomas@poseidon.ndb.mysql.com
61b50b577e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-21 19:33:54 +01:00
tomas@poseidon.ndb.mysql.com
e291e98d2d Bug#8070
corrected possible unalignment in NdbRecAttr access methods
2005-01-21 17:57:44 +01:00
timour@mysql.com
75195cff33 Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/timka/mysql/src/4.1-virgin
2005-01-21 18:56:18 +02:00
heikki@hundin.mysql.fi
d6706798d2 fil0fil.c:
Fix bug #8021 :Windows error number 87 with multiple tablespaces after mysqld restart; still has to be tested on Windows that this now works
2005-01-21 17:59:23 +02:00
heikki@hundin.mysql.fi
9a03676b69 dict0dict.c:
Fix bug #7831: ALTER TABLE ... ADD CONSTRAINT PRIMARY KEY ... complained about bad foreign key definition
2005-01-21 17:54:50 +02:00
timour@mysql.com
b266ad2c24 Merge mysql.com:/home/timka/mysql/src/4.1-bug-4285
into mysql.com:/home/timka/mysql/src/4.1-dbg
2005-01-21 16:47:51 +02:00
heikki@hundin.mysql.fi
63abeebb55 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-01-21 16:10:41 +02:00
ram@gw.mysql.r18.ru
0bf3ae74b6 A fix (Bug #8015: server refuses to start with long basedir path). 2005-01-21 17:51:24 +04:00
bell@sanja.is.com.ua
938acb3291 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-01-21 14:54:27 +02:00
bar@mysql.com
2f6e0864ad Bug#7943: Wrong prefix lengths reported on UTF-8 columns
SHOW KEYS FROM t1 now displays number of characters in Sub_part,
not number of bytes, to be compatible with SHOW CREATE TABLE.
2005-01-21 16:49:20 +04:00
ram@gw.mysql.r18.ru
9c3c566fcb A fix (bug #7261: Alter table loses temp table with lower_case_table_names=2). 2005-01-21 15:14:31 +04:00
ingo@mysql.com
8555668067 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-21 09:52:49 +01:00
joreland@mysql.com
e0df86cd35 bug#8051 - ndb, typo, more info on crash 2005-01-21 08:28:23 +01:00
joreland@mysql.com
6f8a1f03c0 Bug#8051 - ndb
Make sure to ship error code in system error signal
2005-01-21 07:53:02 +01:00
heikki@hundin.mysql.fi
c1e5f61be1 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-01-20 19:01:44 +02:00
lenz@mysql.com
e456b6c086 - fixed one missing occasion from the mysql_client_test renaming 2005-01-20 17:00:30 +01:00
lenz@mysql.com
9675b0698f - renamed client_test -> mysql_client_test
- renamed the tests that use the embedded server (client_test -> 
  mysql_client_test_embedded, mysqltest -> mysql_test_embedded
  and changed some Makefiles and scripts so they are installed in $bindir
  (required to be able to run the test suite against the embedded server)
2005-01-20 16:25:38 +01:00
ingo@mysql.com
f5d36349a9 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-20 16:20:34 +01:00
ingo@mysql.com
d39d19005f Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-4000
2005-01-20 16:17:33 +01:00
kent@mysql.com
7885d70b88 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-20 14:16:29 +01:00
bell@sanja.is.com.ua
3bd203d3f6 fixed problem with distinct select with grouping and subqueries (BUG#7946) 2005-01-20 13:56:22 +02:00
ingo@mysql.com
4bff1b05fd BUG#6034 - Error code 124: Wrong medium type
Completely recoded the bugfix for 4.1.
This is just a merge changeset.
2005-01-20 12:48:46 +01:00
kent@mysql.com
f4cdb433c6 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-20 12:40:42 +01:00
bar@mysql.com
ca48cfbfcc item_cmpfunc.cc:
Bug#7834 Illegal mix of collations in IN operator
  IN was the first function supporting 
  character set convertion.
  agg_arg_charsets() was written afterwards,
  which is more flexible.
  Now IN just reuses this function.
2005-01-20 15:38:56 +04:00
joreland@mysql.com
187dce645b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-20 12:27:33 +01:00
joreland@mysql.com
e49de25171 bug#8010 - ndb
release connections when last op was simple read
2005-01-20 12:19:48 +01:00
lenz@mysql.com
4b0a82487f Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-01-20 12:09:17 +01:00
lenz@mysql.com
3215550735 - Improved Do-rpm to perform RPM builds inside of a chrooted build
environment (using "build" on SUSE Linux)
2005-01-20 12:07:44 +01:00
lenz@mysql.com
98e7e2b439 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-20 10:47:42 +01:00
joreland@mysql.com
8f0cdf54ee Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-20 10:12:26 +01:00
bar@mysql.com
07be090e6e errmsg.txt:
Minor fix after character set conversion.
2005-01-20 13:08:16 +04:00
joreland@mysql.com
670de075ff Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-20 09:53:29 +01:00
bar@mysql.com
d45e954801 configure.in:
Add SJIS version of Japanese error messages.
  Windows version should include this new file,
  instead of the EUC-JP version.
2005-01-20 12:39:46 +04:00
bar@mysql.com
1650728655 errmsg.txt:
new file
2005-01-20 12:37:02 +04:00
jimw@mysql.com
3bdfe44859 Warn when mysqld starts up with lower_case_table_names=2 but datadir is
on a case-sensitive filesystem. (Bug #7887)
2005-01-19 12:23:24 -08:00
ingo@mysql.com
fd0fdcdaa8 BUG#6034 - Error code 124: Wrong medium type.
Version for 4.1. Committed for merge.
If the result table is one of the select tables in INSERT SELECT,
we must not disable the result tables indexes before selecting.
mysql_execute_command() detects the match for other reasons and
adds the flag OPTION_BUFFER_RESULT to the 'select_options'. 
In this case the result is put into a temporary table first. 
Hence, we can defer the preparation of the insert
table until the result is to be used.
2005-01-19 21:16:27 +01:00
ingo@mysql.com
9a914a0022 BUG#6034 - Error code 124: Wrong medium type.
Version for 4.0. Committed for merge.
If the result table is one of the select tables in INSERT SELECT,
we must not disable the result tables indexes before selecting.
mysql_execute_command() detects the match for other reasons and
adds the flag OPTION_BUFFER_RESULT to the 'select_options'. 
In this case the result is put into a temporary table first. 
Hence, we can defer the preparation of the insert
table until the result is to be used.
2005-01-19 21:13:30 +01:00
sergefp@mysql.com
b1c3e43060 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug7885
2005-01-19 23:02:28 +03:00
bell@sanja.is.com.ua
e05b028c80 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-01-19 20:53:29 +02:00
jimw@mysql.com
027d1ff19e Merge mysql.com:/home/jimw/my/mysql-4.1-build
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-19 10:26:03 -08:00
jimw@mysql.com
effec1490f Fix all BUILD/*max* scripts to use -DBIG_TABLES, like our real Max builds do.
(Simpler fix than last commit -- no need to mess with base_cxxflags.)
2005-01-19 10:24:51 -08:00
joreland@mysql.com
67b044cc47 ndb - make sure scan recevier pointers are aligned 2005-01-19 18:32:34 +01:00
lenz@mysql.com
1cc2c832d4 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-19 14:07:00 +01:00
timour@mysql.com
7fb0de20f3 Final patch for BUG#4285.
This patch collects all previous patches into one.

The main problem was due to that there is are two variables -
dflt_key_cache and sql_key_cache with have more or less duplicate
function. The reson for the bug was that the default value in the key
cache hash was set to dflt_key_cache, then sql_key_cache was set to a
new key cache object, and then dflt_key_cache was set to sql_key_cache
which was different from the dflt_key_cache_var. After sending SIGHUP,
the server was using the original default value for the key cache hash,
which was different from the actual key cache object used for the
default key cache.
2005-01-19 12:55:54 +02:00