Commit graph

18951 commits

Author SHA1 Message Date
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
70356012cb Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
2005-01-14 18:32:43 +04:00
unknown
8c3a1fde1d A fix for bit type.
pack_length_in_rec() func has been introduced.


sql/field.h:
  A fix for bit type. 
  As from now the pack_length_in_rec() function is used for MyISAM 
  record length calculation instead of the pack_length().
  For bit field it doesn't count uneven bits.
sql/ha_myisam.cc:
  A fix for bit type. 
  As from now the pack_length_in_rec() function is used for MyISAM 
  record length calculation instead of the pack_length().
  For bit field it doesn't count uneven bits.
2005-01-14 18:24:32 +04:00
unknown
b43a345ccd Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-01-14 15:06:53 +01:00
unknown
8d5cfa7770 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-14 15:02:05 +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
3bb047c018 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-14 14:23:34 +01: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
4db9aaeea7 InnoDB: Remove redundant page_no field from dict_index_t.
This completes the patch for fast TRUNCATE TABLE.


innobase/dict/dict0boot.c:
  dict_boot(): Add page_no parameter to dict_index_add_to_cache()
innobase/dict/dict0crea.c:
  Remove dict_index_t:page_no; add ind_node_t:page_no
innobase/dict/dict0dict.c:
  dict_index_add_to_cache(): Add parameter page_no
  dict_tree_create(): Add parameter page_no
innobase/dict/dict0load.c:
  dict_load_indexes(): Add page_no to dict_index_add_to_cache() call
innobase/ibuf/ibuf0ibuf.c:
  ibuf_data_init_for_space(): Move page_no to dict_index_add_to_cache()
innobase/include/dict0crea.h:
  ind_node_t: Add page_no field
innobase/include/dict0dict.h:
  dict_index_add_to_cache(): Add page_no
  dict_tree_create(): Add page_no
innobase/include/dict0mem.h:
  dict_index_t: Remove page_no, as dict_tree_t has "page" field
innobase/row/row0mysql.c:
  row_truncate_table_for_mysql(): Improve the comments
2005-01-14 13:54:23 +02:00
unknown
c277421d06 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/j/mysql-5.0


innobase/include/row0mysql.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
2005-01-14 13:06:46 +02:00
unknown
6468de3d37 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-01-14 11:32:17 +01:00
unknown
6f3b5a478b Bug#7284: strnxfrm generates different results for equal strings
additional fix for cp932 and eucjpms, recently implemented by
Shuichi.
2005-01-14 14:16:56 +04:00
unknown
5f533a3682 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean


sql/log_event.cc:
  Auto merged
2005-01-14 10:59:37 +01: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
8a5fe7cfdf Output 'MEMORY' as table type for tables using the memory (nee heap) storage
engine, except when running with sql_mode & MYSQL323. (Bug #6659)


mysql-test/r/create.result:
  Fix test results
mysql-test/r/ctype_utf8.result:
  Fix test results
mysql-test/r/information_schema.result:
  Fix results
mysql-test/r/show_check.result:
  Fix results
sql/ha_heap.h:
  Output 'HEAP' in MySQL 3.23 compatibility mode
mysql-test/r/heap.result:
  Update results
mysql-test/r/sql_mode.result:
  Update results
2005-01-13 17:38:13 -08:00
unknown
7eb38d6c0a Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0
into arthur.local:/my/mysql-5.0-clean
2005-01-14 01:17:01 +02: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
3b2971fd5a Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/ctype_utf8.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
2005-01-13 13:48:25 -08:00
unknown
66e1d514ab Update results files
mysql-test/r/ctype_utf8.result:
  Update results
mysql-test/r/show_check.result:
  Update results
2005-01-13 13:46:59 -08:00
unknown
26ad972d73 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-13 12:40:34 -08:00
unknown
b4313f0f34 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean


sql/mysqld.cc:
  Auto merged
2005-01-13 21:36:28 +01:00
unknown
68075175d6 ha_innodb.cc:
"Add a comment why data modifying SQL statements MUST always use a locking read in tables that they read: otherwise the execution is not serializable, and in many cases is not well-defined; we also merged the associated bug fix from 4.1"


sql/ha_innodb.cc:
  Add a comment why data modifying SQL statements MUST always use a locking read in tables that they read: otherwise the exxecution is not serializable, and in many cases is not well-defined; 5 minutes ago we merged the associated bug fix from 4.0 and 4.1
2005-01-13 21:58:47 +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
100312fd39 Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0
into arthur.local:/my/mysql-5.0-clean
2005-01-13 21:56:18 +02:00
unknown
df56b8429e Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-13 11:50: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
b69ea6d1b8 Merge hundin.mysql.fi:/home/heikki/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-5.0


innobase/os/os0file.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
2005-01-13 21:42:37 +02: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
d4e14b2f1d Applied a patch for Netware. 2005-01-13 19:46:46 +02:00
unknown
74a964957d Merge
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/sql_show.cc:
  Merge with s/TYPE/USING/ fixes
2005-01-13 09:31:54 -08: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
78161b3228 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-01-13 19:25:39 +02:00
unknown
365711af17 A patch for Netware. 2005-01-13 19:24:54 +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
111587e9e3 Merge
BitKeeper/etc/ignore:
  auto-union
innobase/os/os0proc.c:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
extra/comp_err.c:
  SCCS merged
2005-01-13 19:14:10 +02:00
unknown
efa0483ea7 Merge mysql.com:/home/jimw/my/mysql-4.1-bdb-init
into mysql.com:/home/jimw/my/mysql-5.0-clean


sql/ha_berkeley.cc:
  Auto merged
2005-01-13 09:09:46 -08:00
unknown
d4f75bc0c9 Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774
into mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/type_float.result.es:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
sql/field.cc:
  Auto merged
2005-01-13 09:09:10 -08: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
77bba943cb Put flags for -max building in BUILD/SETUP.sh so they are consistent across
all architectures, and in sync with the flags used to build the MySQL Max
packages. Also back-port AMD64 build scripts from 5.0.


BUILD/SETUP.sh:
  Add $max_configs (and variants) and amd64_*
BUILD/compile-pentium-debug-max:
  Use $max_configs
BUILD/compile-pentium-debug-max-no-embedded:
  Use $max_no_es_configs
BUILD/compile-pentium-max:
  Use $max_configs
BUILD/compile-pentium-valgrind-max:
  Use $max_leave_isam_configs
BUILD/compile-ppc-debug-max:
  Use $max_configs
BUILD/compile-ppc-max:
  Use $max_configs
2005-01-13 09:05:23 -08:00
unknown
388cd3a7c4 Bug in InnoDB;
file closing in extra/comp_err.c


BitKeeper/etc/ignore:
  added extra/mysqld_ername.h
extra/comp_err.c:
  Added proper closing of the file.
innobase/os/os0proc.c:
  Fixed small bug in innodb.
2005-01-13 19:03:46 +02:00
unknown
0e21414aa5 Fix valgrind warning + post-merge fixes.
sql/ha_innodb.cc:
  Fix valgrind warning.
strings/ctype-uca.c:
  Fix C++ style comments.
2005-01-13 19:03:21 +03:00
unknown
21dce62534 manual merge 2005-01-13 18:15:58 +03:00