Commits · febd6b46ccb3e237ccb974c79b79dba96459ca38 · nexedi / MariaDB

16 Jan, 2005 1 commit
- Merge · febd6b46
  unknown authored Jan 16, 2005
  
  febd6b46
15 Jan, 2005 13 commits

Merge bk-internal:/home/bk/mysql-5.0 · d991846a

unknown authored Jan 15, 2005

into mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged

d991846a

Update results after merge · bf54e0c0
unknown authored Jan 15, 2005
```
mysql-test/r/show_check.result:
  Update results
```
bf54e0c0

Porting fix for bug #7586 "TIMEDIFF for sec+microsec not working properly" · 26e0d1e4

unknown authored Jan 15, 2005

to 5.0 tree (since it was lost during last merge).


mysql-test/r/func_sapdb.result:
  Updated test result after fixing bug #7586 "TIMEDIFF for sec+microsec not
  working properly" in 5.0 tree.
sql/item_timefunc.cc:
  calc_time_diff():
    Use simplier and less error-prone implementation. Now we are counting
    difference between time values in microseconds and then convert it to
    seconds + microseconds value (instead of using seconds and taking
    difference in "second_part"s into account).

26e0d1e4

After merge fixes · 9d983231

unknown authored Jan 15, 2005

Fix for BIT(X) field as string


mysql-test/r/func_gconcat.result:
  Fix wrong merge
mysql-test/r/func_sapdb.result:
  Use results so that dimitry can fix them properly
mysql-test/r/innodb.result:
  Update test after fast TRUNCATE in InnoDB
mysql-test/r/ps_1general.result:
  After megre fixes
mysql-test/r/type_bit.result:
  New test to verify patch for Bit fields
mysql-test/t/ps_1general.test:
  After merge fixes
mysql-test/t/type_bit.test:
  New test to verify patch for Bit fields
sql/field.cc:
  Fix for new my_strntod()
  Fix for BIT(X) field as string
sql/item.h:
  Fix for new my_strntod()
sql/item_func.h:
  Fix for new my_strntod()
sql/item_sum.h:
  Fix for new my_strntod()
sql/procedure.h:
  Fix for new my_strntod()
sql/sql_base.cc:
  Port fix for INSERT DELAYED with prepared statements to 5.0

9d983231

Merge with global tree · d2ed1d0d

unknown authored Jan 15, 2005


BitKeeper/etc/ignore:
  auto-union
Build-tools/Do-compile:
  Auto merged
configure.in:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ctype_latin1_de.result:
  Auto merged
mysql-test/r/ctype_tis620.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/type_float.result.es:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-czech.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-uca.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
sql/sql_show.cc:
  No changes
strings/ctype-cp932.c:
  No changes
support-files/mysql.spec.sh:
  No changes

d2ed1d0d

Merge with 4.1 · b243e1ef

unknown authored Jan 15, 2005


BitKeeper/etc/ignore:
  auto-union
Build-tools/Do-compile:
  Auto merged
client/mysqladmin.cc:
  Auto merged
heap/hp_create.c:
  Auto merged
heap/hp_write.c:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/data/data0type.c:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
mysql-test/r/ctype_latin1_de.result:
  Auto merged
mysql-test/r/ctype_tis620.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/type_float.result.es:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/type_timestamp.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-czech.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-uca.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
configure.in:
  Use local values
mysql-test/r/ps_1general.result:
  Update results
mysql-test/t/func_gconcat.test:
  no changes
mysql-test/t/ps_1general.test:
  Use local code
ndb/src/common/util/version.c:
  Use local code
sql/filesort.cc:
  Empty line changes
sql/ha_heap.cc:
  Merge
sql/item_timefunc.cc:
  Keep local code
sql/mysql_priv.h:
  Update to 5.0
sql/sql_show.cc:
  Hand merge
support-files/mysql.spec.sh:
  No changes

b243e1ef

Added ndb_types.h to ignore · b1b74daa
unknown authored Jan 15, 2005
```
BitKeeper/etc/ignore:
  added ndb/include/ndb_types.h
```
b1b74daa

Changed interface for my_strntod() to make it more general and more portable · b6f04ed5

unknown authored Jan 15, 2005


BUILD/compile-solaris-sparc-purify:
  Cleanup (Changes from Kent)
include/m_string.h:
  New interface for my_strtod()
mysql-test/mysql-test-run.sh:
  Added option --use-old-data to allow one to run a test case on an existing table
  (Good for debugging)
mysql-test/r/strict.result:
  Updated results
mysql-test/r/type_float.result:
  More tests
mysql-test/t/strict.test:
  Safety fix
mysql-test/t/type_float.test:
  More tests
mysys/mf_iocache.c:
  Change flush_io_cache() to my_b_flush_io_cache()
  More debugging
mysys/thr_lock.c:
  Added comment
sql/field.cc:
  Use new my_strntod()
sql/filesort.cc:
  Indentation fixes
sql/item.cc:
  Use new my_strntod()
sql/item_strfunc.cc:
  Use new my_strntod()
sql/item_sum.cc:
  Use new my_strntod()
strings/ctype-cp932.c:
  strnncollsp was missing one argument
strings/ctype-simple.c:
  Use new my_strntod()
strings/ctype-ucs2.c:
  Use new my_strntod()
strings/strtod.c:
  Changed interface:
  - Force user to supply pointer to end of string (eliminates the need for an end \0)
  - More strict error checking (depend less off if INF is set), which makes this more portable
  - Better handling of numbers of type 0.000000....E+...
  - Return pointer to + in case of '+.'
  
  The above should fix a that strict.test failed on Solaris-sparc.

b6f04ed5

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · da2ba0d2
unknown authored Jan 15, 2005
```
into mysql.com:/home/my/mysql-4.1
```
da2ba0d2
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · 99f0e986
unknown authored Jan 15, 2005
```
into mysql.com:/home/mysql_src/mysql-5.0-clean
```
99f0e986

func_gconcat.result, func_gconcat.test: · 401e5f05

unknown authored Jan 15, 2005

  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.

401e5f05

Merge · 4e502f4b

unknown authored Jan 15, 2005


include/my_sys.h:
  Auto merged
sql/filesort.cc:
  Auto merged
mysys/mf_iocache.c:
  SCCS merged

4e502f4b

Fixed possible access to unintialized memory in filesort when using many buffers · 7a9e9fb0

unknown authored Jan 15, 2005


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

7a9e9fb0

14 Jan, 2005 24 commits

Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · 559a74d2
unknown authored Jan 14, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
559a74d2

limit HEAP table size with max_heap_table_size, better estimation for mem_per_row · 9d8c623c

unknown authored Jan 14, 2005


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

9d8c623c

Merge mysql.com:/home/jimw/my/mysql-5.0-6659 · a8264adf

unknown authored Jan 14, 2005

into mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged

a8264adf

Merge mysql.com:/home/jimw/my/mysql-4.0-clean · c160800e
unknown authored Jan 14, 2005
```
into mysql.com:/home/jimw/my/mysql-4.1-clean
```
c160800e
Merge mysql.com:/home/jimw/my/mysql-4.0-7347 · 644be52c
unknown authored Jan 14, 2005
```
into mysql.com:/home/jimw/my/mysql-4.0-clean
```
644be52c
Merge · 0f1f0e8b
unknown authored Jan 14, 2005
```
scripts/mysql_install_db.sh:
  Merge changes
```
0f1f0e8b
Merge · 182168b4
unknown authored Jan 14, 2005
```
scripts/mysql_install_db.sh:
  Merge changes
```
182168b4
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1d190526
unknown authored Jan 14, 2005
```
into mysql.com:/space/my/mysql-4.1
```
1d190526

Re-enable running the 'client_test' test case during release builds on the platforms (bug#7909). · 14c78dd7

unknown authored Jan 14, 2005

mysql-test/mysql-test-run.sh:
In a release build on the platforms, TESTS_BINDIR needs to be set to $BASEDIR/tests because the test
program 'client_test' is expected there (see 'client_test.test' with its 'exec', bug#7909).
In an installation, TESTS_BINDIR needs to be set to $BASEDIR/bin because some NDB programs are
located there (see Jonas Oreland's change labeled '1.220, 2005-01-04 08:15:30+01:00').
This patch is to unite these conflicting requirements.

14c78dd7

- replaced obsoleted "BuildPrereq" with "BuildRequires" in the RPM spec file · 95a9acab
unknown authored Jan 14, 2005
```
support-files/mysql.spec.sh:
  - replaced obsoleted "BuildPrereq" with "BuildRequires" instead
```
95a9acab
bumped up ndb version · 973800f3
unknown authored Jan 14, 2005
```
compatible with 4.1.9


configure.in:
  bumped up ndb version
```
973800f3

- make sure to enable "--without-ndb-debug" when both --debug and · 6987f2b4

unknown authored Jan 14, 2005

  --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)

6987f2b4

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · df9280f7
unknown authored Jan 14, 2005
```
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
```
df9280f7

A fix for bit type. · 2aea796e

unknown authored Jan 14, 2005

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.

2aea796e

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · 77c1c555
unknown authored Jan 14, 2005
```
into mysql.com:/home/mysql_src/mysql-5.0-clean
```
77c1c555

Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · f7cce08f

unknown authored Jan 14, 2005

into hundin.mysql.fi:/home/marko/k/mysql-4.1


innobase/os/os0file.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged

f7cce08f

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 96959e5a
unknown authored Jan 14, 2005
```
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
```
96959e5a
Backport from 5.0 · 217fe27b
unknown authored Jan 14, 2005

217fe27b

InnoDB: Remove redundant page_no field from dict_index_t. · facb30ad

unknown authored Jan 14, 2005

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

facb30ad

Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7d248fe7

unknown authored Jan 14, 2005

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

7d248fe7

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · d096b759
unknown authored Jan 14, 2005
```
into mysql.com:/home/mysql_src/mysql-5.0-clean
```
d096b759
Bug#7284: strnxfrm generates different results for equal strings · d133aa0a
unknown authored Jan 14, 2005
```
additional fix for cp932 and eucjpms, recently implemented by
Shuichi.
```
d133aa0a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 983c37ae
unknown authored Jan 14, 2005
```
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug


sql/sql_yacc.yy:
  Auto merged
```
983c37ae

Output 'MEMORY' as table type for tables using the memory (nee heap) storage · 4dba597c

unknown authored Jan 13, 2005

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

4dba597c

13 Jan, 2005 2 commits
- Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0 · f9180912
  unknown authored Jan 14, 2005
```
into arthur.local:/my/mysql-5.0-clean
```
  f9180912
- fix C++ comments in C file (fixed in 5.0 already) · 4e252340
  unknown authored Jan 14, 2005
```
strings/ctype-uca.c:
  fix C++ comments in C file
```
  4e252340