Commit graph

5598 commits

Author SHA1 Message Date
unknown
093735ad07 - removed duplicate code (merge error) 2003-01-22 12:13:51 +01:00
unknown
f6862ce914 - tagged ChangeSet 1.1509 as "mysql-4.0.9"
- bumped up version number in configure.in to 4.0.10-gamma


configure.in:
   - bump up version number 4.0.9-gamma -> 4.0.10-gamma
2003-01-21 22:36:56 +01:00
unknown
30a35bcfe4 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0


scripts/mysqld_safe.sh:
  Auto merged
sql/net_pkg.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
2003-01-21 15:54:36 +02:00
unknown
d5833961ce ha_innodb.cc:
Convert TL_READ_NO_INSERT to TL_READ to allow concurrent inserts to the table in INSERT INTO ... SELECT ... FROM table


sql/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
unknown
f6cbace93e Fixed bug with EXPLAIN on empty table
mysql-test/r/explain.result:
  test of bug with EXPLAIN on empty table
mysql-test/t/explain.test:
  test of bug with EXPLAIN on empty table
2003-01-20 18:17:14 +02:00
unknown
09b1e7d607 Fixed bug in LEFT JOIN with impossible ON/WHERE expression
mysql-test/r/join.result:
  Test of LEFT JOIN bug
mysql-test/t/join.test:
  Test of LEFT JOIN bug
2003-01-19 17:15:14 +02:00
unknown
88df4e7326 Fixes cases where thd->query was not protected.
This fixes a problem with SHOW PROCESSLIST


sql/log_event.cc:
  Fixes cases where thd->query was not protected
sql/sql_acl.cc:
  Table privileges was not reset on FLUSH PRIVILEGES if tables_priv was empty
sql/sql_db.cc:
  Fixes cases where thd->query was not protected
2003-01-19 02:00:26 +02:00
unknown
b2ba400f07 Merge with 3.23 to get bug fix for SHOW PROCESSLIST + running thread
myisam/mi_create.c:
  Auto merged
sql/log.cc:
  Auto merged
innobase/btr/btr0sea.c:
  Merge with 3.23 (use local file)
sql/slave.cc:
  merge with 3.23
sql/sql_db.cc:
  Merge with 3.23
sql/sql_parse.cc:
  Merge with 3.23
2003-01-19 01:31:43 +02:00
unknown
e7193c63ce Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23 2003-01-18 23:39:19 +02:00
unknown
bd70549275 Only set thd->query to 0 if LOCK_thread_count is hold
This fixes a possible core dump problem in SHOW PROCESSLIST


sql/slave.cc:
  Only set thd->query to 0 if LOCK_thread_count is hold
sql/sql_db.cc:
  Only set thd->query to 0 if LOCK_thread_count is hold
  Also first set query_length, then query
sql/sql_parse.cc:
  Indentation changes
2003-01-18 23:38:55 +02:00
unknown
d803ae0aa4 Merge heikki@work.mysql.com:/home/bk/mysql
into hundin.mysql.fi:/home/heikki/mysql
2003-01-18 15:17:25 +02:00
unknown
99b314449f btr0sea.c:
Backport from 4.0: fix bug in adaptive hash index search


innobase/btr/btr0sea.c:
  Backport from 4.0: fix bug in adaptive hash index search
2003-01-18 15:16:26 +02:00
unknown
43523184f2 btr0sea.h, btr0sea.c:
Fix a crash in page_dir_find_owner_slot if an adaptive hash index search coincides with purge or an insert


innobase/btr/btr0sea.c:
  Fix a crash in page_dir_find_owner_slot if an adaptive hash index search coincides with purge or an insert
innobase/include/btr0sea.h:
  Fix a crash in page_dir_find_owner_slot if an adaptive hash index search coincides with purge or an insert
2003-01-18 15:01:56 +02:00
unknown
aec8aeaab8 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-01-17 16:56:30 +02:00
unknown
d26a7d483c Fixed bug with the --slow-log when logging an administrator command
(like FLUSH TABLES).
(Code is already in 4.0)


sql/log.cc:
  Fixed bug with the --slow-log when logging an administrator command
  (like FLUSH TABLES).
2003-01-17 15:56:16 +02:00
unknown
380115abd7 page0cur.c:
Fix bug in PAGE_CUR_LE_OR_EXTENDS search


innobase/page/page0cur.c:
  Fix bug in PAGE_CUR_LE_OR_EXTENDS search
2003-01-17 15:26:13 +02:00
unknown
81ef01f992 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
unknown
ecdbdeddad Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
sql/ha_innodb.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
2003-01-17 14:23:48 +02:00
unknown
4dd2eb198f After merge fix
BitKeeper/etc/ignore:
  added extra/mysql_waitpid
2003-01-17 13:57:15 +02:00
unknown
723e70ebb7 Fixed typo 2003-01-17 13:52:23 +02:00
unknown
92d93cae72 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
unknown
22b693d80b bugfix for MERGE tables and MAX(key) 2003-01-17 12:48:23 +01:00
unknown
6878f548ca 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
unknown
f20d079b47 Fix VC++ error compiler 2003-01-16 22:29:24 -04:00
unknown
0ae9e6e8dd ha_innodb.cc:
Had forgotten to change ha_innodb.cc to reflect that InnoDB now supports HA_READ_PREFIX_LAST


sql/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
unknown
90b2534f8f Merge with 3.23
innobase/btr/btr0btr.c:
  Auto merged
ltconfig:
  Auto merged
innobase/include/btr0btr.h:
  Auto merged
innobase/log/log0log.c:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
man/isamlog.1:
  Auto merged
man/mysql.1:
  Auto merged
man/mysql_zap.1:
  Auto merged
man/isamchk.1:
  Auto merged
man/mysqlaccess.1:
  Auto merged
man/mysqladmin.1:
  Auto merged
man/mysqld_multi.1:
  Auto merged
man/mysqld.1:
  Auto merged
man/mysqld_safe.1:
  Auto merged
man/mysqldump.1:
  Auto merged
man/mysqlshow.1:
  Auto merged
man/replace.1:
  Auto merged
myisam/mi_unique.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/net_pkg.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
man/perror.1:
  Auto merged
Makefile.am:
  merge with 3.23
client/mysqltest.c:
  merge with 3.23
innobase/btr/btr0pcur.c:
  merge with 3.23 (use local file)
innobase/row/row0purge.c:
  merge with 3.23 (use local file)
scripts/mysql_fix_privilege_tables.sh:
  Merge with 3.23 (Apply debian patches)
sql/ha_innodb.cc:
  merge with 3.23 (use local file)
sql/mysqld.cc:
  Merge with 3.23 (use local file)
sql/net_serv.cc:
  Merge with 3.23 (use local file)
sql/sql_db.cc:
  Merge with 3.23 (use local file)
2003-01-16 20:47:46 +02:00
unknown
3d00544c0f Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23 2003-01-16 20:12:00 +02:00
unknown
ef3091541e bugfix for 'ANALYZE for MERGE' and table-less MERGE table
mysql-test/r/merge.result:
  test added
mysql-test/t/merge.test:
  test added
2003-01-16 13:23:33 +01:00
unknown
cc014ceba8 ha_innodb.cc:
Backport from 4.1: make sure change_active_index is only called with a properly initialized InnoDB table handle


sql/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
unknown
574ac5d3f0 ha_innodb.cc:
Make SHOW INNODB STATUS aware when we are estimating index range size etc.


sql/ha_innodb.cc:
  Make SHOW INNODB STATUS aware when we are estimating index range size etc.
2003-01-16 07:15:55 +02:00
unknown
cb460d38cc btr0btr.h, btr0btr.c, row0purge.c:
Backport from 4.0: fix the BLOB hang if the index tree is of height 1


innobase/row/row0purge.c:
  Backport from 4.0: fix the BLOB hang if the index tree is of height 1
innobase/btr/btr0btr.c:
  Backport from 4.0: fix the BLOB hang if the index tree is of height 1
innobase/include/btr0btr.h:
  Backport from 4.0: fix the BLOB hang if the index tree is of height 1
2003-01-16 01:21:13 +02:00
unknown
b96140fe3a ha_innobase.cc:
Backport from 4.0: fix possible adaprive hash index latch hang


sql/ha_innobase.cc:
  Backport from 4.0: fix possible adaprive hash index latch hang
2003-01-16 01:13:50 +02:00
unknown
ab44cbcaf9 ha_innodb.cc:
Fix a typo


sql/ha_innodb.cc:
  Fix a typo
2003-01-16 01:07:08 +02:00
unknown
dd11eadca3 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


sql/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
unknown
fb01635389 srv0srv.c:
Make SHOW INNODB STATUS aware which trx's are waiting because of innodb_thread_concurrency exceeded


innobase/srv/srv0srv.c:
  Make SHOW INNODB STATUS aware which trx's are waiting because of innodb_thread_concurrency exceeded
2003-01-15 22:48:02 +02:00
unknown
2e5c24d09e trx0trx.c:
Print also the thread ids in SHOW INNODB STATUS also in Linux


innobase/trx/trx0trx.c:
  Print also the thread ids in SHOW INNODB STATUS also in Linux
2003-01-15 21:26:45 +02:00
unknown
8668c41cce reverting a fix 2003-01-14 16:15:09 +02:00
unknown
b5a9dd14d5 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-01-14 11:28:08 +02:00
unknown
ef6c36c0c2 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


include/my_global.h:
  Guard against compiling without -fno-exceptions
include/my_pthread.h:
  Allocate bigger default thread stack because of problems with glibc
mysql-test/r/null.result:
  Updated result
mysql-test/t/null.test:
  Test of using UPDATE/INSERT with NULL on not null fields.
sql/field_conv.cc:
  Fixed bug in UPDATE ... not_null_field=expression_that_returns_null
sql/sql_load.cc:
  Fixed bug in replication when using auto_increment and LOAD DATA INFILE
2003-01-14 11:27:26 +02:00
unknown
2e4cc47003 Text fixes: ISAM -> MyISAM for myisamchk (found by Jocelyn Fournier). 2003-01-14 12:21:18 +10:00
unknown
260d208a46 sql_handler.cc:
Backport the InnoDB HANDLER bug fix from 4.1


sql/sql_handler.cc:
  Backport the InnoDB HANDLER bug fix from 4.1
2003-01-13 23:00:11 +02:00
unknown
f3e431a055 Fix for a crashing bug in send_data..
sql/net_pkg.cc:
  Fixing a buffer overflow with huge BLOB's.
  This bug was caused by increasing a storage for lenght of
  data, while memory was not sufficiently allocated for the task.
2003-01-13 22:36:50 +02:00
unknown
d0551ec55b btr0cur.h, btr0btr.h, btr0btr.c, btr0cur.c, row0purge.c:
Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it


innobase/row/row0purge.c:
  Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it
innobase/btr/btr0cur.c:
  Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it
innobase/btr/btr0btr.c:
  Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it
innobase/include/btr0btr.h:
  Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it
innobase/include/btr0cur.h:
  Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it
2003-01-13 15:52:39 +02:00
unknown
730584247e 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
unknown
eaebef2ab6 srv0srv.c:
Add another diagnostic print to determine why the 'queries inside InnoDB' counter might drift upwards


innobase/srv/srv0srv.c:
  Add another diagnostic print to determine why the 'queries inside InnoDB' counter might drift upwards
2003-01-13 00:44:42 +02:00
unknown
4c1037ea37 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


sql/ha_innodb.cc:
  Add more print space to SHOW INNODB STATUS; remove possible memory leak in case there is an error
innobase/trx/trx0trx.c:
  Add diagnostic prints to determine why the 'queries inside InnoDB' might drift upwards
2003-01-12 22:31:16 +02:00
unknown
ca8498e89d Fix for a bug in SHOW GRANTS when :
grant on database.* to xx@yy with grant option;

is done.



sql/item.cc:
  fix for update of non-null column with function returning NULL
2003-01-11 18:02:10 +02:00
unknown
8cd89cac49 Added functions required by MySQLCC 2003-01-11 01:56:00 -02:00
unknown
8a0a97f022 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
unknown
da1ff072c2 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.


sql/item_cmpfunc.cc:
  Fixed core dump bug in str LIKE "%other_str%" where strings contained characters >= 128.
sql/log_event.cc:
  Fixed problem with replication LOAD DATA INFILE when using  --old-rpl-compat
sql/sql_load.cc:
  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