mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
7875 commits 2784 branches 343 tags 1.6 GiB
Commit graph

3288 commits

Author SHA1 Message Date
guilhem@mysql.com
612109ffa0 Removing unneeded code: the Intvar_log_event constructor calls the Log_event constructor 
which does e.server_id=thd.server_id.
 2003-12-01 14:59:35 +01:00
Sinisa@sinisa.nasamreza.org
168e81d6b6 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-12-01 13:47:05 +02:00
serg@serg.mylan
77d137a24a Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-11-28 18:18:58 +01:00
monty@mysql.com
4f42a47408 Fixed range optimzier bug (Bug #1828) 2003-11-28 15:45:34 +02:00
serg@serg.mylan
ffb499927c Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-11-28 12:51:15 +01:00
serg@serg.mylan
16e5b4f0ba bug #1945. item(expression)->name=0, crash in find_item_in_list 2003-11-28 12:36:45 +01:00
monty@mysql.com
ed6e446225 Added compilation comment to 'show variables' 
This makes it possible to check origin of binary from the output of 'show variables'
 2003-11-26 03:30:00 +02:00
Sinisa@sinisa.nasamreza.org
94a298466c Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-11-24 15:49:35 +02:00
gluh@gluh.mysql.r18.ru
3ff69d5dc4 Fix for bug #1855: mysqld crashes with certain SSL connections 2003-11-24 13:57:49 +04:00
monty@mysql.com
41eda1c949 Revert patch for bigint handling in double context as it broke normal bigint handling 
The right way to fix this is to change the Field::store(longlong) method to be
Field::store(longlong, bool unsigned_flag), but this is better to do in 4.1 than in 4.0
 2003-11-21 00:11:50 +02:00
konstantin@mysql.com
c4a9dc4f8b fix for bug #1790: 
"BIT_AND() result in GROUP BY different when SQL_BIG_RESULT used"

return value of BIT_AND changed to BIGINT SIGNED
Also the patch fixes another bug: when temporary table is in use and one of
values in group is NULL, BIT_AND always returns zero.
Fixed it to always skip null values.
 2003-11-21 00:03:04 +03:00
konstantin@mysql.com
dd287a4cdf added comments to simple_order, simple_group, no_order, skip_sort_order 2003-11-20 21:21:56 +03:00
bell@sanja.is.com.ua
a1ceb1bd04 database invalidation invalidate queries only of given database (BUG#1898) 2003-11-20 18:12:49 +02:00
serg@serg.mylan
707e7e8992 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-11-19 23:13:48 +01:00
serg@serg.mylan
11f70bdfc4 Bug#1826, HANDLER+ALTER TABLE=crash (unfortunately, it cannot be tested in mysql-test suite) 
more user variable tests
 2003-11-18 22:06:47 +01:00
guilhem@mysql.com
a780924979 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-11-18 17:36:09 +01:00
guilhem@mysql.com
8377acc7d1 Fix for BUG#1870 
"CHANGE MASTER makes SQL thread restart from coordinates of I/O thread".
    So, in CHANGE MASTER:
    when it seems reasonable that the user did not want to discontinue
    its replication (i.e. when he is not specifying host or port or master_log_file
    or master_log_pos; this will be documented), set the coordinates of the
    I/O thread to those of the SQL thread. This way, the SQL thread will see
    no discontinuity in the relay log (i.e. will skip no events), because
    the I/O thread will fill the brand new relay log with the events which
    are just after the position where the SQL thread had stopped
    (before CHANGE MASTER was issued).
    And a new test for this bug.
 2003-11-18 17:31:17 +01:00
Sinisa@sinisa.nasamreza.org
f6ca9afdbd Fix for bug when zeros are to be prepended to decimal field 2003-11-18 15:58:27 +02:00
gluh@gluh.mysql.r18.ru
f159963c00 Fix for bug #1564: 'CREATE TABLE + UNION + same table name = crash' 
(related to previous changeset)
 2003-11-17 18:34:06 +04:00
monty@mashka.mysql.fi
2846a16c57 Merge with 3.23 (only comment changes) 2003-11-17 16:16:56 +02:00
monty@mashka.mysql.fi
ea337204cb Safety fix for alarms on windows. 2003-11-17 12:59:07 +02:00
serg@serg.mylan
60d60a299e Item_uint::save_in_field() added to take into account bigint->decimal case 2003-11-16 17:37:15 +01:00
serg@serg.mylan
0b7ccfa882 make error message more detailed 2003-11-12 22:33:28 +01:00
gluh@gluh.mysql.r18.ru
e78f51fbe9 Fix for bug #1564: CREATE TABLE + UNION + same table name = crash 2003-11-11 18:14:49 +04:00
konstantin@mysql.com
2aff1b520b Merge mysql.com:/home/kostja/mysql/mysql-4.0-root 
into mysql.com:/home/kostja/mysql/mysql-4.0-1724
 2003-11-03 22:53:42 +03:00
guilhem@mysql.com
19c2162bdc Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-11-03 18:25:47 +01:00
guilhem@mysql.com
fbc54c139d When we delete the slave's temp tables from memory, we reset 
rli->save_temporary_tables and slave_open_temp_tables
(in old 4.0 you could make "SHOW STATUS LIKE 'slave_open_temp_tables'" grow
indefinitely by doing RESET SLAVE and replicating always the same CREATE
TEMPORARY TABLE).
It's critical to reset save_temporary_tables to 0 (otherwise you may later
read memory which has been freed) so this changeset should go into 4.1.
 2003-11-03 18:24:01 +01:00
konstantin@mysql.com
0143e48568 fix for bug #1724 'WHERE ... IN() optimizer behaviour 
has changed since 4.0.14'
We need to calculate cost of RANGE
scan if it is present instead of cost of 
FULL scan.
 2003-11-03 19:56:01 +03:00
monty@narttu.mysql.fi
3ebe794733 Portability fix 2003-11-02 16:38:27 +02:00
monty@mysql.com
306ffd74b4 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/my/mysql-4.0
 2003-11-02 15:55:25 +02:00
monty@mysql.com
4668b54837 Call my_sync() after all data is written to .frm file 
Added my_sync() to mysys which will do fsync/fdatasync/_commit() on a file.
 2003-11-02 15:55:02 +02:00
guilhem@mysql.com
c1f7f33960 4 small items in this: 
- when we don't have in_addr_t, use uint32.
- a forgotten initialization of slave_proxy_id in sql/log_event.cc (was not really "forgot", was
"we needn't init it there", but there was one case where we needed...).
- made slave_proxy_id always meaningful in THD and Log_event, so we can
rely more on it (no need to test if it's meaningful). THD::slave_proxy_id
is equal to THD::thread_id except for the slave SQL thread.
- clean up the slave's temporary table (i.e. free their memory) when slave
server shuts down.
 2003-10-31 23:20:23 +01:00
konstantin@mysql.com
f9015d5ac8 thd->query assignment moved out 
of lock scope
 2003-10-31 17:03:08 +03:00
konstantin@mysql.com
2ec94ade8f Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/kostja/mysql/mysql-4.0-root
 2003-10-30 21:31:15 +03:00
konstantin@mysql.com
ca34cf30bd comments about designation of thd->where and 
thd->proc_info added
 2003-10-30 21:30:20 +03:00
guilhem@mysql.com
b99fd4beca Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-10-30 16:13:38 +01:00
monty@narttu.mysql.fi
a4fff85de5 Safety fix for adding service name to search config groups 2003-10-30 01:20:38 +02:00
monty@narttu.mysql.fi
bc00893d16 Change back service name to MySQL 
Don't add service name to read config file segments if it's "MySQL"
Fixed possible memory leak when CHANGE USER failed.
 2003-10-30 01:01:53 +02:00
guilhem@mysql.com
59d0872aa0 Fix for BUG#1686 
"If 2 master threads with same-name temp table, slave makes bad binlog"
and (two birds with one stone) for
BUG#1240 "slave of slave breaks when STOP SLAVE was issud on parent slave
and temp tables".

Here is the design change:
in a slave running with --log-slave-updates, events are now logged with the
thread id they had on the master. So no more id conflicts between master threads,
but introduces id conflicts between one master thread and one normal 
client thread connected to the slave. This is solved by storing the server id
in the temp table's name.

New test which requires mysql-test-run to be run with --manager,
otherwise it will be skipped.

Undoing a Monty's change (hum, a chill runs down my spine ;) which was
"Cleanup temporary tables when slave ends" in ChangeSet 1.1572.1.1.
 2003-10-29 14:23:35 +01:00
serg@serg.mylan
76ff047819 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-10-29 14:01:14 +01:00
serg@serg.mylan
1d617f1888 followup to max_user_connections fix, keep the count more accurate 2003-10-29 08:33:31 +01:00
monty@narttu.mysql.fi
d1572484bb Fix for problem of installing MySQL as a service with 
mysql --install mysql --defualts-file=path-to-file
(Bug #1643)
 2003-10-28 18:36:41 +02:00
serg@serg.mylan
75454930dc fixes for max_user_connections (connections are now counted even if 
max_user_connections is not set - that is no limit - so that when
max_user_connections is set (with SET) old connections are also
taken into account
mutexes are added where appropriate
 2003-10-27 15:14:03 +01:00
gluh@gluh.mysql.r18.ru
08cafccec7 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.pass
 2003-10-22 15:38:20 +05:00
serg@serg.mylan
b93c83ee2a Bug#1271 - RAND_TABLE_BIT in expression and only const_tables in join 2003-10-21 17:34:40 +02:00
gluh@gluh.mysql.r18.ru
f602be8d3f Fix for bug #1271: Undefined variable in PASSWORD() function is not 
handled correctly
 2003-10-21 15:14:06 +05:00
guilhem@mysql.com
e41ed5190c Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-3.23 
into mysql.com:/home/mysql_src/mysql-3.23
 2003-10-18 16:28:40 +02:00
heikki@hundin.mysql.fi
91f5c5e337 thr0loc.c, srv0start.c, srv0srv.c, srv0srv.h, os0thread.h, ha_innodb.cc: 
Backport from 4.1: reduce InnoDB memory consumption if buf pool < 8 MB
 2003-10-17 23:44:34 +03:00
kostja@oak.local
4aedeb3a60 Merge oak.local:/home/kostja/mysql/mysql-4.0-root 
into oak.local:/home/kostja/mysql/mysql-4.0-1274
 2003-10-17 18:44:13 +04:00
guilhem@mysql.com
ce6d736714 A fix for a random test failure rpl_trunc_binlog: don't RESET MASTER 
while the slave is connected.
 2003-10-17 00:00:25 +02:00
bell@sanja.is.com.ua
857b7a80a3 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc_crash-4.0
 2003-10-16 21:17:45 +03:00
monty@mashka.mysql.fi
b1dba93cdb Safety fix to detect multiple calls to my_thread_end() 
Portability fix (For Mac OS X)
 2003-10-16 20:55:15 +03:00
kostja@oak.local
c7d8977f43 fix for one of the bugs spotted by #1274 2003-10-16 17:00:09 +04:00
monty@mashka.mysql.fi
f2884bac40 Changing max_insert_delayed_threads now also changes the size of thread alarm buffer. 2003-10-16 07:44:18 +03:00
monty@mashka.mysql.fi
84d9d98078 Better fix for CREATE TABLE IF NOT EXISTS ... SELECT 
Fixed chsize() problem on windows
Extend default timeout on windows clients to 1 year (to avoid timeout problems)
 2003-10-15 21:41:13 +03:00
monty@mashka.mysql.fi
35c09b8082 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mashka.mysql.fi:/home/my/mysql-4.0
 2003-10-15 16:23:01 +03:00
monty@mashka.mysql.fi
b5849f451d Add more information about memory usage to debug log 2003-10-15 15:21:50 +03:00
monty@mashka.mysql.fi
2d3840f550 Fixed bug in SET enum_system_variable=NULL 2003-10-14 16:30:42 +03:00
serg@serg.mylan
f078e50a6b make LOCK TABLES to work when Lock_tables_priv is granted on the DB level and Select_priv is granted on the table level. 2003-10-14 13:10:41 +02:00
serg@serg.mylan
f3e7012d6e Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-10-14 00:27:04 +02:00
monty@mashka.mysql.fi
c95d142f8f Add new user variables for tuning memory usage: 
query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size
Add more checks for "out of memory" detection in range optimization
 2003-10-11 22:00:24 +03:00
guilhem@mysql.com
b2500829a3 Make the slave die if master is 5.0. Indeed, 5.0 masters send 
a Format_description_log_event (or maybe it will be named
Description_log_event) which is not recognized by 4.0, so
a 4.0 can't be a slave of 5.0. We detect it early to produce
a helpful message instead of "corrupted relay log" later.
 2003-10-09 17:40:38 +02:00
monty@mishka.mysql.fi
813e5816bd Merge bk-internal.mysql.com:/home/bk/mysql-3.23 
into mishka.mysql.fi:/home/my/mysql-3.23
 2003-10-08 21:04:30 +03:00
monty@mishka.mysql.fi
498e1c6d95 Fixed memory leak in send_file 2003-10-08 21:02:53 +03:00
serg@serg.mylan
9d198d35bf merged 2003-10-07 20:41:07 +02:00
vva@eagle.mysql.r18.ru
16b8fd8ece Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.0
 2003-10-07 14:41:04 -04:00
monty@narttu.mysql.fi
446d40e880 After merge fixes 2003-10-07 00:23:29 +03:00
serg@serg.mylan
b58098c3b9 bug #1434 (and related issues) 2003-10-06 20:02:27 +02:00
serg@serg.mylan
2667d7f8cc fix_max_connections to resize alarm_queue (Bug #1435) 2003-10-06 14:11:16 +02:00
serg@serg.mylan
0ce865b6b4 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-10-06 09:24:12 +02:00
vva@eagle.mysql.r18.ru
af3184909c Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.0
 2003-10-03 17:55:57 -04:00
vva@eagle.mysql.r18.ru
795e14871d Fixed bug #1323 (varchar fields becoming char fields adter create ... select) 2003-10-03 17:54:32 -04:00
guilhem@mysql.com
ae054504e3 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-10-03 22:18:34 +02:00
guilhem@mysql.com
52ae1609eb When the I/O thread was stopped while copying a long transaction, and restarted, 
Rotate_log_event::exec_event() believed that the relay log was corrupted. Fixed it
by moving the test for corruption to Start_log_event::exec_event(). 
Changed Rotate_log_event::exec_event() to not increment positions when the
event is seen in the middle of a transaction.
I did a separate commit in 4.1 (so this should not be merged to 4.0) because
code is a bit different in 4.1.
A test to see if the slave detects when the master died while writing a 
transaction to the binlog (uses a forged truncated binlog I made).
 2003-10-03 22:13:01 +02:00
monty@mishka.mysql.fi
3216d0559c Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mishka.mysql.fi:/home/my/mysql-4.0
 2003-10-03 00:42:47 +03:00
monty@mishka.mysql.fi
989ca397b2 Optimized code for setting user variables with := and fixed some bugs in old code (Bug #1194) 
Use forced close of socket to make mysqld shutdown faster when used under valgrind
 2003-10-03 00:40:27 +03:00
guilhem@mysql.com
9f4d29c3f3 Reverting changeset 1.1590 2003-10-02 16:25:47 +02:00
bell@laptop.sanja.is.com.ua
267444b95a Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-qc_crash-4.0
 2003-10-02 16:33:50 +03:00
guilhem@mysql.com
8c13c30142 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-10-01 18:46:24 +02:00
guilhem@mysql.com
301a30cbdd Follow-up of an IRC discussion today. Declaring ignore_log_space_limit volatile, 
and a comment to explain why.
 2003-10-01 18:40:27 +02:00
vva@eagle.mysql.r18.ru
14a2466532 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_1194/mysql-4.0
 2003-10-01 12:22:30 -04:00
vva@eagle.mysql.r18.ru
761c790636 turn Item_func_set_user_var 
::native_val, ::native_val_int and native_val_str into inline
 2003-10-01 12:00:08 -04:00
vva@eagle.mysql.r18.ru
fd835da6ec rewrite Item_func_set_user_var ::val, ::val_str, ::val_int, ::update 
with less code duplication
 2003-09-30 12:32:48 -04:00
vva@eagle.mysql.r18.ru
293f27df35 fixed processing of COM_BINLOG_DUMP to use in mysqlbinlog 2003-09-29 15:42:33 -04:00
lenz@mysql.com
9b8b92faff - enable changing the number of table bits for JOINs to be increased 
from ulong to ulonglong by defining -DBIG_JOINS
 2003-09-29 12:01:10 +02:00
monty@narttu.mysql.fi
89f30200bc Removed random chars after filename for LOAD DATA INFILE (in mysqlbinlog) 
Add quoting for use `database` for mysqlbinlog
Removed test ins0000001
Add support for --replace for exec in mysqltest
Don't refer to install dir in mysqlbinlog.result
 2003-09-29 12:31:35 +03:00
serg@serg.mylan
8c7c4de0b4 enum options renamed to avoid possible name conflicts 2003-09-29 11:21:17 +02:00
guilhem@mysql.com
9d7014c07b Fix for BUG#1345 "SQL Syntax Error in binarylog with DROP TABLES": 
it's just backquoting the db's and table's names
when writing DROP TEMPORARY TABLE to the binlog when a connection ends.
A testcase for this.
 2003-09-28 18:31:49 +02:00
guilhem@mysql.com
bf5be93a13 backport of a fix made in 4.0 to make replication work in 64-bit binaries. 
The 4.0 changeset was:
ChangeSet@1.1579.3.1, 2003-09-26 23:43:22+02:00, guilhem@mysql.com
  Fix for 64-bit machines.
  I am almost sure this is the cause for
  BUG#1381 [Opn]: Bug in replication on HP-UX 64 bit binaries?
  BUG#1256 [CRp]: Replication slave fails to connect to master in 64-bit version
 (Solaris)
  The reason why I think it's wrong is that the normal client code has
  uint32 ip_addr.
  (of course on 32-bit machines it does not matter, but on 64-bit it does).
 2003-09-27 17:16:19 +02:00
guilhem@mysql.com
7dbbd82f13 Fix for 64-bit machines. 
I am almost sure this is the cause for
BUG#1381 [Opn]: Bug in replication on HP-UX 64 bit binaries?
BUG#1256 [CRp]: Replication slave fails to connect to master in 64-bit version (Solaris)
The reason why I think it's wrong is that the normal client code has 
uint32 ip_addr.
(of course on 32-bit machines it does not matter, but on 64-bit it does).
 2003-09-26 23:43:22 +02:00
vva@eagle.mysql.r18.ru
fd2925b7c7 fixed bug #1194 
(changes in Item_func_set_user_var::update, ::val, ::val_str, ::val_int)
 2003-09-24 19:30:20 -04:00
guilhem@mysql.com
e4c7496c14 a small comment about why we call end_io_cache in mysql_load 2003-09-25 00:24:06 +02:00
guilhem@mysql.com
c5242d2f46 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-09-25 00:15:47 +02:00
guilhem@mysql.com
9854acae25 Fix for BUG#1391: 
"If LOAD DATA INFILE 'small_file' fails on master, slave leaves temp files"
(the bug is in the master)
 2003-09-25 00:14:46 +02:00
dlenev@mysql.com
7795de8906 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/dlenev/src/mysql-4.0-bgrn
 2003-09-25 01:25:54 +04:00
dlenev@mysql.com
7826fce264 Fixed BUG#1357 MySQL too eagerly cleanups temporary files for LOAD DATA (SQL_LOAD-...) 2003-09-25 01:25:19 +04:00
guilhem@mysql.com
b4171fe620 Fix for 
Bug #1392 "On Win, slave leaves one temp file after successf. replicating LOAD DATA INFILE"
Windows-specific bug (we forgot to close a file before deleting it).
Patch written by me, tested by Miguel (thanks!) and it works.
 2003-09-24 22:55:04 +02:00
dlenev@mysql.com
ef8cd36168 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/dlenev/src/mysql-4.0-opssl
 2003-09-20 23:13:31 +04:00
serg@serg.mylan
02753ead71 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-09-18 14:35:25 +02:00
kostja@oak.local
6fba16eabf Applied Monty corrections to the FULL SCAN 
optimiser bug patch.
 2003-09-17 21:52:05 +04:00
kostja@oak.local
de3019c61a comment made more explanatory 2003-09-16 21:20:16 +04:00
kostja@oak.local
29eec6c738 join buffer cache usage/not usage is taken 
into account to increase the cost of FULL SCAN
 2003-09-16 04:04:54 +04:00
kostja@oak.local
ab576328f0 Fixed bug in the optimiser for FULL TABLE SCAN case: 
to estimate correctly cost of full table scan we should take into
account rows read and skipped on each iteration.
 2003-09-15 22:21:39 +04:00
bell@sanja.is.com.ua
702b5ad4d6 fixed server crash on moving query block with pointers to same table in it (BUG#988) 
removed server options
 2003-09-15 15:16:13 +03:00
dlenev@mysql.com
1c11077d60 Replaced deprecated since OpenSSL 0.9.7 des_ calls and types with 
their newer DES_ versions.
Provided macros for backward compatibility.
 2003-09-12 22:33:43 +04:00
guilhem@mysql.com
40a88045cb Quick backport of the following bugfix from MySQL 4.0.14. 
DO NOT COPY THIS CODE TO 4.0. The bugfix is better in 4.0,
but here in 3.23 we don't want to add a new error code so
we just use ER_EMPTY_QUERY. Bug was:
"If a query was ignored on the slave (because of
@code{replicate-ignore-table} and other similar rules), the slave
still checked if the query got the same error code (0, no error) as on
the master. So if the master had an error on the query (for example,
``Duplicate entry'' in a multiple-row insert), then the slave stopped
and warned that the error codes didn't match. (Bug #797)"
 2003-09-12 17:26:48 +02:00
serg@serg.mylan
f3dc041621 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-09-12 16:33:49 +02:00
guilhem@mysql.com
59663fc661 * Fix for BUG#1248: "LOAD DATA FROM MASTER drops the slave's db unexpectedly". 
Now LOAD DATA FROM MASTER does not drop the database, instead it only tries to
create it, and drops/creates table-by-table.
* replicate_wild_ignore_table='db1.%' is now considered as "ignore the 'db1'
database as a whole", as it already works for CREATE DATABASE and DROP DATABASE.
 2003-09-11 23:17:28 +02:00
serg@serg.mylan
6ef4dc29c3 fixed: thread lock-up on a FLASH TABLE when another thread has an open handler 
Bug#1204
 2003-09-09 19:23:01 +02:00
monty@mashka.mysql.fi
99490870e6 Cleaned up last bug fixes 
Fix bug in SHOW GRANTS when there is a column privilege but no table privilege
 2003-09-09 20:06:50 +03:00
hf@deer.(none)
05f53a0422 fix for #1211 2003-09-08 14:46:44 +05:00
monty@mashka.mysql.fi
045eb3d8fe Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mashka.mysql.fi:/home/my/mysql-4.0
 2003-09-05 17:06:36 +03:00
carsten@tsort.bitbybit.dk
e0d04fd22b Add QUICK as mysql-recover option in mysqld --help 2003-09-05 14:44:21 +02:00
serg@serg.mylan
493d5f9504 bug#926 fix undone - it caused suboptimal execution plan for "range ON, no WHERE" query 
Another fix applied
 2003-09-05 11:42:21 +02:00
monty@mashka.mysql.fi
439b84afe4 Merge with 3.23 2003-09-05 06:56:28 +03:00
serg@serg.mylan
be96cc0984 bug #1172 - crash on force index() and SEL_ARG::MAYBE_KEY 2003-09-03 22:27:04 +02:00
ram@mysql.r18.ru
5e6d8dd7fe Fix for the bug #971: ORDER BY DESC doesn't return correct num of rows with BDB and an indexed column. 2003-09-02 21:09:28 +05:00
serg@serg.mylan
48e2d15369 bug #928 - arbitrary table grant was used, sort-order wasn't honored 2003-09-02 11:18:13 +02:00
serg@serg.mylan
de627fde80 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-09-01 14:59:56 +02:00
serg@serg.mylan
b2c83e7f03 workaround for IN's special treatment of first argument. Not for 4.1 2003-09-01 14:18:27 +02:00
kostja@oak.local
7a51e36929 removed stale comment 
13:58 <monty> konstantin: the comment is missplaced (probably after merge).
          You can remove it
 2003-08-29 14:38:39 +04:00
monty@narttu.mysql.fi
5e04e2370f Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-08-29 04:17:58 +03:00
monty@narttu.mysql.fi
27e331c30a Revert change of lower-case-table handling as this breaks how alias works. 
Changes like this should be done to 4.1, not to a stable release
 2003-08-29 04:17:30 +03:00
jcole@mugatu.spaceapes.com
289ffc97e7 Merge jcole@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mugatu.spaceapes.com:/home/jcole/bk/mysql-4.0
 2003-08-28 16:06:43 -04:00
jcole@mugatu.spaceapes.com
7a50118793 opt_range.cc: Fixes for out of memory conditions. 2003-08-28 16:06:13 -04:00
monty@narttu.mysql.fi
7d653b2c7c Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-08-28 22:30:11 +03:00
monty@narttu.mysql.fi
a2a1e97226 Portability fixes 2003-08-28 22:18:02 +03:00
serg@serg.mylan
476a0c0fff Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-08-28 12:39:25 +02:00
serg@serg.mylan
4808a6d9f2 oom protection 2003-08-28 12:37:50 +02:00
monty@narttu.mysql.fi
8a77f97079 Add detection of in_addr_t 
Add pack_bits to pack_reclength for dynamic rows.  This solves buffer a possible buffer overflow on update.
(This will probably solve bug #563)
Fix test for available file descriptors in mysqltest
Fixed core dump bug in replication tests when running without transactional table support
 2003-08-28 06:08:17 +03:00
monty@narttu.mysql.fi
c24e0fcc46 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-08-27 22:13:26 +03:00
monty@narttu.mysql.fi
381202354b Fixed unlikely stack bug when having a BIG expression of type 1+1-1+1-1... in certain combinations. Bug #871 2003-08-27 20:00:18 +03:00
miguel@hegel.local
4fd4580f9d Updating translation for Spanish/Portuguese error messages files 2003-08-27 12:22:42 -04:00
monty@narttu.mysql.fi
fe9dc5e711 Add column names for metadata when running mysql with -T 
Change metadata info so that that MIN() and code MAX() reports that they can return NULL. Bug #324
 2003-08-27 10:26:03 +03:00
monty@narttu.mysql.fi
165042204d Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-08-27 02:52:27 +03:00
monty@narttu.mysql.fi
66b160c253 vio ssl structure renames (to get rid of ending _) 
Added TCP/IP read/write timeout for windows
Check on windows if second server is started with same TCP/IP port
 2003-08-27 02:51:39 +03:00
guilhem@mysql.com
2610303bc0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-08-25 16:33:20 +02:00
monty@narttu.mysql.fi
f5a134ba56 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-08-25 17:20:51 +03:00
guilhem@mysql.com
cc29458056 comments about mutexes in replication. 
Don't start the SQL slave thread with SQL_BIG_SELECTS;
it's better to inhibate max_join_size instead.
 2003-08-25 16:20:21 +02:00
monty@narttu.mysql.fi
2c1f1206c3 Better fix for myisamchk --sort-index on windows 
Fixed deadlock bug when doing resize of key buffer while key buffer was in active use
 2003-08-25 17:19:44 +03:00
guilhem@mysql.com
6c9cff9534 Clearer states in SHOW PROCESSLIST for replication threads. 
For example the Binlog_dump thread (on the master) sometimes showed "Slave:".
And there were confusing messages where "binlog" was employed instead
of "relay log".
 2003-08-25 14:13:58 +02:00
monty@narttu.mysql.fi
f83e876065 Update of VC++ project files (to remove link warnings) 
Fix unlock error in myisamchk on windows when doing --sort-index
Use SetFilePointer instead of SetFilePointerEx
 2003-08-25 14:27:32 +03:00
guilhem@mysql.com
cc918272ed The slave threads MUST not care about max_join_size, we start them with 
OPTION_BIG_SELECTS.
 2003-08-23 17:41:43 +02:00
guilhem@mysql.com
c3a18a3da4 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-08-23 16:54:22 +02:00
guilhem@mysql.com
10811aba88 * Fix for a potential bug: 
when the SQL thread stops, set rli->inside_transaction to 0. This is needed if the user
later restarts replication from a completely different place where there are only autocommit
statements.
* Detect the case where the master died while flushing the binlog cache to the binlog
and stop with error. Cannot add a testcase for this in 4.0 (I tested it manually)
as the slave always runs with --skip-innodb.
 2003-08-23 16:53:04 +02:00
monty@narttu.mysql.fi
9d02d19ce8 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-08-23 12:26:08 +03:00
monty@narttu.mysql.fi
e12136b468 show symlinked directories in SHOW CREATE TABLE 2003-08-23 12:25:39 +03:00
Sinisa@sinisa.nasamreza.org
ced195f8a9 After merge fixes 2003-08-22 18:43:46 +03:00
Sinisa@sinisa.nasamreza.org
4d2902a27d grant.result, grant.test, sql_acl.cc: 
Fix for a bug #878
 2003-08-22 18:32:11 +03:00
guilhem@mysql.com
9676fdcbcd Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-08-22 15:42:22 +02:00
guilhem@mysql.com
759a3c1e3c 2 minor edits, plus 
fix for BUG#1113 "INSERT into non-trans table SELECT ; ROLLBACK" does not send warning"
and
fix for BUG#873 "In transaction, INSERT to non-trans table is written too early to binlog".
Now we don't always write the non-trans update immediately to the binlog;
if there is something in the binlog cache we write it to the binlog cache
(because the non-trans update could depend on a trans table which was modified
earlier in the transaction); then in case of ROLLBACK, we write the binlog
cache to the binlog, wrapped with BEGIN/ROLLBACK.
This guarantees that the slave does the same updates.
For ROLLBACK TO SAVEPOINT: when we execute a SAVEPOINT command we write it
to the binlog cache. At ROLLBACK TO SAVEPOINT, if some non-trans table was updated,
we write ROLLBACK TO SAVEPOINT to the binlog cache; when the transaction
terminates (COMMIT/ROLLBACK), the binlog cache will be flushed to the binlog
(because of the non-trans update) so we'll have SAVEPOINT and ROLLBACK TO
SAVEPOINT in the binlog.

Apart from this rare case of updates of mixed table types in transaction, the
usual way is still clear the binlog cache at ROLLBACK, or chop it at
ROLLBACK TO SAVEPOINT (meaning the SAVEPOINT command is also chopped, which
is fine).
Note that BUG#873 encompasses subbugs 1) and 2) of BUG#333 "3 binlogging bugs when doing INSERT with mixed InnoDB/MyISAM".
 2003-08-22 15:39:24 +02:00
monty@narttu.mysql.fi
5192a58140 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-08-22 04:08:16 +03:00
monty@narttu.mysql.fi
efa85aad49 Move test that uses many tables (in query_cache.test) to separate test so that we can get it 'skipped' instead of 'failed' on system where we can't open many files. 2003-08-22 04:07:40 +03:00
serg@serg.mylan
e3a3d00c77 merged 2003-08-21 21:39:22 +02:00
serg@serg.mylan
7f1ffcc453 Bug #1064: SHOW CREATE TABLE: avoid allocations for simple tables, old client compatibility 2003-08-21 21:14:02 +02:00
serg@serg.mylan
5bc4965d70 fix for SHOW CREATE TABLE to report corerct second field's length 2003-08-21 20:21:07 +02:00
serg@serg.mylan
071ec76892 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-08-21 10:45:43 +02:00
serg@serg.mylan
a72587ffb0 sorted 2003-08-21 10:44:17 +02:00
guilhem@mysql.com
165dc895b3 Yesterday I removed process_io_create_file; I shouldn't have. 
Let's say the lack of comments did not help me ;)
Copying it back again and adding comments; now 3.23->4.0
replication of LOAD DATA INFILE works again.
 2003-08-21 10:24:37 +02:00
guilhem@mysql.com
f405287beb Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-08-20 23:25:58 +02:00
guilhem@mysql.com
1dd53ed073 First commit for fixing BUG#1100 
"LOAD DATA INFILE is badly filtered by binlog-*-db rules".
There will probably be a second final one to merge Dmitri's changes
to rpl_log.result and mine.
2 new tests:
rpl_loaddata_rule_m : test of logging of LOAD DATA INFILE when the master has binlog-*-db rules,
rpl_loaddata_rule_s : test of logging of LOAD DATA INFILE when the slave has binlog-*-db rules and --log-slave-updates.
 2003-08-20 23:24:45 +02:00
Sinisa@sinisa.nasamreza.org
e5b841e392 sql_union.cc: 
Merge fix
 2003-08-20 20:16:37 +03:00
dlenev@mysql.com
319017ae9f Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/dlenev/src/mysql-4.0-bg-1086
 2003-08-20 17:25:45 +04:00
monty@narttu.mysql.fi
359846f052 Fixed some varnings from valgrind 
Set min value of max_allowed_packet to 1024
Fixed problem with UNION's without braces and SQL_CALC_FOUND_ROWS, LIMIT #,#
and ORDER BY...LIMIT
 2003-08-20 16:25:44 +03:00
Sinisa@sinisa.nasamreza.org
84c2e91f1e sql_union.cc: 
Fix for SQL_CALC_FOUND_ROWS in UNION's
 2003-08-20 16:14:01 +03:00
Sinisa@sinisa.nasamreza.org
fb774125e8 item_func.h: 
Fix for a bug with LEAST() in WHERE clause
ha_innodb.cc:
  Fix for a configure bug
multi_update.result, multi_update.test:
  Fix for the update with NULL's in the result set
sql_update.cc:
  Fix for the update with NULL's in the result set
   Fix for the update with NULL's in the result set
   Fix for the update with NULL's in the result set
 2003-08-20 15:33:21 +03:00
dlenev@mysql.com
bb96092202 Fix for BUG#1086. Now we don't preserve event's log_pos through 
log-slave-updates since this causes unexpected values in 
Exec_master_log_pos in A->B->C replication setup, synchronization
 problems in master_pos_wait()... 
Still this brokes some functionality in sql/repl_failsafe.cc 
(but this file is not used now)
 2003-08-20 03:38:31 +04:00
guilhem@mysql.com
6e32e19047 Use my_b_append instead of my_b_write on a SEQ_READ_APPEND cache, when we write 
the first 4 bytes of the relay log. Indeed comments in mysys/mf_iocache.c 
say we must always use my_b_append for such a cache.
This *could* avoid a very rare assertion failure which is: 
030524 19:32:38  Slave SQL thread initialized, starting replication in log 'FIRST' at position 0, relay log '/
users/gbichot/4.1.1/mysql-test/var/log/slave-relay-bin.000001' position: 4
030524 19:32:38  next log '/users/gbichot/4.1.1/mysql-test/var/log/slave-relay-bin.000002' is currently active
mysqld: mf_iocache.c:701: _my_b_seq_read: Assertion `pos_in_file == info->end_of_file' failed.
and which seemed to happen always when the SQL thread and/or the I/O thread
were at position 4 in a relay log.
 2003-08-19 17:00:36 +02:00
guilhem@mysql.com
1a5c8be408 Fix for BUG#1096 which is: 
"mysqlbinlog does not comment the original LOAD DATA INFILE if it has a "use xx""
 2003-08-19 15:46:47 +02:00
bell@laptop.sanja.is.com.ua
39a65cd777 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
 2003-08-18 01:56:31 +03:00
monty@narttu.mysql.fi
bb837f3506 fixed typo in last push 2003-08-17 14:37:26 +03:00
monty@narttu.mysql.fi
7b13560ce7 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-08-17 14:10:45 +03:00
monty@narttu.mysql.fi
d79cbc3b99 Fix mutex handling in SHOW_VARIABLES (key_buffer_size was not properly protected) 
Changed some non fatal myisamchk error messages to warnings
 2003-08-17 14:10:15 +03:00
monty@mashka.mysql.fi
a9146ace70 Cleanups to recent patches 
Fix packet error when using wrong GRANT command
 2003-08-15 09:54:19 +03:00
bell@laptop.sanja.is.com.ua
e9e5faacfe Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
 2003-08-15 00:17:43 +03:00
monty@mashka.mysql.fi
fb47e64256 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mashka.mysql.fi:/home/my/mysql-4.0
 2003-08-13 13:26:52 +03:00
serg@serg.mylan
bc9f6cde50 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-08-12 15:30:47 +02:00
serg@serg.mylan
147b34e2f4 snprintf compatibility fix 2003-08-12 15:28:36 +02:00
monty@mashka.mysql.fi
2fb441fdf7 Remove wrong bug fix when calling create_sort_index. 
Fix possible replication bug with LOAD DATA ... IGNORE LINES #
 2003-08-10 05:14:16 +03:00
bell@sanja.is.com.ua
b41599de1c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-merged_qc-4.0
 2003-08-09 14:16:13 +03:00
serg@serg.mylan
083acc29bb BETWEEN bug fix: non-const expressions on both ends 2003-08-09 01:20:02 +02:00
bell@sanja.is.com.ua
ddd3ee8b27 rewritten test using loop (BUG#930) 
removed unused field (now it is in variables)
 2003-08-08 23:27:22 +03:00
serg@serg.mylan
df8b7799cb between range optimization bug (between with const on one end only) 2003-08-08 19:13:27 +02:00
monty@mashka.mysql.fi
6e7a509d06 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mashka.mysql.fi:/home/my/mysql-4.0
 2003-08-07 20:18:51 +03:00
monty@mashka.mysql.fi
8f08c511ee Review of changesets since last pull. 
(Mostly code cleanups)
 2003-08-07 20:16:37 +03:00
serg@serg.mylan
86e79ec380 merged 2003-08-07 14:39:34 +02:00
serg@serg.mylan
2fd6684928 Merge bk-internal:/home/bk/mysql-3.23/ 
into serg.mylan:/usr/home/serg/Abk/mysql
 2003-08-07 14:33:56 +02:00
serg@serg.mylan
7da378f1d1 PRIMARY KEY can erroneously have HA_NULL_PART_KEY flag that breaks correct key sorting 2003-08-07 13:39:53 +02:00
serg@serg.mylan
4235268bef fixed password buffer overflow 2003-08-07 11:16:34 +02:00
serg@serg.mylan
73bb79dbea Bug #792 combination of date-interval and between with mixed constant and non-constant 2003-08-06 15:37:22 +02:00
miguel@hegel.local
27fde36d15 Fix an erronous cast for GCC introduced for to fix VC++ compiler error 2003-08-05 22:57:44 -03:00
serg@serg.mylan
3396c1a89d Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-08-05 16:30:22 +02:00
serg@serg.mylan
c0317ce66c make it clear for optimizer that XOR's are not optimizable at the moment (BUG#992) 2003-08-05 16:29:09 +02:00
miguel@hegel.local
be123fe5a7 Fix VC++ compiler error 2003-08-04 09:44:26 -03:00
guilhem@mysql.com
bb12d905cb 2 bugfixes: 
- Bug #985: "Between RESET SLAVE and START SLAVE, SHOW SLAVE STATUS is wrong."
Now RESET SLAVE puts correct info in mi->host etc. A new test rpl_reset_slave
for that.
- Bug #986: "CHANGE MASTER & START SLAVE do not reset error columns in SHOW
SLAVE STATUS". Now these reset the errors.
 2003-08-04 10:59:44 +02:00
monty@mashka.mysql.fi
9724a25901 Cleaned up code comment 2003-08-03 16:33:04 +03:00
guilhem@mysql.com
41865cf3a6 Fix so that SET PASSWORD is not replicated by the slave if running with 
replicate-*-table rules which exclude 'mysql' tables
(e.g. replicate-wild-ignore-table=mysql.%).
This was already the behaviour for GRANT/REVOKE, I'm extending it to
SET PASSWORD because it seems very logical (the contrary seems illogical).
2 new tests:
- one to test if GRANT and SET PASSWORD are replicated
- one to test if they are not replicated if replicate-wild-ignore-table=mysql.%
The 2nd is also a testcase for BUG#980.
 2003-08-02 23:46:26 +02:00
guilhem@mysql.com
c784b91578 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-08-02 16:11:39 +02:00
guilhem@mysql.com
fa1d0098ec Mark tables 'updating' in sql_acl.cc (mysql_grant(), mysql_table_grant()) so that 
tables_ok() does not ignore them. This fixes random bug #980.
 2003-08-02 16:10:26 +02:00
guilhem@mysql.com
119d3f039d Backporting the changeset below from 4.0, because a customer hits 
the bug with 3.23.
ChangeSet@1.1416.113.1, 2003-03-22 15:22:59+01:00, guilhem@mysql.com
  Fix for #178  Replicating INSERT VALUES(USER()) crashes (SEGV) the slave
      Now it does not SEGV, but USER() is still badly replicated
      (it is replicated to ""), which is a lower priority bug.
 2003-08-01 22:29:38 +02:00
serg@serg.mylan
5ac7f31b57 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-08-01 14:58:57 +02:00
bell@sanja.is.com.ua
5c1ce3c1fe Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-merged_qc-4.0
 2003-07-30 16:52:56 +03:00
bell@sanja.is.com.ua
86e6cf399e support of more then 255 tables dependence in query cache (fixed BUG#930) 2003-07-30 14:59:56 +03:00
dlenev@mysql.com
8f50cd0472 Fix security bug. mysqld server without ssl support was completly 
ignorant about ssl_type attribute
 2003-07-30 03:33:48 +04:00
heikki@hundin.mysql.fi
a5eacc69e6 mysqld.cc: 
innodb_fast_shutdown CAN take an argument though it was not specified so in mysqld.cc
 2003-07-29 00:04:56 +03:00
guilhem@mysql.com
4eccbd87cd Avoid segfault when LOAD DATA FROM MASTER is run on a master which does no 
binary logging.
 2003-07-28 15:33:46 +02:00
serg@serg.mylan
4e22494ebf outer join, impossible on condition, where, and usable key for range 
bug#926
 2003-07-25 14:32:03 +02:00
guilhem@mysql.com
9e3366c9ad Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-07-24 22:30:20 +02:00
guilhem@mysql.com
aba7647fd8 Fix for BUG#858 "CHANGE MASTER forgets to update relay-log.info"; 
just a flush_relay_log_info() at the end of CHANGE MASTER
(there was already flush_master_info()).
 2003-07-24 22:29:09 +02:00
guilhem@mysql.com
df3b31f3c4 WL#1036 (print the db in slave error messages). 
I extended the task to cleaning error messages, making them look nicer,
and making the output of SHOW SLAVE STATUS (column Last_error) be as complete
as what's printed on the .err file;
previously we would have, for a failure of a replicated LOAD DATA INFILE:
- in the .err, 2 lines:
"duplicate entry 2708 for key 1"
"failed loading SQL_LOAD-5-2-2.info"
- and in SHOW SLAVE STATUS, only:
"failed loading SQL_LOAD-5-2-2.info".
Now SHOW SLAVE STATUS will contain the concatenation of the 2 messages.
 2003-07-24 22:25:36 +02:00
miguel@hegel.local
33c47c7ead Fix for service issue with paths having spaces (bug #687) 2003-07-23 21:57:44 -04:00
Sinisa@sinisa.nasamreza.org
299cef5df7 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-07-23 17:37:51 +03:00
Sinisa@sinisa.nasamreza.org
e08a00bd02 Fuller implementation of lower case table names. 
Bug record #828
 2003-07-23 17:36:56 +03:00
serg@serg.mylan
716e91eecb Bug #473 - GRANT ... TO ''@... was requiring FLUSH PRIVILEGES to work 2003-07-21 13:46:57 +02:00
hf@deer.(none)
cb310f763a Fix for #712 with Serg's suggestions 2003-07-19 18:17:29 +05:00
hf@deer.(none)
a71c5c390b Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0 
into deer.(none):/home/hf/work/mysql-4.0
 2003-07-19 13:51:15 +05:00
Sinisa@sinisa.nasamreza.org
40756106a9 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-07-18 14:14:20 +03:00
monty@narttu.mysql.fi
4d299ef16f Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-07-18 04:38:05 +03:00
monty@narttu.mysql.fi
7b8a54b512 Fixed memory overrun when doing REPAIR on table with multi-part auto_increment key where one part was a packed CHAR 2003-07-18 04:04:24 +03:00
serg@serg.mylan
35c9e97d77 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-07-15 20:44:29 +02:00
serg@serg.mylan
25b16cd6ce bug #702 - ALTER TABLE tm UNION=(t1,t2) doesn't work if t1.MYD is compressed 2003-07-15 20:43:57 +02:00
monty@narttu.mysql.fi
4542d142d7 Portability fixes 2003-07-15 13:10:20 +03:00
monty@narttu.mysql.fi
db3a766bf0 merge 2003-07-14 23:52:17 +03:00
monty@narttu.mysql.fi
b1b73137de Fixed wrong test in LOG::close 
Fixed test for binary build
 2003-07-14 23:49:19 +03:00
heikki@hundin.mysql.fi
bf6938fd4d errmsg.txt: 
Correct a misleading error message about max row length
 2003-07-14 16:04:20 +03:00
heikki@hundin.mysql.fi
cda64baab5 ha_innodb.h: 
Revert the previous patch: MySQL would not allow creation of VARCHAR columns whose total max length is > 8000 bytes, though InnoDB can easily store them as trailing spaces are removed
 2003-07-14 15:53:50 +03:00
heikki@hundin.mysql.fi
79f18d5bb9 ha_innodb.h: 
Fix wrong error message: If one tried to create table with a very big row len, MySQL claimed the max len is 64 kB for InnoDB, while it normally is 8000 bytes
 2003-07-14 15:38:20 +03:00
monty@narttu.mysql.fi
df7c1e8165 Better fix for bug #791: At binlog rotation, INSERTs may not find their way into the binlog 2003-07-14 14:59:26 +03:00
hf@deer.(none)
9b4ebf3d29 Proposed bugfix for #712 
Monty revoked any locks for temporary tables in
ha_myisam::external_lock()
But further code bans using write cache on nonlocked tables
this makes operations much slower
 2003-07-14 12:40:58 +05:00
ram@mysql.r18.ru
60c0fb7b4f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.r18.ru:/usr/home/ram/work/4.0
 2003-07-14 12:40:13 +05:00
ram@mysql.r18.ru
8e23f54fec backport fix for the bug #803: INTERVAL(NULL, ....) 2003-07-14 12:39:10 +05:00
monty@mashka.mysql.fi
568e050ec9 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mashka.mysql.fi:/home/my/mysql-4.0
 2003-07-14 10:18:04 +03:00
monty@mashka.mysql.fi
e1aa90a9bf Safety and speedup fixes: 
Changed is_open() to work as before.
Added back inited argument to LOG
 2003-07-14 10:12:05 +03:00
ram@mysql.r18.ru
f7570df170 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.r18.ru:/usr/home/ram/work/4.0
 2003-07-14 11:23:36 +05:00
guilhem@mysql.com
3c4b68eb1c Cleaning after removing LOG_INFO_PURGE_NO_ROTATE. 2003-07-12 16:04:42 +02:00
guilhem@mysql.com
b7e1fe5ad1 Member no_rotate in MYSQL_LOG was always 0, I delete it. 2003-07-12 15:48:26 +02:00
guilhem@mysql.com
34c8918915 removed 2 small useless if(). 2003-07-12 15:06:40 +02:00
guilhem@mysql.com
fbebac9a48 Fix for BUG#791: 
a safer way of initing the mutexes in MYSQL_LOG.
is_open() is now always thread-safe.
See each file for details.
 2003-07-11 14:26:44 +02:00
ram@mysql.r18.ru
4ca9718375 Fix for the bug #801: create table t1 select x'41'; doesn't work 2003-07-11 14:17:18 +05:00
ram@mysql.r18.ru
82942ebf9d Fix for the bug #803. 
Now INTERVAL(NULL, N1, N2, ...) returns NULL.
 2003-07-10 15:27:02 +05:00
Sinisa@sinisa.nasamreza.org
5d90538e77 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-07-09 15:53:54 +03:00
Sinisa@sinisa.nasamreza.org
3e34c417aa Fix for a bug #807 2003-07-09 15:52:51 +03:00
monty@mashka.mysql.fi
d495656ac5 Cleanups 2003-07-09 00:55:07 +03:00
monty@mashka.mysql.fi
d9e7072210 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mashka.mysql.fi:/home/my/mysql-4.0
 2003-07-09 00:00:16 +03:00
monty@mashka.mysql.fi
b2cbd83913 Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS 
Removed double my_thread_end() which caused fatal error on windows if mysqld died on startup
 2003-07-08 23:58:04 +03:00
heikki@hundin.mysql.fi
f8a767b5d5 ha_innodb.cc: 
Prevent the user from creating InnoDB tables with > 1000 columns
 2003-07-08 20:51:45 +03:00
guilhem@mysql.com
46b0e778b8 Fix for 
BUG#797 "If query ignored on slave (replicate-ignore-table) the slave still checks if
the returned error (0) is the same as the one on the master, whereas it shouldn't
test this.
Plus a new test for BUG#797.
 2003-07-08 15:50:57 +02:00
serg@serg.mylan
74ac300642 typos fixed 2003-07-07 19:35:11 +02:00
serg@serg.mylan
5929f2101d Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-07-07 19:08:17 +02:00
serg@serg.mylan
bbe08e4a03 finally proper recursive descent for parsing expressions with MATCH ... AGAINST in add_ft_keys() 2003-07-07 19:02:58 +02:00
serg@serg.mylan
ec1aca5c52 correct (finally) condition for MATCH >0, >=0 etc in add_ft_keys (SW#1647) 
still no rec. descent
 2003-07-07 16:45:19 +02:00
heikki@hundin.mysql.fi
ea8ed30f03 sql_delete.cc: 
Fix bug: if a DELETE failed in a FOREIGN KEY error and it had already deleted some rows, then MySQL did not roll back the failed SQL statement, and also wrote it to the binlog
 2003-07-07 16:39:53 +03:00
guilhem@mysql.com
e386d0e126 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-07-06 18:01:39 +02:00
guilhem@mysql.com
9c73d91d54 WL#912 (more user control on relay logs): 
FLUSH LOGS now rotates relay logs,
and a new variable max_relay_log_size.
Plus a very small bit of code cleaning.
 2003-07-06 17:59:54 +02:00
Sinisa@sinisa.nasamreza.org
5fb59b2dd6 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-07-04 23:06:22 +03:00
monty@narttu.mysql.fi
d75d6da8c0 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-07-04 23:06:20 +03:00
serg@serg.mylan
38a2ed6f8b Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-07-04 22:06:19 +02:00
monty@narttu.mysql.fi
a3fe7c0959 Remove compiler warnings 
Simple cleanup of previous pull
 2003-07-04 23:06:19 +03:00
ram@mysql.r18.ru
22bce83c1b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.r18.ru:/usr/home/ram/work/4.0
 2003-07-05 01:06:18 +05:00
vva@eagle.mysql.r18.ru
c96c87d51d fixed bug #670 2003-07-04 16:06:17 -04:00
serg@serg.mylan
6a40b8e889 merge + order by (bug #515) temporary fix 
properly fixed in 4.1
 2003-07-04 14:42:57 +02:00
ram@mysql.r18.ru
15346c8a66 fix and test case for the bug #787: HANDLER without INDEX doesn't work with deleted rows 2003-07-04 17:15:16 +05:00
serg@serg.mylan
ede742b630 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-07-04 12:55:46 +02:00
serg@serg.mylan
40b6d07439 handler should be used with constant expressions only (or rand) 2003-07-04 12:55:25 +02:00
monty@narttu.mysql.fi
c835c86864 Fixed memory/lock leak from bug fix 2003-07-04 11:06:58 +03:00
monty@narttu.mysql.fi
7f7d6b4620 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-07-04 03:40:11 +03:00
monty@narttu.mysql.fi
f3af0d7ce4 Status query on killed mysql connection results in segmentation fault (Bug #738) 
Added MAX_PASSWORD_LENGTH. This increased master-slave passwords to 32 bytes (Bug #766)
Fixed server crash on purge master logs or show master logs when binlog is off. (Bug #733)
 2003-07-04 03:18:15 +03:00
Sinisa@sinisa.nasamreza.org
e82d5eeb9b Fix for bug #676 
A security leak with SHOW TABLES/ TABLE STATUS FROM db ...
 2003-07-03 23:41:07 +03:00
heikki@hundin.mysql.fi
0abd1539fa ha_innodb.cc: 
Since the mysql interactive client or some other phase in communication cuts > 64 kB strings to very short, restrict the output of SHOW INNODB STATUS to at most 60 kB
 2003-07-03 22:48:13 +03:00
heikki@hundin.mysql.fi
2a1f87ff72 Many files: 
Remove potential starvation of a full log buffer flush: only flush up to the lsn which was the largest at the time when we requested the full log buffer flush
os0sync.h, os0sync.c:
  Fix a bug in os_event on Unix: even though we signaled the event, some threads could continue waiting if the event became nonsignaled quickly again; this made group commit less efficient than it should be
 2003-07-03 21:25:55 +03:00
hf@deer.(none)
3f4f339f15 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0 
into deer.(none):/home/hf/work/mysql-4.0.739
 2003-07-03 23:25:54 +05:00
hf@deer.(none)
fd4a1d4e54 Fix for #739 
check for negative count in RPAD added
 2003-07-03 23:24:23 +05:00
monty@narttu.mysql.fi
741c1fd9fe Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-07-03 21:04:34 +03:00
monty@narttu.mysql.fi
a2e2099aaf Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-07-03 19:23:29 +03:00
monty@narttu.mysql.fi
be22700954 Fix for UNIXWARE 7 
Remove unaligned warnings on Ia64 from client library when using --host
Fix for replication when using many file descriptors
 2003-07-03 19:23:06 +03:00
hf@deer.(none)
dbb95326b0 Proposed fix for #751 
Fields in key_expr (mysql_ha_read) wasn't linked to tables.
Hmm. How did it work at all?
 2003-07-03 20:57:51 +05:00
hf@deer.(none)
16bf8d7aae Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0 
into deer.(none):/home/hf/work/mysql-4.0
 2003-07-03 19:02:11 +05:00
hf@deer.(none)
372de23532 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0 
into deer.(none):/home/hf/work/mysql-4.0.717
 2003-07-03 16:54:05 +05:00
hf@deer.(none)
eb7ab936bf Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0 
into deer.(none):/home/hf/work/mysql-4.0.628
 2003-07-03 16:50:17 +05:00
monty@narttu.mysql.fi
f259f379e4 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-07-03 11:56:30 +03:00
monty@narttu.mysql.fi
c21728f8c8 Cleaner implementation if INSERT ... SELECT with same tables 
Tests cleanup (put drop database first in tests)
 2003-07-03 11:55:36 +03:00
hf@deer.(none)
0cdf7f39af Proposed bugfix for #717 
Current table is placed into read_tables set of the current join_tab->select
so get_mm_parts function thinks that current table's record is read and
tries to calculate WHERE condition with the fields of the record.
Result of these calculations is unpredictable.
Looks funny - outcome of the SELECT depends on the queries executed before.

Anyway i think we should have testcase on this part of the code.
 2003-07-03 10:42:13 +05:00
guilhem@mysql.com
ace8a06323 I committed the same changeset in my tree yesterday, but broke the tree since, 
so I commit again in a fresh tree.
Fix for bug#763 (Relay_log_space too big by 4 bytes),
plus comments and DBUG_PRINT, and we don't start replication
if --bootstrap.
 2003-07-03 01:08:36 +02:00
pem@mysql.com
b3f153507e Added missing (char*) casts in bzero calls. 
(Needed for platforms with the traditional bzero prototype.)
Fixes BUG#460.
 2003-07-03 01:08:34 +02:00
serg@serg.mylan
437c3af392 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-07-03 01:08:32 +02:00
vva@eagle.mysql.r18.ru
6bbe7b8075 add comment for BUG 672 2003-07-02 19:08:31 -04:00
serg@serg.mylan
b5b4f44a72 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-07-02 23:37:24 +02:00
vva@eagle.mysql.r18.ru
da9d454cc3 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_672/mysql-4.0
 2003-07-02 17:37:23 -04:00
vva@eagle.mysql.r18.ru
55e046a807 fixed bug #672 2003-07-02 16:56:27 -04:00
serg@serg.mylan
dcd13cf264 bug #504: in "datetime op int" comparison int wasn't converted to datetime 2003-07-02 17:12:50 +02:00
Sinisa@sinisa.nasamreza.org
d2d220eabd Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-07-02 15:08:36 +03:00
Sinisa@sinisa.nasamreza.org
1df6492c7d Fix for a problem with : 
CREATE / INSERT ... (SELECT ...) UNION (SELECT ...) LIMIT;
 2003-07-02 14:57:40 +03:00
monty@narttu.mysql.fi
b41cc92373 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-07-02 10:57:03 +03:00
monty@narttu.mysql.fi
1b11e4afad Fixed password check problem on windows (Bug #464) 2003-07-02 10:56:39 +03:00
heikki@hundin.mysql.fi
6ae8ff3cc8 ha_innodb.cc: 
Cleanup
 2003-07-02 02:01:11 +03:00
heikki@hundin.mysql.fi
f67308f612 ha_innodb.cc: 
Remove still some potential hangs over the btr0sea.c semaphore
 2003-07-02 01:57:40 +03:00
Sinisa@sinisa.nasamreza.org
5dedab5571 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-07-02 01:25:34 +03:00
Sinisa@sinisa.nasamreza.org
fb39821e94 Some fixes for CREATE / INSERT FROM UNIO >.. 2003-07-02 01:24:05 +03:00
Sinisa@sinisa.nasamreza.org
b7644c9212 merge changes 2003-07-02 00:26:23 +03:00
Sinisa@sinisa.nasamreza.org
c1660e1a23 Lot's of clean-ups and fixes for 4.0.14. 2003-07-02 00:10:47 +03:00
heikki@hundin.mysql.fi
34346ecfc9 ha_innobase.cc: 
Backport from 4.0 of the btr0sea.c latch hang fix
 2003-07-02 00:08:29 +03:00
heikki@hundin.mysql.fi
e746bb6f58 Merge heikki@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/heikki/mysql-4.0
 2003-07-01 23:53:38 +03:00
heikki@hundin.mysql.fi
19da94db0e ha_innodb.cc: 
Fix a possible hang over the btr0sea.c latch
 2003-07-01 23:52:59 +03:00
serg@serg.mylan
65a36828c8 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-07-01 20:06:57 +02:00
monty@mashka.mysql.fi
ca2913a07e Merge with 3.23 tree to get latest bug fixes 2003-07-01 15:02:16 +03:00
monty@mashka.mysql.fi
9fb7e863ad Optimized old patches 
Don't set field to DEFAULT value when set to NULL
 2003-07-01 14:38:38 +03:00
monty@mashka.mysql.fi
5dab55de73 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mashka.mysql.fi:/home/my/mysql-4.0
 2003-07-01 13:30:55 +03:00
monty@mashka.mysql.fi
048d545a58 Code/testcase cleanups 2003-07-01 13:29:55 +03:00
monty@mashka.mysql.fi
2b0543148d Merge bk-internal.mysql.com:/home/bk/mysql-3.23 
into mashka.mysql.fi:/home/my/mysql-3.23
 2003-07-01 13:09:24 +03:00
serg@serg.mylan
9c89341fd6 new syntax: 
CREATE TABLE ...(SELECT ...) UNION ...
  INSERT ...      (SELECT ...) UNION ...
 2003-06-30 22:24:03 +02:00
serg@serg.mylan
d71b51323b REPAIR/OPTIMIZE/CHECK/RESTORE/etc commands close relevant open HANDLERs 2003-06-30 17:00:11 +02:00
Sinisa@sinisa.nasamreza.org
ef61b1a56f Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-06-30 12:33:35 +03:00
monty@mashka.mysql.fi
730776c452 Fixed 'Unknown error' when doing ORDER BY on reference table which 
was used with NULL value on NOT NULL column. (Bug #479)
 2003-06-29 21:15:51 +03:00
monty@mashka.mysql.fi
81a84424ee SET CHARACTER SET DEFAULT didn't work (Bug #462) 2003-06-29 12:58:43 +03:00
monty@mashka.mysql.fi
34919a03c4 Added thread variable max_seeks_for_key 
Change optimizer to prefer key lookups before table scan
Change table scans to be done after tables with constrains on scanned table
 2003-06-27 03:04:54 +03:00
serg@serg.mylan
c781673bd7 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-06-26 21:31:37 +02:00
serg@serg.mylan
8075aac74f bug with ranges and not_null_col=can_be_null_expr fixed 2003-06-26 21:30:53 +02:00
vva@eagle.mysql.r18.ru
c4e50b8ad7 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-3.23 
into eagle.mysql.r18.ru:/home/vva/work/BUG_479_/mysql-3.23
 2003-06-26 10:31:35 -04:00
gluh@gluh.mysql.r18.ru
8573bdbff8 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.for_fix
 2003-06-26 12:49:03 +05:00
gluh@gluh.mysql.r18.ru
7d43750eb6 Fix bug #673: MySQL 4.0.13 no SSL connection with mysql client possible 2003-06-26 12:47:36 +05:00
monty@mashka.mysql.fi
5f556f11e0 Fixed memory allocation in Unique to not allocate too much memory 2003-06-26 07:56:55 +03:00
hf@deer.(none)
ad5cbc0265 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0 
into deer.(none):/home/hf/work/mysql-4.0.615
 2003-06-26 09:01:25 +05:00
monty@mashka.mysql.fi
7655f05dc2 LEFT JOIN optimization: Change LEFT JOIN to normal join if possible 2003-06-26 05:38:19 +03:00
vva@eagle.mysql.r18.ru
5722ae6627 fixed bug with type of user variables (bug #551) 2003-06-25 21:11:23 -04:00
Sinisa@sinisa.nasamreza.org
66b60b57af Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-06-25 18:40:31 +03:00
Sinisa@sinisa.nasamreza.org
1d93c8f550 Fix for a bug which results in "Unknown Error". 
Query should actually return empty result set, but currently can't, as
it attempts to store NULL in NOT NULL field, because that is a match
made by self join conditions.
 2003-06-25 18:36:52 +03:00
hf@deer.(none)
0ede29ffd0 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0 
into deer.(none):/home/hf/work/mysql-4.0.674
 2003-06-25 17:16:53 +05:00
hf@deer.(none)
044d077893 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0 
into deer.(none):/home/hf/work/mysql-4.0.666
 2003-06-24 17:09:44 +05:00
hf@deer.(none)
3007290f83 Another bugfix for #615 
Looks a bit nicer than previous one
 2003-06-24 10:53:21 +05:00
monty@narttu.mysql.fi
28e96d95c5 Simple code cleanup 2003-06-23 20:05:54 +03:00
monty@narttu.mysql.fi
a51ea11147 SHOW GRANTS hided real grants when grants on both column and table (Bug 654) 2003-06-23 20:03:59 +03:00
Sinisa@sinisa.nasamreza.org
438ed49691 Removing one fix. 2003-06-23 16:05:22 +03:00
monty@narttu.mysql.fi
3bd661a66f Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-06-23 16:00:39 +03:00
serg@sergbook.mylan
d9287bfe61 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-06-23 12:49:38 +02:00
serg@sergbook.mylan
c6d9d57b37 fixed bug in references column grants 2003-06-23 12:48:55 +02:00
monty@narttu.mysql.fi
eeee8f78c9 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-06-23 13:04:21 +03:00
monty@narttu.mysql.fi
9791f47eee Added analyze as alias for optimize 2003-06-23 13:03:04 +03:00
gluh@gluh.mysql.r18.ru
afe1547866 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.defweek
 2003-06-23 12:03:50 +05:00
heikki@hundin.mysql.fi
e2efb08c50 dict0dict.h, dict0dict.c, ha_innodb.cc: 
In ORDER BY MySQL seems to set the key read flag also in the case where the primary key contains only a prefix of a column - not the whole column; to prevent potential bugs retrieve the whole column if the index contains a prefix of it
 2003-06-22 16:20:06 +03:00
guilhem@mysql.com
9990ce576b Fixed cleanup_load_tmpdir() which deleted nothing. 2003-06-22 14:10:46 +02:00
guilhem@mysql.com
04e5a6baa9 Always send a fake Rotate event (this is roughly 70 bytes) when starting binlog_dump. 
This way 3.23.58 slaves will always detect a 4.0.14 master (and stop)
immediately. BUG#198.
 2003-06-21 18:10:59 +02:00
hf@deer.(none)
b24fd86a91 Fix for bug #628 2003-06-21 20:17:50 +05:00
guilhem@mysql.com
dcbcb78536 Can't believe it: one more cset (04-27) which never found his way to the central 
repository (incredible that I forgot to push, but why not).
So unfortunately the bugfix missed 3.23.57 and will be in .58 :(
Instead of looking like working (bug #198), replication between
a 3.23 slave and 4.0 master should frankly stop. Here we detect
4.0 masters in the 3.23 slave code when we see a strange Rotate
event, and in that case we print an error and stop.
4.0.13 and older masters will be "often" caught (see the patch); 4.0.14
and newer masters will always be immediately caught.
 2003-06-21 16:32:27 +02:00
hf@deer.(none)
f0f92fe443 Proposed fix for #674 
This crash happens in rather exotic case when we try to run 
SELECT DISTINCT some_func(SUM(some_field)) GROUP BY another_field;
on a table with single row.
Optimizer marks this table as const, sets group=NULL (with remove_const)
thus, create_tmp_table makes mistake collecting columns for temporary table
and then crashes because the field_count gets less than hidden_columns_count.
 2003-06-21 16:59:40 +05:00
hf@deer.(none)
27c67fbfe7 Fix for bug #666 (Nice number, yeah?) 2003-06-20 20:04:52 +05:00
hf@deer.(none)
eb901ea461 Proposed fix for #615 
So now for the CREATE TABLE foo (id integer NOT NULL default 9)
INSERT INTO foo VALUES (NULL); we get an error
INSERT INTO foo VALUES (1), (NULL), (2); we get one warning
          and second record is set to 9

Is that what we want?
 2003-06-20 18:52:40 +05:00
lenz@mysql.com
bbd1cc89e8 Merge mysql.com:/space/my/mysql-4.0 
into mysql.com:/space/my/mysql-4.0-build
 2003-06-20 15:20:22 +02:00
lenz@mysql.com
6f5cae4358 - added $(EXEEXT) to gen_lex_hash generation/execution to fix a build 
problem on Windows/cygwin (BUG#668)
 2003-06-20 15:19:51 +02:00
guilhem@mysql.com
def18de12c Warn that --log-slave-updates is used without --log-bin and disabled (WL#998) 2003-06-20 13:54:22 +02:00
hf@deer.(none)
faa2b41114 Bug #570 fixed 2003-06-19 22:06:51 +05:00