Commit graph

2642 commits

Author SHA1 Message Date
lenz@mysql.com
a355f74bf7 - fixed C++-style comments in .c files to make IBM compiler happy
(it barfs on these with a syntax error)
2003-03-11 15:37:31 +01:00
Sinisa@sinisa.nasamreza.org
31248b1a77 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-03-11 15:40:09 +02:00
Sinisa@sinisa.nasamreza.org
873bc4976b Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-11 14:42:07 +02:00
Sinisa@sinisa.nasamreza.org
b1e28b5491 A fix for an obvious bug in hash generating proram. 2003-03-10 17:14:01 +02:00
Sinisa@sinisa.nasamreza.org
717455ba26 A fix for privilege checking bug. 2003-03-10 16:58:07 +02:00
lenz@mysql.com
2c849470e0 - typo fix for newly added error message 2003-03-10 13:41:37 +01:00
monty@narttu.mysql.fi
fae2711297 merge 2003-03-10 14:13:46 +02:00
monty@narttu.mysql.fi
6977704d2b after merge fixes 2003-03-10 13:54:20 +02:00
monty@narttu.mysql.fi
f1635f64f9 Merge with 3.23 to get fixes for --user and BACKUP TABLE 2003-03-10 12:48:43 +02:00
monty@narttu.mysql.fi
c231b747e3 Don't allow multiple --user options to mysqld
(First one is used)
2003-03-10 12:24:22 +02:00
monty@narttu.mysql.fi
e98a4473b4 Fix that round(0.1,1) == round(0.1,1) 2003-03-10 12:00:19 +02:00
monty@narttu.mysql.fi
9277579c96 Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into narttu.mysql.fi:/my/mysql-3.23
2003-03-10 11:23:11 +02:00
monty@narttu.mysql.fi
c43b3af78c Don't allow BACKUP TABLE to overwrite files
Fixed memory leak when replication restarts in debug mode
2003-03-10 11:22:37 +02:00
jani@rhols221.adsl.netsonic.fi
c5aadd2821 Made it possible to use --max-delayed-threads=0 in order to disable
INSERT DELAYED.
2003-03-09 19:03:55 +02:00
guilhem@mysql.com
c6f241636f Clearer error message when one forgot to grant REPLICATION SLAVE :
now we'll have something like this :
030308 18:46:58  Slave I/O thread: connected to master 'gb@localhost:3306',  replication started in log 'FIRST' at position 4
030308 18:46:58  While trying to obtain the list of slaves from the master 'localhost:3306', user 'gb' got the following error: 'Access denied. You need the REPLICATION SLAVE privilege for this operation'
030308 18:46:58  Slave I/O thread exiting, read up to log 'FIRST', position 4
instead of "Error updating slave list: Query error".
This fixes bug #80.
2003-03-08 18:53:32 +01:00
serg@serg.mysql.com
299999264e error messages translated by Egor 2003-03-07 15:22:05 +01:00
monty@mashka.mysql.fi
937241aded Fixed an unlikely optimizer bug that casued a core dump in pt_range.cc::sel_cmp() 2003-03-07 14:40:37 +02:00
serg@serg.mysql.com
dd1880be1e Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-03-07 11:58:07 +01:00
serg@serg.mysql.com
b755a87fb1 missing grant check added 2003-03-07 11:55:07 +01:00
monty@mashka.mysql.fi
c0c3a5f357 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-03-07 12:37:18 +02:00
monty@mashka.mysql.fi
987f4c4d8b Fixed AUTO_INCREMENT handling in MyISAM (last auto_increment patch broke things)
Some after merge fixes
2003-03-07 12:36:52 +02:00
monty@mashka.mysql.fi
d56e2acf50 Merge to get fix for LOCK TABLES + DROP TABLE in another thread 2003-03-07 01:20:56 +02:00
guilhem@mysql.com
6b40954a5e remove spaces according to coding rules 2003-03-06 22:53:58 +01:00
guilhem@mysql.com
0a8f3e19a5 Fix so that INSERT DELAYED cares about SQL_LOG_BIN=0 (bug #104) 2003-03-06 22:46:24 +01:00
bell@sanja.is.com.ua
95c4b297b6 do not allow to cache queries with INTO clause 2003-03-06 17:37:12 +02:00
guilhem@mysql.com
ea4f0c383f Make log_pos be non-zero in the binary log, for BEGIN and COMMIT Query_log_events.
Now log_pos is the real position of the event. For events that are between BEGIN and COMMIT,
log_pos is still the BEGIN's log_pos.
This fixes bug #52 (If only transactions are run on the master then t
2003-03-06 16:22:31 +01:00
serg@serg.mysql.com
95af195d11 disable partial timestamps in --new mode 2003-03-06 10:54:27 +01:00
serg@serg.mysql.com
6897b00216 --new option and local variable to optionally turn on
"very new functions" - for now 4.1-compatible TIMESTAMT format
2003-03-05 18:43:56 +01:00
Sinisa@sinisa.nasamreza.org
c643298984 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-05 15:45:11 +02:00
Sinisa@sinisa.nasamreza.org
9034ed296b A better, but larger fix for server_id bug .. 2003-03-05 15:34:58 +02:00
lenz@mysql.com
908bf23cfc - Fixed URL to Using_stack_trace.html (the old one still works, but gets
redirected to the new location
2003-03-05 12:42:10 +01:00
serg@serg.mysql.com
887553913f Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-03-04 21:33:32 +01:00
heikki@hundin.mysql.fi
404116fd1d ha_innodb.cc:
Add comment that Guilhem should check master_log_name, pending etc are right if the master log gets rotated
2003-03-04 19:14:37 +02:00
heikki@hundin.mysql.fi
14749b89bb ha_innodb.cc:
Remove (already commented out) code about storing the latest relay log pos info to InnoDB: we will probably use only the master log pos info when we restart a slave after a crash
2003-03-04 19:06:40 +02:00
serg@serg.mysql.com
e5daf6486c Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2003-03-04 18:03:11 +01:00
serg@serg.mysql.com
80c34b2aef fixed Field::eq() to work with CHAR(0) fields 2003-03-04 18:02:56 +01:00
Sinisa@sinisa.nasamreza.org
4d83bdef2a Fix for SHOW VARIABLES on 64-bit platforms 2003-03-04 18:23:15 +02:00
monty@narttu.mysql.fi
21cc72bfe8 Merge with 3.23 to get fix for deadlock when doing LOCK TABLES in one thread and DROP TABLE in another thread 2003-03-04 13:36:59 +02:00
monty@narttu.mysql.fi
28b6e0269a Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0 2003-03-04 12:32:28 +02:00
monty@narttu.mysql.fi
2a7dfa172c Fixed bug in LOCK TABLE + DROP TABLE when other thread was waiting for a table that was locked bug not droped 2003-03-04 12:22:35 +02:00
monty@narttu.mysql.fi
8c51eb2c12 Fixed a deadlock problem when using LOCK TABLE in one thread and DROP TABLE in another 2003-03-03 20:42:49 +02:00
heikki@hundin.mysql.fi
6ef0f4ad41 ha_innodb.h, ha_innodb.cc, handler.h, handler.cc, sql_class.cc:
Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time
2003-03-03 19:31:01 +02:00
Sinisa@sinisa.nasamreza.org
7dc464ea07 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-03 17:16:09 +02:00
guilhem@mysql.com
6b4f438ddb Replication: small bug fixes in mysql-test-run.sh and in replication code (more reinitializations)
+ fix for #70 
+ test result fix for LOAD DATA LOCAL bug #82
2003-03-03 14:57:02 +01:00
guilhem@mysql.com
49788cf2e1 ChangeSet 1.1625 was faulty as regards sql/mf_iocache.cc and LOAD DATA LOCAL replication tests 2003-03-02 18:20:32 +01:00
serg@serg.mysql.com
31d87cd50c optimizer should check for "field LIKE const" not "field like STRING" 2003-03-02 14:07:32 +01:00
serg@serg.mysql.com
d77cd3835d Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-03-02 01:52:02 +01:00
serg@serg.mysql.com
be580475be fix auto-increment in sub-key and insert ... select 2003-03-02 01:48:57 +01:00
guilhem@mysql.com
e66992aef5 Replication: simplification of init_relay_log_pos: always initialize,
remove variable rli->log_pos_current.
2003-03-02 00:45:19 +01:00
guilhem@mysql.com
10735252ee When the SQL thread cannot read an event from the relay log
("Event too big" etc), stop this thread instead of going on
with the next event, which would certainly lead to slave's data
corruption.
2003-03-02 00:34:44 +01:00
monty@narttu.mysql.fi
065bcf92fb Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0 2003-02-28 22:24:57 +02:00
monty@narttu.mysql.fi
e8aa21c8d3 LOAD DATA INFILE is not replicated if replicate_*_table is set
LOAD DATA LOCAL INFILE was not replicated correctly
2003-02-28 22:24:00 +02:00
bell@sanja.is.com.ua
e087f900e5 used correct function (SCRUM) 2003-02-28 21:17:44 +02:00
monty@narttu.mysql.fi
7eccd99e54 LOAD DATA INFILE is not replicated by slave if replicate_*_table is set 2003-02-28 19:50:05 +02:00
bell@sanja.is.com.ua
4352b9953a fixed SQL_SELECT option with UNIONs 2003-02-27 22:26:09 +02:00
bell@sanja.is.com.ua
47b16dae7a posreview changing (SCRUM)
increased compatibility
postmerge changing
2003-02-27 20:31:54 +02:00
bell@sanja.is.com.ua
80236063a1 merging 2003-02-27 19:38:39 +02:00
monty@narttu.mysql.fi
a0d2a621ed Added detection if pthread_attr_getstacksize() exists
Fixed bug in RAND() usage in mysqlbinlog
2003-02-27 17:35:51 +02:00
monty@narttu.mysql.fi
c20453ba9a Integer values between 9223372036854775807 and 9999999999999999999 are now
regarded as unsigned longlongss, not as floats. This make these values work
similar to values between 10000000000000000000 and 18446744073709551615.
2003-02-27 02:10:19 +02:00
monty@narttu.mysql.fi
61213dbc7a Code cleanup 2003-02-27 00:06:09 +02:00
monty@narttu.mysql.fi
39635eb212 Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0 2003-02-26 23:36:23 +02:00
monty@narttu.mysql.fi
56d0a23cd4 Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0 2003-02-26 23:35:58 +02:00
heikki@hundin.mysql.fi
18dbed8463 ha_innodb.cc:
Remove DEBUG_ASSERT if MySQL internally names a UNIQUE index as the PRIMARY KEY, but inside InnoDB there is no primary key for the table
2003-02-26 19:52:31 +02:00
heikki@hundin.mysql.fi
f407468649 ha_innodb.cc:
Add docs to store_lock()
2003-02-26 19:31:05 +02:00
Sinisa@sinisa.nasamreza.org
1d09675c64 Merge sinisa@work.mysql.com://home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-02-26 15:33:20 +02:00
Sinisa@sinisa.nasamreza.org
571fc250ff A fix for a crashing bug with unspecified database in this type of
command:

load  data infile 'filename' into table db.table;
2003-02-26 15:28:28 +02:00
monty@narttu.mysql.fi
8df5705434 Fix for SHOW TABLE STATUS with empty .frm file 2003-02-26 10:16:50 +02:00
monty@narttu.mysql.fi
20f7ea5c7a Comment column in SHOW TABLE STATUS now reports that it can
contain NULL values (which is the case for a crashed .frm file).
2003-02-26 09:52:19 +02:00
monty@narttu.mysql.fi
326b8abc89 merge with 3.23 to get corrected error message files and rename of files in mysql-test 2003-02-26 00:22:35 +02:00
monty@narttu.mysql.fi
b4fbb06ad8 Portability fix for HPUX10.20 2003-02-25 21:43:24 +02:00
Sinisa@sinisa.nasamreza.org
471800ff48 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-02-25 16:09:47 +02:00
monty@mashka.mysql.fi
9812831194 Fixed "syntax" errors in text message files.
Ensured that all errors messages ends with: ",
2003-02-25 13:41:08 +02:00
monty@mashka.mysql.fi
4e2df79c36 Indentation cleanup 2003-02-25 11:05:07 +02:00
igor@hundin.mysql.fi
726e59827a opt_sum.cc:
Correction for min/max optimization of queries with outer joins
2003-02-23 04:27:03 +02:00
serg@serg.mysql.com
e7715445f3 ALTER TABLE closes all open HANDLER's for the table in question
fixed error handling in HANDLER ... READ FIRST
2003-02-22 18:00:34 +01:00
serg@serg.mysql.com
c954c15a63 do not allow COLUMN and AFTER/FIRST in
ALTER TABLE ... ADD KEY
2003-02-22 01:07:17 +01:00
Sinisa@sinisa.nasamreza.org
891a62eafb Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-02-21 16:23:44 +02:00
lenz@mysql.com
2b1f8fbe67 Reverted Sinisa's patch "Fixing the error messages returned on GRANT
commands" again, since this problem had been fixed differently
already (Thanks to Serg for spotting this)
2003-02-19 16:16:27 +01:00
lenz@mysql.com
8a272349b9 Applied Sinisa's patch:
"A fix for non-releasing locks for multi table updates and multi
table deletes with InnoDB tables."
2003-02-19 15:08:29 +01:00
lenz@mysql.com
7a6d8edfd7 Applying Sinisa's patch:
"Cleaning the code of the remaining OLAP code.
This code is unnecessary in 4.1/5.0"
2003-02-19 14:58:44 +01:00
lenz@mysql.com
64b2048914 - Applying Sinisa's Patch "Fixing the error messages returned on
GRANT commands"
2003-02-19 14:50:40 +01:00
serg@serg.mysql.com
9d633d9a92 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2003-02-19 10:27:15 +01:00
heikki@hundin.mysql.fi
ed6a85b422 ha_innodb.cc:
Add comment about how to modify InnoDB to deal with partial-field prefixes of key value in the future
2003-02-18 20:07:06 +02:00
heikki@hundin.mysql.fi
e690ea09f7 page0cur.c:
Prepare for 5.x where HA_READ_PREFIX_LAST may pass only a few first bytes of the last field in a key value
ha_innodb.cc:
  In 4.0 always assume HA_READ_PREFIX_LAST passes a complete-field prefix of a key value; LIKE queries use a padding trick
2003-02-18 19:43:41 +02:00
bell@sanja.is.com.ua
d5cd5ea4e7 prevented crash on deleting non-constructed analyse object 2003-02-18 10:18:51 +02:00
bell@sanja.is.com.ua
d7316689fd Merge sanja.is.com.ua:/home/bell/mysql/mysql-3.23
into sanja.is.com.ua:/home/bell/mysql/work-3.23
2003-02-18 09:58:25 +02:00
bell@sanja.is.com.ua
352a338147 client port number added to SHOW PROCESSLIST (SCRUM?) 2003-02-17 22:07:26 +02:00
bell@sanja.is.com.ua
126e085749 Merge abelkin@work.mysql.com:/home/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/mysql-4.0
2003-02-17 17:11:11 +02:00
monty@mashka.mysql.fi
6051b2f998 Fixed multi-table-delete for InnoDB tables
Novell patches
2003-02-17 02:14:37 +02:00
monty@mashka.mysql.fi
153cefc61b Merge mashka.mysql.fi:/home/my/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-4.0
2003-02-17 01:07:29 +02:00
monty@mashka.mysql.fi
4c836e8d65 Fixed problem with ISNULL on fields that could not be null 2003-02-17 01:05:04 +02:00
bell@sanja.is.com.ua
05bbea4b25 fixed invalidation of query cache on LOAD DATA 2003-02-14 22:20:38 +02:00
bell@sanja.is.com.ua
203728ae68 fixed memory leak in ANALIZE initialization error reporting 2003-02-14 17:09:09 +02:00
serg@serg.mysql.com
5137c07ace another fix for RAND() initialization 2003-02-12 21:32:35 +01:00
Sinisa@sinisa.nasamreza.org
5376889e28 Fixed YES/NO in Polish messages 2003-02-12 20:42:46 +02:00
Sinisa@sinisa.nasamreza.org
82dd4cd580 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-02-12 15:13:23 +02:00
serg@serg.mysql.com
9dd13a9a4a backported MERGE+MAX bugfix from 4.0 2003-02-12 11:03:41 +01:00
serg@serg.mysql.com
92d6bdc1b6 backporting Peter's fix for better RAND() initialization from 4.0 2003-02-11 23:19:47 +01:00
monty@mashka.mysql.fi
fbc9cd7ee8 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-02-10 17:07:48 +02:00
monty@mashka.mysql.fi
78e7230e73 Better fix for count(distinct) bug 2003-02-10 17:03:27 +02:00
serg@sergbook.mysql.com
14b4b58de7 Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-02-10 14:56:30 +01:00
serg@sergbook.mysql.com
3cc3ec177f error message fixed (new error code will be introduced in 4.1) 2003-02-10 14:47:39 +01:00
serg@sergbook.mysql.com
cba78f827c count(distint) on an empty table crash fixed 2003-02-10 12:01:47 +01:00
monty@mashka.mysql.fi
c0b655aa38 Fixed memory reference error when doing key_column <=> NULL on column that is defined as NOT NULL 2003-02-10 01:21:09 +02:00
Sinisa@sinisa.nasamreza.org
28489be4c0 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-02-08 20:00:11 +02:00
monty@mashka.mysql.fi
025dde7867 Check how much stack we got; Needed to be able to run crash-me 2003-02-08 01:55:16 +02:00
monty@mashka.mysql.fi
7391bc564f Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-02-07 18:01:08 +02:00
monty@mashka.mysql.fi
1b9b042654 Fix problem in MIN/MAX optimisation (from last patch)
Don't make OLD_PASSWORD() a reserved word
2003-02-07 17:57:07 +02:00
heikki@hundin.mysql.fi
7abed55936 ha_innodb.cc:
Clarify the meaning of HA_READ_PREFIX_LAST as a search flag. InnoDB assumed the meaning wrong.
2003-02-07 17:33:15 +02:00
monty@mashka.mysql.fi
f68914addb Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-02-07 15:06:23 +02:00
heikki@hundin.mysql.fi
bd8c8522dc ha_innodb.cc:
Since MySQL uses HA_READ_PREFIX_LAST in a wrong place, we make InnoDB to convert it to a right search condition
2003-02-07 13:28:18 +02:00
monty@mashka.mysql.fi
564c447b27 Allow 4.0 to read new 4.1 .frm files 2003-02-07 10:35:08 +02:00
Sinisa@sinisa.nasamreza.org
c89c969b7c A fix for new conditions being defined and upper condition not updated 2003-02-06 18:50:12 +02:00
monty@mashka.mysql.fi
cf9668fd37 Added START TRANSACTION syntax
Added ALL as parameter option for all group functions.
Make join handling uniform. This allows us to use ',', JOIN and INNER JOIN the same way.
Sort NULL last if DESC is used (ANSI SQL 99 requirement)
2003-02-06 16:55:59 +02:00
heikki@hundin.mysql.fi
a30d3cd847 ha_innobase.cc:
Backport from 4.0: fix potential bug if store_lock is called with TL_IGNORE in the middle of a query
2003-02-05 01:42:07 +02:00
heikki@hundin.mysql.fi
a2de9c66f5 ha_innodb.cc:
Fix potential bug: if MySQL calls store_lock with the TL_IGNORE argument in the middle of query processing, then InnoDB select_lock_type could be reset to LOCK_NONE in a wrong place
2003-02-05 01:24:59 +02:00
monty@mashka.mysql.fi
59400e211f Fixed bug in ulonglong parsing for constructs that only takes unsigned longlong as parameter. 2003-02-04 01:05:39 +02:00
monty@mashka.mysql.fi
e3cd63521c Fix for MIN/MAX with empty tables
MIN(key_column) could in some cases return NULL on a column with NULL and other values.
MIN(key_column) and MAX(key_column) could in some cases return wrong values when used in OUTER JOIN.
2003-02-03 20:20:32 +02:00
monty@mashka.mysql.fi
c42e94a6e6 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-02-02 05:13:51 +02:00
monty@mashka.mysql.fi
a9ee051a4d Fixed core dump bug in 'mysql' when using \p in prompt on Windows.
Fixed error when mysql_unix_port pointed to const string (not uncommon on windows)
2003-02-02 05:13:09 +02:00
serg@serg.mysql.com
45ed0a0841 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-01-30 16:02:11 +01:00
monty@mashka.mysql.fi
9e3fd09305 merge with 3.23.56 to get patches for --lower-case-table-names and
proper handling of SUM() in some functions.
2003-01-29 19:22:22 +02:00
monty@mashka.mysql.fi
b025fa8b32 Fixed compilation error on windows 2003-01-29 19:10:33 +02:00
monty@mashka.mysql.fi
f2299ee72f Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23 2003-01-29 18:56:59 +02:00
monty@mashka.mysql.fi
d88eb71f34 Fixed handling of lower_case_table_names in SHOW TABLE STATUS, mysql_list_fields() and mysql_table_dump().
This fixes some Errcode 13 errors on Windows when deleting tables.
2003-01-29 18:56:34 +02:00
bell@sanja.is.com.ua
c6beb583f6 fixed functions to be able work with group function as argument
made bisone 1.75 compatible code
2003-01-29 10:38:56 +02:00
heikki@hundin.mysql.fi
d2328365e0 ha_innodb.cc:
Cleanup of the previous bug fix: replace code is either SQLCOM_REPLACE or SQLCOM_REPLACE_SELECT
2003-01-29 02:19:00 +02:00
heikki@hundin.mysql.fi
2db574ea19 ha_innodb.cc:
Fix a bug REPLACE INTO t SELECT ... did not work if t has an auto-inc column
2003-01-29 00:31:56 +02:00
peter@mysql.com
91747f0e2c Merge pzaitsev@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/pz/mysql/mysql-4.0-root
2003-01-28 22:08:53 +03:00
monty@mashka.mysql.fi
7811a61b5d merge 2003-01-28 20:59:41 +02:00
monty@mashka.mysql.fi
3d28913740 Only write to the error log if --log-error is specified and --console is not specified
(On Windows --log-error is enabled by default)
2003-01-28 20:56:35 +02:00
peter@mysql.com
682cca2e75 Fix predicted first rand() call 2003-01-28 20:33:47 +03:00
serg@serg.mysql.com
1ced5948f0 low-level error messages cleanup 2003-01-28 17:42:08 +01:00
miguel@hegel.local
ce37b7aac4 Use on Unix hostname.err only when --log-error=path.
Asked by Heikki and Peter.
2003-01-28 13:50:36 -02:00
serg@serg.mysql.com
9199252c22 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-01-28 14:37:12 +01:00
serg@serg.mysql.com
4fb3244014 fixed "DROP table_open_in_handler" hang 2003-01-28 14:36:22 +01:00
monty@mashka.mysql.fi
6b71279382 merge 2003-01-28 09:02:51 +02:00
monty@mashka.mysql.fi
152f0603e7 Merge with 3.23.56 (Replace manual with 'empty' document)
Fix for bug when using auto_increment column and LAST_INSERT_ID()
2003-01-28 08:51:03 +02:00
monty@mashka.mysql.fi
689578a099 Fixes for Netware
Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL
2003-01-28 08:38:28 +02:00
monty@mashka.mysql.fi
710ffb2d89 Fix when using auto_increment and last_insert_id() in the same insert statement. 2003-01-28 06:48:26 +02:00
serg@serg.mysql.com
52e440b9a7 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-01-28 00:57:13 +01:00
serg@serg.mysql.com
78f492b112 do not force CONNECTION_ID(), FOUND_ROWS(), PI(), CURRENT_USER(),
and VERSION() to be uppercase in e.g. "select pi()"
2003-01-28 00:55:41 +01:00
Administrador@light.
826993bba2 Added option hostname.err 2003-01-27 15:37:25 -02:00
lenz@mysql.com
82aca82da0 - added a dummy file "reservedwords.texi" to the BK tree and the Makefiles,
so it's part of the distribution (manual.texi includes this file)
   It will be replaced with the correct one from the mysqldoc tree before
   building the distribution
 - removed generation and inclusion of MIRRORS file, since the mirror list
   is no longer part of manual.texi anyway
 - replaced YFLAGS with AM_YFLAGS in sql/Makefile.am to make automake happy
 - Redirect standard error when checking for dpkg-architecture in ltconfig
   to avoid error message showing during configuration
2003-01-27 13:44:16 +01:00
serg@serg.mysql.com
5f6b6fa3b3 fixes for SHOW VARIABLES and --ft-stopword-list 2003-01-27 12:12:12 +01:00
serg@serg.mysql.com
4b61ba5a89 ft_stopword_file added to 'SHOW VARIABLES' output 2003-01-27 11:15:54 +01:00
serg@serg.mysql.com
b031f5f43c Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-01-26 12:33:42 +01:00
monty@mashka.mysql.fi
1bdd1d0626 Merge with 3.23.55 2003-01-25 15:31:07 +02:00
monty@mashka.mysql.fi
fa7a94ed14 Added timeout for wait_for_master_pos
Fixed comparision of log-binary name to handle comparison when file name extension wraps from .999 to .1000
Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
2003-01-25 15:07:51 +02:00
bell@sanja.is.com.ua
9ec97f2c08 fixed table invalidation in simple renaming 2003-01-24 01:54:39 +02:00
Sinisa@sinisa.nasamreza.org
a90a0cc966 small fix for SHOW STATUS 2003-01-23 15:49:56 +02:00
serg@serg.mysql.com
274df58118 --ft_stopword_file command-line option 2003-01-23 13:20:37 +01:00
serg@serg.mysql.com
0a4ca15dc6 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2003-01-21 16:11:07 +01:00
serg@serg.mysql.com
f028989bad fixed double-free bug in COM_CHANGE_USER 2003-01-21 16:07:31 +01:00
Sinisa@sinisa.nasamreza.org
8b82ebc450 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-01-21 16:11:01 +02:00
Sinisa@sinisa.nasamreza.org
74f478f9a5 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-01-21 15:54:36 +02:00
heikki@hundin.mysql.fi
d3145a9135 ha_innobase.cc:
Backport from 4.0: convert TL_READ_NO_INSERT to TL_READ to allow concurrent inserts to the table in INSERT INTO ... SELECT ... FROM table
2003-01-21 00:44:49 +02:00
heikki@hundin.mysql.fi
ff4ef4c4e7 ha_innodb.cc:
Convert TL_READ_NO_INSERT to TL_READ to allow concurrent inserts to the table in INSERT INTO ... SELECT ... FROM table
2003-01-21 00:38:55 +02:00
monty@mashka.mysql.fi
fab7f39e42 Fixed bug with EXPLAIN on empty table 2003-01-20 18:17:14 +02:00
monty@mashka.mysql.fi
a5e30be0d0 Fixed bug in LEFT JOIN with impossible ON/WHERE expression 2003-01-19 17:15:14 +02:00
monty@mashka.mysql.fi
183df2da7f Fixes cases where thd->query was not protected.
This fixes a problem with SHOW PROCESSLIST
2003-01-19 02:00:26 +02:00
monty@mashka.mysql.fi
fb4572a498 Merge with 3.23 to get bug fix for SHOW PROCESSLIST + running thread 2003-01-19 01:31:43 +02:00
monty@mashka.mysql.fi
dd4d4cc8b5 Only set thd->query to 0 if LOCK_thread_count is hold
This fixes a possible core dump problem in SHOW PROCESSLIST
2003-01-18 23:38:55 +02:00
monty@mashka.mysql.fi
9fb477569b Fixed bug with the --slow-log when logging an administrator command
(like FLUSH TABLES).
(Code is already in 4.0)
2003-01-17 15:56:16 +02:00
Sinisa@sinisa.nasamreza.org
90adbe6f45 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-01-17 15:15:27 +02:00
Sinisa@sinisa.nasamreza.org
fe5e05cd90 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-01-17 14:52:50 +02:00
monty@mashka.mysql.fi
9fb3f5aa1a Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-01-17 14:23:48 +02:00
serg@serg.mysql.com
19e81a98e2 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-01-17 12:48:47 +01:00
serg@serg.mysql.com
390982aaa3 bugfix for MERGE tables and MAX(key) 2003-01-17 12:48:23 +01:00
miguel@hegel.local
08aaa21b6e Merge miguel@work.mysql.com:/home/bk/mysql-4.0
into hegel.local:/home/miguel/dev/mysql-4.0
2003-01-16 22:31:54 -04:00
miguel@hegel.local
e2548b3fa5 Fix VC++ error compiler 2003-01-16 22:29:24 -04:00
heikki@hundin.mysql.fi
9a2afb60c7 ha_innodb.cc:
Had forgotten to change ha_innodb.cc to reflect that InnoDB now supports HA_READ_PREFIX_LAST
2003-01-17 00:50:27 +02:00
monty@mashka.mysql.fi
f4b950df96 Merge with 3.23 2003-01-16 20:47:46 +02:00
monty@mashka.mysql.fi
6250c1d974 Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23 2003-01-16 20:12:00 +02:00
serg@serg.mysql.com
c16e908a2b bugfix for 'ANALYZE for MERGE' and table-less MERGE table 2003-01-16 13:23:33 +01:00
heikki@hundin.mysql.fi
01573f0d95 ha_innodb.cc:
Backport from 4.1: make sure change_active_index is only called with a properly initialized InnoDB table handle
2003-01-16 08:06:43 +02:00
heikki@hundin.mysql.fi
0efc57eed6 ha_innodb.cc:
Make SHOW INNODB STATUS aware when we are estimating index range size etc.
2003-01-16 07:15:55 +02:00
heikki@hundin.mysql.fi
7433ffe880 ha_innobase.cc:
Backport from 4.0: fix possible adaprive hash index latch hang
2003-01-16 01:13:50 +02:00
heikki@hundin.mysql.fi
c228dfacdf ha_innodb.cc:
Fix a typo
2003-01-16 01:07:08 +02:00
heikki@hundin.mysql.fi
d7cc9da9b6 ha_innodb.cc:
Fix a possible hang at the adaptive hash index latch if MySQL does query estimations also in the middle of a SELECT statement processing
2003-01-16 00:44:27 +02:00
Sinisa@sinisa.nasamreza.org
2325a5f600 reverting a fix 2003-01-14 16:15:09 +02:00
monty@mashka.mysql.fi
002f92dc21 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-01-14 11:28:08 +02:00
monty@mashka.mysql.fi
8dd439e751 Guard against compiling without -fno-exceptions
Allocate bigger default thread stack because of problems with glibc
Fixed bug in UPDATE ... not_null_field=expression_that_returns_null
Fixed bug in replication when using auto_increment and LOAD DATA INFILE
2003-01-14 11:27:26 +02:00
heikki@hundin.mysql.fi
1b656d45fb sql_handler.cc:
Backport the InnoDB HANDLER bug fix from 4.1
2003-01-13 23:00:11 +02:00
Sinisa@sinisa.nasamreza.org
6f753e37d1 Fix for a crashing bug in send_data.. 2003-01-13 22:36:50 +02:00
Sinisa@sinisa.nasamreza.org
9796fe70b5 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-01-13 15:01:27 +02:00
heikki@hundin.mysql.fi
c314981049 trx0trx.c:
Add diagnostic prints to determine why the 'queries inside InnoDB' might drift upwards
ha_innodb.cc:
  Add more print space to SHOW INNODB STATUS; remove possible memory leak in case there is an error
2003-01-12 22:31:16 +02:00
Sinisa@sinisa.nasamreza.org
6b386c08a5 Fix for a bug in SHOW GRANTS when :
grant on database.* to xx@yy with grant option;

is done.
2003-01-11 18:02:10 +02:00
Sinisa@sinisa.nasamreza.org
b6b2fbe9c7 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-01-10 22:11:11 +02:00
monty@mashka.mysql.fi
1bc3105da3 Fixed core dump bug in str LIKE "%other_str%" where strings contained characters >= 128.
Fixed problem with replication LOAD DATA INFILE when using  --old-rpl-compat.
When executing on master LOAD DATA and InnoDB failed with 'table full' error the binary log was corrupted.
2003-01-10 01:55:05 +02:00
monty@mashka.mysql.fi
74eea66b5a Fixed wrong packed length for packet > 16M. 2003-01-09 23:28:30 +02:00
Sinisa@sinisa.nasamreza.org
6b9f24be88 changing a bit SHOW GRANTS to display empty row in global table. 2003-01-09 23:21:20 +02:00
monty@mashka.mysql.fi
3c08da957e Don't count NULL values in cardinalty for MyISAM tables.
Free row buffer cache after each query for MyISAM tables.
Added table join option FORCE INDEX
Fixed core dump bug when connecting with hostname that could not be resolved.
2003-01-09 02:19:14 +02:00
monty@mashka.mysql.fi
23c13c4539 merge 2003-01-08 11:27:07 +02:00
monty@mashka.mysql.fi
89ef355b9e Fix for bug in LOAD DATA INFILE and replication
Fix for SHOW VARIABLES in embedded server
2003-01-08 11:24:39 +02:00
miguel@hegel.br
aa51a87283 Fix embedded server crash 2003-01-07 23:46:30 -02:00
monty@mashka.mysql.fi
ee59eb2418 Portability fixes
Fixed test suite for HPUX 10.20 and MacOSX
2003-01-07 16:53:10 +02:00
monty@mashka.mysql.fi
9ecf9645eb A lot of portability fixes.
Added rename table for BDB. This fixes a bug in ALTER TABLE with BDB tables.
2003-01-05 20:18:49 +02:00
Sinisa@sinisa.nasamreza.org
0ccaf94016 Fixing that 3.23 API / clients do not disconnect if a large
packet is issued.
2003-01-04 21:02:58 +02:00
monty@mashka.mysql.fi
7d410b7339 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-01-04 15:18:18 +02:00
monty@mashka.mysql.fi
6d5ad61a11 Added support for max_allowed_packet in option files read by mysql_option()
Extended max_allowed_packet for clients to 1G
Fixed bug in sending compressed rows >= 16M
Fix bug in skiping too long packets from clients.
Added checking of wrong command number sent by client.
2003-01-04 15:17:16 +02:00
ram@mysql.r18.ru
74a9fb244a Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.0
into mysql.r18.ru:/usr/home/ram/work/mysql-4.0
2003-01-03 19:47:58 +04:00
ram@mysql.r18.ru
8009c16a34 Fix for the QUOTE() function. 2003-01-03 19:46:15 +04:00
monty@mashka.mysql.fi
9a64d3a17c Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-01-02 16:26:26 +02:00
Sinisa@sinisa.nasamreza.org
da8e96351c Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-01-02 16:22:05 +02:00
Sinisa@sinisa.nasamreza.org
66208fe9ae Fixing some bugs in client - server protocol and adding a feature
that connection does not close in the case when client sends a 
buffer larger then max_allowed_packet.
2003-01-02 16:21:22 +02:00
monty@mashka.mysql.fi
89a842de3c Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-01-02 14:41:31 +02:00
monty@mashka.mysql.fi
9b3968586b Small optimization of sending big blocks.
Updated Italian error messages
2003-01-02 14:29:26 +02:00
heikki@hundin.mysql.fi
80f5621e4c ha_innodb.cc:
Fix bug: could not switch trx isolation back to REPEATABLE READ after switching it to some other level
2002-12-31 10:17:35 +02:00
Sinisa@sinisa.nasamreza.org
c6e42dfaf3 merge fixes 2002-12-27 14:46:23 +02:00
Sinisa@sinisa.nasamreza.org
4833d9dd7a reverting a patch 2002-12-27 14:39:12 +02:00
monty@mashka.mysql.fi
3ca695ea0b Cut hostnames at HOSTNAME_LENGTH to avoid theoretical hostname overruns
Changed long packat handling to check for packets of length 0xffffff.
This does however break packet handling for older clients.
If you are using packets >= 16M then you need to upgrade client and server
after this patch.
2002-12-26 18:26:37 +02:00
monty@mashka.mysql.fi
c729c0ea05 Safety fix to not allow one to specify too big max_alloc_packet to mysqld
Safety fix to not cause conflicts with extended packages in 4.0.
2002-12-26 17:50:07 +02:00
monty@mashka.mysql.fi
afa028dc01 Updated comment 2002-12-26 16:35:15 +02:00
Sinisa@sinisa.nasamreza.org
669184f41e many bug fixes 2002-12-23 14:56:41 +02:00
heikki@hundin.mysql.fi
843e1d8e9c Many files:
Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
sql_select.cc:
  Remove superfluous prints to .err log when a locking SELECT fails to a deadlock or a lock wait timeout
2002-12-22 01:54:29 +02:00
monty@mashka.mysql.fi
446b9c0768 Moved lower_case_table_name check to right place. 2002-12-21 10:57:53 +02:00
monty@mashka.mysql.fi
f03bbd3fe2 Merge with 3.23:
Remove duplicate casedn_str() in mysql_change_db()
Fix for null handling in CASE
2002-12-21 10:56:40 +02:00
monty@mashka.mysql.fi
962042e76d Optimization of CASE bug fix 2002-12-21 10:45:06 +02:00
heikki@hundin.mysql.fi
1033c9d2ec errmsg.txt:
More descriptive foreign key error messages
2002-12-21 03:50:09 +02:00
serg@sergbook.mysql.com
f36fc90c5e Merge work:/home/bk/mysql
into sergbook.mysql.com:/usr/home/serg/Abk/mysql
2002-12-20 19:11:33 +01:00
serg@sergbook.mysql.com
78e0a8497b removed chroot() bugfix, now --chroot in 3.23 is broken again :(( 2002-12-20 18:39:53 +01:00
monty@mashka.mysql.fi
8b56ca0ef3 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-12-20 14:59:35 +02:00
monty@mashka.mysql.fi
b5aa9ae0c7 Changed thd variables max_join_size and select_limit to type ha_rows.
This fixed some optimization problems when using -DBIG_TABLES
Portabilty fixes for OpenUnix and HPUX
Added C and C++ version numbers to mysqlbug
2002-12-20 14:58:27 +02:00
heikki@hundin.mysql.fi
e3b6be19cf ha_innobase.cc:
Better error message to help users who created tables with < 3.23.54 where MySQL implicitly added a PRIMARY KEY definition
2002-12-19 20:58:07 +02:00
Sinisa@sinisa.nasamreza.org
5961bff59b Fix for found rows in multi-table updates 2002-12-18 19:00:00 +02:00
Sinisa@sinisa.nasamreza.org
ee22691344 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-12-16 22:17:34 +02:00
Sinisa@sinisa.nasamreza.org
8ebc983442 fix for a bug in CASE ...WHEN ... 2002-12-16 22:16:57 +02:00
monty@mashka.mysql.fi
43875f50cb Use delayed create index for LOAD DATA INFILE, INSERT ... SELECT and CREATE ... SELECT
(Accidently disabled by a recent push)
2002-12-16 17:28:53 +02:00
Sinisa@sinisa.nasamreza.org
c2f3ff6630 Fix for a bug with mysql_select_db() on manually created
database and lower case table names.
2002-12-14 15:32:36 +02:00
monty@mashka.mysql.fi
15b870d6c9 Merge with 3.23 to get patch for lower_case_table_names for MacOSX 2002-12-14 12:49:55 +02:00
monty@mashka.mysql.fi
9c509fcb52 Transactions in AUTOCOMMIT=0 mode didn't rotate binary log
Don't enable any bulk insert or record caching code if inserting less than MIN_ROWS_TO_USE_BULK_INSERT rows (100)
2002-12-14 12:45:31 +02:00
monty@mashka.mysql.fi
00e005cbdb Make --lower-case-table-names default on MacOSX 2002-12-14 12:25:33 +02:00
monty@mashka.mysql.fi
4886a2340b Transactions in AUTOCOMMIT=0 mode didn't rotate binary log. 2002-12-14 12:05:45 +02:00
monty@mashka.mysql.fi
a37ae546d7 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-12-13 17:54:14 +02:00
pem@mysql.com
c180ae2e9b Fixed syntax error in sql_yacc.yy (with bison 1.75). 2002-12-13 16:38:52 +01:00
monty@mashka.mysql.fi
b4d508b433 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-12-13 16:42:32 +02:00
lenz@mysql.com
7602b3a1f0 - HP/UX 11 compile fix: fixed "records_in_range" class definition
in sql/ha_myisammrg.h (removed "ha_myisammrg::")
2002-12-13 15:42:31 +01:00
monty@mashka.mysql.fi
a716ca2c45 Merge patch for LOCK TABLES and SLAVE STOP 2002-12-13 16:36:08 +02:00
monty@mashka.mysql.fi
af5ff70101 Fixed possible replication problem in LOAD DATA INFILE with innodb tables. 2002-12-13 16:28:15 +02:00
monty@mashka.mysql.fi
3e655c8d1b Forbid SLAVE STOP if the thread executing the query has locked
tables.  This removes a possible deadlock situation.
2002-12-13 16:01:51 +02:00
monty@mashka.mysql.fi
e6c4399f64 RESET SLAVE and CHANGE MASTER will now give an error if slave is running.
This fixes a problem in replication where RESET SLAVE could crash a running slave.
2002-12-13 12:05:24 +02:00
monty@mashka.mysql.fi
62dfd57475 Removed compiler warnings
Fixed wrong variable name for Windows
2002-12-12 21:01:32 +02:00
heikki@hundin.mysql.fi
1b02928216 log.cc:
We must not commit inside InnoDB when LOAD DATA INFILE just writes a block to the binlog; only commit if the log event type is QUERY_EVENT or EXECUTE_LOAD_EVENT
2002-12-11 21:24:28 +02:00
monty@mashka.mysql.fi
e7164aba7e Add CHARSET keyword (missing from last push) 2002-12-11 21:22:57 +02:00
monty@mashka.mysql.fi
5022e56cba Ensure that BEGIN / COMMIT is handled properly if slave dies
Added syntax support for
CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;
2002-12-11 15:46:39 +02:00
monty@mashka.mysql.fi
146814f2ea Merge with 3.23 2002-12-11 13:32:31 +02:00
monty@mashka.mysql.fi
53ac261312 Added back -max to server name if we are using InnoDB. 2002-12-11 12:59:55 +02:00
monty@mashka.mysql.fi
b737eb89a7 Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23 2002-12-11 12:44:50 +02:00
monty@mashka.mysql.fi
c1b233ec55 Fixed rare bug in show processlist which could cause core dump if a new thread was connecting. 2002-12-11 12:44:17 +02:00
serg@serg.mysql.com
215df4fc23 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-12-10 21:38:30 +01:00
miguel@hegel.br
c5e18e6ad2 Update Windows binaries prefix according MySQL Pro release package 2002-12-10 04:17:31 -04:00
serg@serg.mysql.com
9a3f3a124d incorrect bugfix removed. EQ+BETWEEN still cannot be optimized :( 2002-12-10 00:07:25 +01:00
serg@serg.mysql.com
94cb1daa52 ANALYZE for MERGE 2002-12-10 00:06:05 +01:00
serg@serg.mysql.com
b42eff16cb bulk insert code optimized 2002-12-07 22:40:20 +01:00
monty@mashka.mysql.fi
5ed24772e1 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-12-06 22:50:50 +02:00
monty@mashka.mysql.fi
9613e5c2ae Don't initialize fulltext functions twice in multi-table-update 2002-12-06 22:49:16 +02:00
serg@serg.mysql.com
fc076abe85 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-12-05 21:38:55 +01:00
serg@serg.mysql.com
09ed694094 current_user() to return priv_user 2002-12-05 21:38:27 +01:00
heikki@hundin.mysql.fi
5c3c4d3721 row0mysql.c, dict0dict.c, db0err.h, ha_innobase.cc:
Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd
2002-12-05 22:03:24 +02:00
monty@mashka.mysql.fi
7d681c4449 Copy arguments given to mysql_server_init()
Made keybuff_size longlong (To make show variables work similar on 32
and 64 bit systems)
Fixed some 'not initalized variable errors' in multi-table-update.
Fixed memory leak in multi-table-update.
Now all tests works under valgrind without any errors.
2002-12-05 16:38:49 +02:00
monty@mashka.mysql.fi
2435dce96d Merge with 3.23 2002-12-05 03:52:53 +02:00
monty@mashka.mysql.fi
fc06433a69 Removed copying of parameters as this leads to memory leaks in embedded server.
Fixed 'not initialized' memory error.
2002-12-05 03:40:33 +02:00
Sinisa@sinisa.nasamreza.org
5331a7ef8e some code cleanup 2002-12-04 21:39:15 +02:00
Sinisa@sinisa.nasamreza.org
be6b50e152 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-12-04 20:52:42 +02:00
Sinisa@sinisa.nasamreza.org
d527bfbd59 A fix for double free'd pointer bug ... 2002-12-04 20:51:18 +02:00
lenz@mysql.com
1935183975 - Portability fixes for HP compiler on HPUX11 (backport from 4.0 tree)
- sql_analyse.cc: Fixed bug in decimal handling
2002-12-04 16:16:06 +01:00
Sinisa@sinisa.nasamreza.org
cb6d9e0c88 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-12-04 16:13:32 +02:00
Sinisa@sinisa.nasamreza.org
93c7ceaaec Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-12-04 15:28:16 +02:00
Sinisa@sinisa.nasamreza.org
dd2012067e A fix for the bug in a SELECT with joined tables with ORDER BY and
LIMIT clause when filesort had to be used.

In that case LIMIT was applied to filesort of one of the tables, 
although it could not be.

This fix solved problems with LEFT JOIN too...
2002-12-04 15:27:08 +02:00
serg@serg.mysql.com
6dfd1d867e merged 2002-12-04 10:16:19 +01:00
serg@serg.mysql.com
9e61e636be proper casting in COM_TABLE_DUMP (backported from 4.0) 2002-12-04 09:54:58 +01:00
serg@serg.mysql.com
33de7e55f9 Security bug: password length check should be in check_user, not check_connections(),
otherwise COM_CHANGE_USER is unprotected and can be used for both privilege escalation and buffer overrun
2002-12-04 00:27:09 +01:00
monty@hundin.mysql.fi
8830eb4aa9 Change of internal key_field=NULL handling to avoid error messages.
Optimized SELECT DISTINCT ... ORDER BY ... LIMIT
Fixed reference to uninitalized variable
2002-12-03 13:08:25 +02:00
Sinisa@sinisa.nasamreza.org
7a10ed6d83 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-12-02 21:22:56 +02:00
Sinisa@sinisa.nasamreza.org
9b331dc354 Proper fix for SHOW VARS on 64-bit systems 2002-12-02 15:33:16 +02:00
Sinisa@sinisa.nasamreza.org
2c7c19769a moving fix elsewhere ... 2002-12-02 15:12:56 +02:00
monty@hundin.mysql.fi
b9d1e3fc4f Merge work:/my/mysql-3.23 into hundin.mysql.fi:/my/mysql-3.23 2002-12-02 14:17:04 +02:00
Sinisa@sinisa.nasamreza.org
3e684f94a7 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-12-02 14:17:03 +02:00
Sinisa@sinisa.nasamreza.org
757a5faec2 Fix for sum_func IN (..) 2002-12-02 14:16:02 +02:00
monty@hundin.mysql.fi
fab1fcea8b Fixed bug in MAX() optimization when used with JOIN and ON expressions
(Patch from 4.0.5)
2002-12-02 13:41:08 +02:00
monty@hundin.mysql.fi
f89d91c53c Fixed bug in <=> NULL handling 2002-12-02 10:47:15 +02:00
monty@hundin.mysql.fi
ce56f927fa Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0 2002-12-01 00:48:36 +02:00
monty@mashka.mysql.fi
d02d23c4c0 Fixed some bugs from last multi-table-update push.
More tests for multi-table-update & timestamp handling
2002-12-01 00:48:35 +02:00
monty@hundin.mysql.fi
f1b806cfd1 Fixed --datadir for embedded server 2002-12-01 00:02:58 +02:00
Sinisa@sinisa.nasamreza.org
d46dbf535b Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-11-30 22:55:43 +02:00
Sinisa@sinisa.nasamreza.org
8c22407372 a fix for a bug with HAVING sum_func IN (...) 2002-11-30 18:38:44 +02:00
monty@mashka.mysql.fi
bd53a30858 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-11-29 16:41:12 +02:00
monty@mashka.mysql.fi
6603d75213 New multi-table-update code
New (simpler) internal timestamp handling.
More debuging to heap tables.
Small cleanups to multi-table-delete
false -> 0 and true -> 1  (We should use TRUE and FALSE)
2002-11-29 16:40:18 +02:00
heikki@hundin.mysql.fi
ded9245d98 ha_innodb.cc:
Make copies of all string-type start/up options in case C-sharp moves them around; remove the need to specify innodb_log_arch_dir in my.cnf, since it has no relevance anyway
2002-11-29 13:05:37 +02:00
serg@serg.mysql.com
665554d7a2 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2002-11-28 19:38:22 +01:00
serg@serg.mysql.com
a798185ca1 chroot() need chdir("/") afterwards to work 2002-11-28 19:38:01 +01:00
pem@mysql.com
086bd41700 Added 29 {} at the end of clauses in sql_yacc.yy to make it work with bison 1.75. 2002-11-28 18:57:56 +01:00
Sinisa@sinisa.nasamreza.org
c2dcead168 Better fix for 64 bit CPU .. 2002-11-28 16:37:58 +02:00
Sinisa@sinisa.nasamreza.org
7838845cf2 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-11-28 16:27:42 +02:00
Sinisa@sinisa.nasamreza.org
4198b25569 fix for SHOW VARS for IA64 and other 64 bit systems 2002-11-27 18:05:41 +02:00
miguel@hegel.br
0bf945896c Fix for shutdown on several instances servers started as standalone 2002-11-27 10:05:49 -04:00
monty@mashka.mysql.fi
05c732e779 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-11-24 21:44:25 +02:00
monty@mashka.mysql.fi
a976101661 merge with 3.23 to get bugfixes for <=> NULL and --bind-address 2002-11-24 16:37:41 +02:00
monty@mashka.mysql.fi
dfb60ca085 Added new ANSI functions LOCALTIME, LOCALTIMESTAMP and CURRENT_USER
Added CEIL as an alias for CEILING
Cleaned up CHECK constraint handling.
(We don't anymore require braces after CHECK)
Added casting to CHAR.
2002-11-24 15:47:19 +02:00
monty@mashka.mysql.fi
b6446addf7 Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23 2002-11-22 13:38:37 +02:00
monty@mashka.mysql.fi
e1af5fb24d Fixed bug with indexed NULL column <=> NULL
Fix for Mac OS X shutdown
2002-11-22 13:35:43 +02:00
bell@sanja.is.com.ua
ed99de7dcc fixed invalidation of query cache
excluded double call of 'invalidate()'
2002-11-22 00:33:15 +02:00
Sinisa@sinisa.nasamreza.org
c1fa8f6485 A fix for --bind-address=hostname 2002-11-21 17:55:49 +02:00
monty@mashka.mysql.fi
a65beee00d Added 'table lock' state while MySQL is waiting to get locks for tables. 2002-11-21 02:13:37 +02:00
monty@mashka.mysql.fi
dd1b7e0c84 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-11-20 22:57:42 +02:00
monty@mashka.mysql.fi
e65ddf3fc3 Try to optimize the cache buffer size needed for bulk_insert
Fix for shutdown on Mac OS X
2002-11-20 22:56:57 +02:00
heikki@hundin.mysql.fi
0062443489 set_var.cc:
Fix potential bus error in 64-bit computers in SHOW VARIABLES, if int is only 32-bit in them
2002-11-19 22:59:01 +02:00
heikki@hundin.mysql.fi
541c40b000 ha_innobase.cc:
Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table
2002-11-19 17:08:07 +02:00
heikki@hundin.mysql.fi
4b73222d5a row0mysql.c, row0mysql.h, ha_innodb.cc, sql_table.cc, handler.h:
Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp
2002-11-19 16:27:26 +02:00
bell@sanja.is.com.ua
74f229fd61 Merge abelkin@work.mysql.com:/home/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/mysql-4.0
2002-11-17 20:44:16 +02:00
bell@sanja.is.com.ua
64047ea9a7 new status variable (number of queries deleted because of low memory) 2002-11-17 20:41:25 +02:00
serg@serg.mysql.com
0a75fe85d1 merge::records_in_range and optimizer 2002-11-17 18:58:03 +01:00
serg@serg.mysql.com
8796fc2dc5 myisammrg::records_in_range 2002-11-17 18:54:23 +01:00
lenz@mysql.com
996255648b - Applied required modifications for automake 1.5
- "make distcheck" needs to be fixed
2002-11-17 16:45:21 +01:00
monty@mashka.mysql.fi
adfad220f4 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-11-16 21:58:09 +02:00
monty@mashka.mysql.fi
1a96948e81 Small improvement to alloc_root
Add support for LIMIT # OFFSET #
Changed lock handling:  Now all locks should be stored in TABLE_LIST instead of passed to functions.
Don't call query_cache_invalidate() twice in some cases
mysql_change_user() now clears states to be equal to close + connect.
Fixed a bug with multi-table-update and multi-table-delete when used with LOCK TABLES
Fixed a bug with replicate-do and UPDATE
2002-11-16 20:19:10 +02:00
heikki@hundin.mysql.fi
7e7027ae23 ha_innodb.cc:
Remove unintentionally pushed printf
2002-11-15 23:10:51 +02:00
heikki@hundin.mysql.fi
1079b93640 ha_innodb.cc:
Fix another bug introduced in 4.0.4 in AUTO_INCREMENT and deadlock or lock wait timeout
2002-11-15 22:59:16 +02:00
Sinisa@sinisa.nasamreza.org
1ef2528e86 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-11-15 22:02:19 +02:00
Sinisa@sinisa.nasamreza.org
262c501060 A fix for safe updates 2002-11-15 22:01:28 +02:00
heikki@hundin.mysql.fi
be6e811f51 ha_innodb.cc:
Fix bug intoduced in 4.0.4 in REPLACE and AUTO_INCREMENT: if replace did an update, then auto-inc counter was left 1 too low
2002-11-15 18:46:23 +02:00
serg@serg.mysql.com
b4cc92a3d9 Merge serg.mysql.com:/usr/home/serg/Abk/mysql
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-11-14 22:42:19 +01:00
serg@serg.mysql.com
822d4bd037 better fix for OPTIMIZE bug 2002-11-14 22:39:46 +01:00
monty@mashka.mysql.fi
aa67a79632 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-11-14 12:35:33 +02:00
monty@mashka.mysql.fi
7a70332836 Portability fix when using -DBIG_TABLES 2002-11-14 12:21:36 +02:00
serg@serg.mysql.com
31fa2c5084 merged 2002-11-13 23:38:19 +01:00
serg@serg.mysql.com
8a088f2e3c optimize table corruption fixed, though more clean fix is desired.
Fix for another optimize bug is undone, as the new one handles both cases.
test added
2002-11-13 22:55:32 +01:00
serg@serg.mysql.com
9b0aca768d removed redundant line 2002-11-13 15:57:29 +01:00
Sinisa@sinisa.nasamreza.org
84e18e15d0 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-11-13 14:48:28 +02:00
miguel@hegel.local
3cd36e1452 Typo fix (duplicate functions body) 2002-11-12 22:11:59 -02:00
monty@mashka.mysql.fi
07b4140c85 Ensure that mysql_home ends in FN_LIBCHAR after realpath() 2002-11-12 23:26:10 +02:00
Sinisa@sinisa.nasamreza.org
abec0225fc small fix 2002-11-12 17:41:31 +02:00
Sinisa@sinisa.nasamreza.org
c92bbccbc1 Merge 2002-11-12 16:27:52 +02:00
Sinisa@sinisa.nasamreza.org
9ef50038f8 IGNORE_INDEX fix for 4.0 2002-11-12 16:22:26 +02:00
monty@mashka.mysql.fi
d840057ee9 Fix after last merge 2002-11-12 14:09:18 +02:00
monty@mashka.mysql.fi
e634770406 merge 2002-11-12 13:28:58 +02:00
monty@mashka.mysql.fi
97bb57f765 Extended WEEK() to be able to handle ISO weeks.
unlink socket file if mysqld dies on startup
Some optimization of AND expressions
2002-11-12 12:42:42 +02:00
serg@serg.mysql.com
7720348bd2 removed DBUG_ENTER/RETURN tags 2002-11-11 22:43:07 +01:00
monty@mashka.mysql.fi
876f3f4d30 Fixed that NULL and 0 returns 0 instead of NULL
This is coded to not cause a speed impact on top level AND expressions where we don't care if an AND expression returns 0 or NULL
2002-11-11 15:57:35 +02:00
serg@serg.mysql.com
520fe4ff89 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-11-09 20:29:22 +01:00
serg@serg.mysql.com
65f276f10c merged 2002-11-09 19:27:28 +01:00
serg@serg.mysql.com
6b8bf756b1 IGNORE/USE INDEX now work with HA_EXTRA_KEYREAD 2002-11-09 19:15:46 +01:00
heikki@hundin.mysql.fi
648b50660b ha_innodb.cc:
Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE
2002-11-09 18:34:52 +02:00
monty@hundin.mysql.fi
d0ee72c801 Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0 2002-11-09 13:40:44 +02:00
monty@hundin.mysql.fi
b0fae584b9 Portability fixes for HP compiler and HPUX11 2002-11-09 13:26:46 +02:00
monty@hundin.mysql.fi
e08ed8a582 Fixed bug in MAX() optimization when used with JOIN and ON expressions 2002-11-09 09:51:03 +02:00
serg@serg.mysql.com
eb96421a11 corrected error message for OPTIMIZE/ANALYZE/etc,
also for InnoDB that supports CHECK table but not REPAIR
2002-11-08 22:22:23 +01:00
monty@hundin.mysql.fi
0f14b3c27b Merge from 3.23 to get fix for GROUP BY bug 2002-11-08 15:12:51 +02:00
monty@hundin.mysql.fi
771f55023e Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0 2002-11-08 15:12:50 +02:00