Commit graph

16,839 commits

Author SHA1 Message Date
unknown
0de6a42684 Makefile.am:
Bug#7721


ndb/docs/Makefile.am:
  Bug#7721
2005-01-16 21:39:19 +01:00
unknown
3c45559db8 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-16 16:41:38 +01:00
unknown
e4f887ad20 initialize mysql->charset in mysql_init 2005-01-16 16:38:38 +01:00
unknown
0d98da70ad don't ignore errors in readlink 2005-01-15 20:08:53 +01:00
unknown
193eae3bec Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-01-15 12:00:56 +02:00
unknown
16f3170e73 func_gconcat.result, func_gconcat.test:
Added a test case for bug #7769.
item_sum.h:
  Fixed bug #7769: a crash for queries with group_concat and
  having when the query table was empty.
  The bug was due an unsafe dereferencing.


sql/item_sum.h:
  Fixed bug #7769: a crash for queries with group_concat and
  having when the query table was empty.
  The bug was due an unsafe dereferencing.
mysql-test/t/func_gconcat.test:
  Added a test case for bug #7769.
mysql-test/r/func_gconcat.result:
  Added a test case for bug #7769.
2005-01-15 01:05:00 -08:00
unknown
403541d7e8 Merge
include/my_sys.h:
  Auto merged
sql/filesort.cc:
  Auto merged
mysys/mf_iocache.c:
  SCCS merged
2005-01-15 03:49:07 +02:00
unknown
deac81af88 Fixed possible access to unintialized memory in filesort when using many buffers
include/my_sys.h:
  Added function to call if IO_CACHE is moved
mysys/mf_iocache.c:
  Added function to call if IO_CACHE is moved
sql/filesort.cc:
  Tell that io_cache is moved
2005-01-15 03:47:06 +02:00
unknown
60c1541524 protect against malicious server trying to crash command-line client :) 2005-01-14 22:46:04 +01:00
unknown
6f70a1d909 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-14 19:51:29 +01:00
unknown
b7efd8174a limit HEAP table size with max_heap_table_size, better estimation for mem_per_row
heap/hp_create.c:
  limit HEAP table size with max_heap_table_size
heap/hp_write.c:
  limit HEAP table size with max_heap_table_size
include/heap.h:
  limit HEAP table size with max_heap_table_size
sql/ha_heap.cc:
  limit HEAP table size with max_heap_table_size
  better estimation for mem_per_row
2005-01-14 19:49:45 +01:00
unknown
7b43fb6ca4 Merge mysql.com:/home/jimw/my/mysql-4.0-clean
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-14 10:45:17 -08:00
unknown
d3ad1a919e Merge mysql.com:/home/jimw/my/mysql-4.0-7347
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-01-14 10:44:29 -08:00
unknown
58d9ba8d84 Merge
scripts/mysql_install_db.sh:
  Merge changes
2005-01-14 10:40:05 -08:00
unknown
4b03a0a7cb Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-14 19:15:55 +01:00
unknown
baf0a4418a - replaced obsoleted "BuildPrereq" with "BuildRequires" in the RPM spec file
support-files/mysql.spec.sh:
  - replaced obsoleted "BuildPrereq" with "BuildRequires" instead
2005-01-14 18:20:03 +01:00
unknown
b3c7c4d74c bumped up ndb version
compatible with 4.1.9


configure.in:
  bumped up ndb version
2005-01-14 16:14:50 +01:00
unknown
18df9d391f - make sure to enable "--without-ndb-debug" when both --debug and
--with-cluster are provided. Yes, this sounds like a contradiction -
  enabling debugging in NBD enables code parts that may still reveal 
  portability issues when compiled with non-gcc compilers. (request by TomasU)
2005-01-14 15:35:32 +01:00
unknown
6d9f637870 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/k/mysql-4.1


innobase/os/os0file.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
2005-01-14 15:23:34 +02:00
unknown
8870b671b0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
2005-01-14 16:23:33 +03:00
unknown
b06801534a Backport from 5.0 2005-01-14 16:23:32 +03:00
unknown
3de3be6710 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug


sql/sql_yacc.yy:
  Auto merged
2005-01-14 10:09:01 +03:00
unknown
653db58bee fix C++ comments in C file (fixed in 5.0 already)
strings/ctype-uca.c:
  fix C++ comments in C file
2005-01-14 01:59:03 +03:00
unknown
4799f07750 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-01-14 00:10:03 +02:00
unknown
177e99f327 Fix bug in INSERT DELAYED with prepared statements
The bug was that if you have two TL_WRITE_DELAYED at the same time,
mi_lock_databases() could be done in the wrong order and we could write the wrong header to the MyISAM index file.


sql/mysql_priv.h:
  Fix bug in insert delayed with prepared statements
sql/sql_base.cc:
  Fix bug in insert delayed with prepared statements
sql/sql_prepare.cc:
  Fix bug in insert delayed with prepared statements
  The bug was that if you have two TL_WRITE_DELAYED at the same time,
  mi_lock_databases() could be done in the wrong order and we could write the wrong header to the MyISAM index file.
2005-01-14 00:09:15 +02:00
unknown
e667cf91da Fix mysql_install_db to look for libexecdir relative to basedir when
it has been specified. (Bug #7347)


scripts/mysql_install_db.sh:
  When basedir is specified, look for libexecdir relative to that
2005-01-13 11:58:10 -08:00
unknown
13b380e665 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-13 11:47:49 -08:00
unknown
c0af1e3c67 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/sql_parse.cc:
  Auto merged
2005-01-13 20:09:41 +02:00
unknown
97f5b32600 ha_innodb.cc:
Merge from 4.0:     Fix a theoretical hang over the adaptive hash latch in InnoDB if one runs INSERT ... SELECT ... (binlog not enabled), or a multi-table UPDATE or DELETE, and only the read tables are InnoDB type, the rest are MyISAM; this also fixes bug #7879 for InnoDB type tables


sql/ha_innodb.cc:
  Merge from 4.0:     Fix a theoretical hang over the adaptive hash latch in InnoDB if one runs INSERT ... SELECT ... (binlog not enabled), or a multi-table UPDATE or DELETE, and only the read tables are InnoDB type, the rest are MyISAM; this also fixes bug #7879 for InnoDB type tables
2005-01-13 20:08:28 +02:00
unknown
c9882adf81 Merge
innobase/os/os0file.c:
  Auto merged
sql/ha_innodb.cc:
  SCCS merged
2005-01-13 19:27:44 +02:00
unknown
fb8e271a2c Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7235
into mysql.com:/home/jimw/my/mysql-4.1-clean


mysql-test/r/ctype_utf8.result:
  Auto merged
sql/sql_show.cc:
  Auto merged
2005-01-13 09:24:07 -08:00
unknown
a28f221f35 Add test cases to verify that SHOW CREATE TABLE always outputs the
key algorithm for keys where they were explicitly specified.


mysql-test/r/show_check.result:
  Add results
mysql-test/t/show_check.test:
  Add tests for preservation of key algorithm in SHOW CREATE TABLE output
2005-01-13 18:22:35 +01:00
unknown
d90e3b497f ha_innodb.cc:
Fix a theoretical hang over the adaptive hash latch in InnoDB if one runs INSERT ... SELECT ... (binlog not enabled), or a multi-table UPDATE or DELETE, and only the read tables are InnoDB type, the rest are MyISAM; this also fixes bug #7879 for InnoDB type tables


sql/ha_innodb.cc:
  Fix a theoretical hang over the adaptive hash latch in InnoDB if one runs INSERT ... SELECT ... (binlog not enabled), or a multi-table UPDATE or DELETE, and only the read tables are InnoDB type, the rest are MyISAM; this also fixes bug #7879 for InnoDB type tables
2005-01-13 19:20:49 +02:00
unknown
16a43296e7 Merge mysql.com:/home/jimw/my/mysql-4.1-bdb-init
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-13 09:07:48 -08:00
unknown
ebe1e8a9e6 Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774
into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/field.cc:
  Auto merged
2005-01-13 09:07:21 -08:00
unknown
85a6647fb9 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-13 15:26:13 +01:00
unknown
1e63ecd035 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2005-01-13 16:16:05 +02:00
unknown
8dc27f1ef9 InnoDB: Detect the availability of the Mac OS X fsync() work-around
at run-time, so that an executable compiled on Mac OS X 10.2 can
be run on Mac OS X 10.2 (without the work-around) and Mac OS X 10.3
and later with the work-aroud enabled.


innobase/include/srv0start.h:
  Mac OS X: Add srv_have_fullfsync
innobase/os/os0file.c:
  os_file_flush(): Use F_FULLFSYNC on Mac OS X 10.3, but not on 10.2
innobase/srv/srv0start.c:
  innobase_start_or_create_for_mysql(): When compiled on OS X 10.2,
  detect if the binary is running on OS X 10.3 or later, and set
  srv_have_fullfsync accordingly.
2005-01-13 16:15:14 +02:00
unknown
9842aca3ef bug#7284: strnxfrm returns different results for equal strings 2005-01-13 18:12:04 +04:00
unknown
4c84421bdf - bumped up the version number in configure.in from 4.1.9 to 4.1.10
- tagged ChangeSet 1.2207 as "mysql-4.1.9"


configure.in:
  - bumped up the version number from 4.1.9 to 4.1.10
2005-01-13 14:57:51 +01:00
unknown
bcb3783c7c Fixed a problem with a test. Time could be 0 or 1 seconds, depending
on whether running with or without valgrind.
2005-01-13 15:04:57 +02:00
unknown
8bb9a5496e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
2005-01-13 15:41:21 +03:00
unknown
81a082075f - added the 4.0 shared mysqlclient libraries to the 4.1 "shared-compat" RPM 2005-01-13 13:07:35 +01:00
unknown
763d552689 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
2005-01-13 14:46:41 +03:00
unknown
9edcc56cc8 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-13 11:34:12 +01:00
unknown
3eb2e7c8d2 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


scripts/mysqlaccess.sh:
  Auto merged
2005-01-13 11:12:00 +01:00
unknown
a2e905a5b7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-13 10:29:03 +01:00
unknown
fee822e41f bug#7864 - fix ndb limit 4.5G data memory due to truncation error
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  remove 8k->32k conversion
ndb/src/kernel/vm/Configuration.cpp:
  compute size in 32k pages directly
2005-01-13 10:28:26 +01:00
unknown
8191a28b97 libmysqld.def, libmysql.def:
Use the invisible tabs (!)


libmysql/libmysql.def:
  Use the invisible tabs (!)
libmysqld/libmysqld.def:
  Use the invisible tabs (!)
2005-01-12 21:04:31 -06:00
unknown
c26f341bb9 libmysqld.def, libmysql.def:
Add missing 'get_defaults_files' to fix linking error.


libmysql/libmysql.def:
  Add missing 'get_defaults_files' to fix linking error.
libmysqld/libmysqld.def:
  Add missing 'get_defaults_files' to fix linking error.
2005-01-12 19:56:49 -06:00