Commits · 2361720c981fc2eb27bc97c1ea7e043b634ffae1 · nexedi / MariaDB

04 Nov, 2005 6 commits

Merge mysql.com:/home/my/mysql-5.0 · 2361720c

unknown authored Nov 05, 2005

into  mysql.com:/home/my/mysql-5.1


BUILD/FINISH.sh:
  Auto merged
BitKeeper/deleted/.del-makefilewin.i~5c8479dcb8a455b2:
  Auto merged
BitKeeper/deleted/.del-makefilewin~13888739357b3025:
  Auto merged
BitKeeper/deleted/.del-makefilewin~14f24a4a173e2fcd:
  Auto merged
BitKeeper/deleted/.del-makefilewin~15e9e5c9e8fa870b:
  Auto merged
BitKeeper/deleted/.del-makefilewin~1c53f31b88dd36e:
  Auto merged
BitKeeper/deleted/.del-makefilewin~1dbc058d76ebf1db:
  Auto merged
BitKeeper/deleted/.del-makefilewin~2e0407fe123f8365:
  Auto merged
BitKeeper/deleted/.del-makefilewin~2fc379bd4065c995:
  Auto merged
BitKeeper/deleted/.del-makefilewin~389ee2dcf79afb79:
  Auto merged
BitKeeper/deleted/.del-makefilewin~4d139e182457e553:
  Auto merged
BitKeeper/deleted/.del-makefilewin~5104767c73775697:
  Auto merged
BitKeeper/deleted/.del-makefilewin~608ed49dcd88e0f7:
  Auto merged
BitKeeper/deleted/.del-makefilewin~63acd666293282a:
  Auto merged
BitKeeper/deleted/.del-makefilewin~6ba64863bce3d0b8:
  Auto merged
BitKeeper/deleted/.del-makefilewin~72a64128bacce71b:
  Auto merged
BitKeeper/deleted/.del-makefilewin~78000390c783b1c5:
  Auto merged
BitKeeper/deleted/.del-makefilewin~7a9d7d5a42bbfaf5:
  Auto merged
Makefile.am:
  Auto merged
BitKeeper/deleted/.del-makefilewin~a40ea12eebdd6ef0:
  Auto merged
BitKeeper/deleted/.del-makefilewin~aeea7c82f21f7cf5:
  Auto merged
BitKeeper/deleted/.del-makefilewin~b643e38d8da389ac:
  Auto merged
BitKeeper/deleted/.del-makefilewin~c7b621c745e5de95:
  Auto merged
BitKeeper/deleted/.del-makefilewin~c8273a47b90f52bb:
  Auto merged
BitKeeper/deleted/.del-makefilewin~d1a9d1f7d33fcb73:
  Auto merged
BitKeeper/deleted/.del-makefilewin~d37b6b303348c871:
  Auto merged
BitKeeper/deleted/.del-makefilewin~d90f35fdc3f2ee5f:
  Auto merged
BitKeeper/deleted/.del-makefilewin~dc4b8ad5ea53bd:
  Auto merged
BitKeeper/deleted/.del-makefilewin~dea10ec1c94f7be:
  Auto merged
BitKeeper/deleted/.del-makefilewin~ef3a208fa0e9b0db:
  Auto merged
BitKeeper/deleted/.del-makefilewin~f1e3b890aa1c9ea3:
  Auto merged
BitKeeper/deleted/.del-makefilewin~f4b7b99a887b7de:
  Auto merged
BitKeeper/deleted/.del-makefilewin~fdda94ad32fa9e34:
  Auto merged
BitKeeper/deleted/.del-my_cnf~977f69858affc57b:
  Auto merged
BitKeeper/etc/config:
  Auto merged
VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
client/mysqltest.c:
  Auto merged
include/Makefile.am:
  Auto merged
include/base64.h:
  Auto merged
include/my_base.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
mysys/base64.c:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
storage/heap/_check.c:
  Auto merged
storage/heap/hp_create.c:
  Auto merged
storage/innobase/include/Makefile.am:
  Auto merged
storage/innobase/include/rem0rec.h:
  Auto merged
storage/innobase/include/rem0rec.ic:
  Auto merged
storage/innobase/row/row0ins.c:
  Auto merged
storage/innobase/row/row0upd.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_delete.c:
  Auto merged
storage/myisam/mi_rkey.c:
  Auto merged
storage/myisam/mi_rnext_same.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/sort.c:
  Auto merged
storage/myisammrg/myrg_queue.c:
  Auto merged
storage/ndb/config/type_util.mk.am:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
  Auto merged
storage/ndb/include/transporter/TransporterCallback.hpp:
  Auto merged
storage/ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.cpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp:
  Auto merged
storage/ndb/src/common/transporter/Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/common/util/Makefile.am:
  Auto merged
storage/ndb/src/common/util/Parser.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged
storage/ndb/src/kernel/vm/FastScheduler.cpp:
  Auto merged
storage/ndb/src/kernel/vm/TransporterCallback.cpp:
  Auto merged
storage/ndb/src/kernel/vm/VMSignal.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBackup.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOperations.cpp:
  Auto merged
storage/ndb/test/src/HugoCalculator.cpp:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
BUILD/SETUP.sh:
  manual merge
configure.in:
  manual merge
mysql-test/r/alter_table.result:
  manual merge
sql/handler.cc:
  manual merge
sql/mysql_priv.h:
  manual merge
sql/records.cc:
  manual merge
sql/share/errmsg.txt:
  manual merge
sql/sql_table.cc:
  manual merge
  Fix labels
sql/sql_update.cc:
  manual merge
sql/table.cc:
  manual merge
sql/unireg.cc:
  manual merge
storage/ndb/config/type_ndbapi.mk.am:
  manual merge

2361720c

Reorder struct elements to be more optimal for 64 bit computers · d4a7867a

unknown authored Nov 04, 2005

(Main reason for reordering was to get rid of compiler warnings for order of element initialization)


sql/log.cc:
  Remove compiler warning
sql/sql_class.h:
  Reorder MYSQL_LOG struct elements to be more optimal for 64 bit computers
  (Main reason for reordering was to get rid of compiler warnings for order of element initialization)

d4a7867a

Merge monty@192.168.0.9:/my/mysql-5.0 · 29e07bcb
unknown authored Nov 04, 2005
```
into  mysql.com:/my/mysql-5.0
```
29e07bcb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4e60227f
unknown authored Nov 04, 2005
```
into  mysql.com:/home/my/mysql-5.0


sql/mysqld.cc:
  Auto merged
```
4e60227f
DROP created procedures · 5dcd44e3
unknown authored Nov 04, 2005
```
(Caused sp-security to fail)
```
5dcd44e3
Merge mysql.com:/home/jimw/my/mysql-5.0-9815 · 71898b3e
unknown authored Nov 03, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean
```
71898b3e

03 Nov, 2005 34 commits

Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7c2e2961
unknown authored Nov 03, 2005
```
into  mysql.com:/my/mysql-5.0
```
7c2e2961

Fixes during review of new code · d8f1fdc4

unknown authored Nov 03, 2005

Destroy LOCK_uuid_generator


sql/ha_berkeley.h:
  Fix portability problem (warnings from gcc on 32 bit linux)
sql/ha_ndbcluster.cc:
  Fixed portability problem
sql/mysqld.cc:
  Destroy LOCK_uuid_generator

d8f1fdc4

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 76199a50
unknown authored Nov 03, 2005
```
into  hasky.mysql.fi:/home/jani/mysql-5.0
```
76199a50
Disabled ps_protocol for two statements. · 5ea3382f
unknown authored Nov 03, 2005

5ea3382f
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 · 443c4034
unknown authored Nov 03, 2005
```
into  fedora.(none):/home/reggie/bk/mysql-5.0-new
```
443c4034
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 91b1630d
unknown authored Nov 03, 2005
```
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
```
91b1630d
test enabled · 77afc169
unknown authored Nov 03, 2005

77afc169

Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · 579cac8f

unknown authored Nov 03, 2005

into mysql.com:/home/hf/work/mysql-5.0.9551


BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged

579cac8f

Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · b5746406
unknown authored Nov 03, 2005
```
into mysql.com:/home/hf/work/mysql-5.0.9551


sql/sql_select.cc:
  Auto merged
```
b5746406
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 17742635
unknown authored Nov 03, 2005
```
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
```
17742635
Disabled a test temporarily. · 840834c1
unknown authored Nov 03, 2005

840834c1

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4b63b4ad

unknown authored Nov 03, 2005

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_view.h:
  Auto merged
sql/table.cc:
  Auto merged

4b63b4ad

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · e5852adc
unknown authored Nov 03, 2005
```
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
```
e5852adc

opt_range.cc: · fa8dafe5

unknown authored Nov 03, 2005

  Additional fix for bug#14093


sql/opt_range.cc:
  Additional fix for bug#14093

fa8dafe5

Changes in get_table_type() and mysql_frm_type(). The main problem was · 5af7ca80

unknown authored Nov 03, 2005

that in mysql_rm_table_part2_with_lock() previously we needed to open
same file twice. Now once is enough.


sql/mysql_priv.h:
  Merged functions get_table_type() and mysql_frm_type() into one,
  using the name from latter one.
sql/sql_base.cc:
  Changed get_table_type() to mysql_frm_type()
sql/sql_delete.cc:
  Changed get_table_type() to mysql_frm_type()
sql/sql_rename.cc:
  Changed get_table_type() to mysql_frm_type()
sql/sql_show.cc:
  Changed get_table_type() to mysql_frm_type()
sql/sql_table.cc:
  Changed get_table_type() to mysql_frm_type()
sql/sql_view.cc:
  Merged code from get_table_type() and mysql_frm_type() into the latter one.
sql/sql_view.h:
  Function prototype changes.
sql/table.cc:
  No longer needed.

5af7ca80

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 34ffbfeb
unknown authored Nov 03, 2005
```
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
```
34ffbfeb

Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 · 8a4c773a

unknown authored Nov 03, 2005

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp


mysql-test/mysql-test-run.sh:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
Makefile.am:
  Merged from 4.1

8a4c773a

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5a206634
unknown authored Nov 03, 2005
```
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
```
5a206634

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4f2fe287

unknown authored Nov 03, 2005

into  mysql.com:/opt/local/work/mysql-5.0-14210


sql/handler.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged

4f2fe287

Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · 9c241a07
unknown authored Nov 03, 2005
```
into mysql.com:/home/hf/work/mysql-5.0.9551
```
9c241a07

Merging · f68daacf

unknown authored Nov 03, 2005


mysql-test/r/ctype_cp932_binlog.result:
  test result fixed
mysql-test/t/ctype_cp932_binlog.test:
  test fixed with 5.0 specific

f68daacf

A fix and a test case for Bug#14210 "Simple query with > operator on · 3fa0dd23

unknown authored Nov 03, 2005

large table gives server crash": make sure that when a MyISAM temporary
table is created for a cursor, it's created in its memory root,
not the memory root of the current query.


mysql-test/r/sp.result:
  Test results fixed: a test case for Bug#14210
mysql-test/t/sp.test:
  A test case for Bug#14210 "Simple query with > operator on large table 
  gives server crash"
sql/handler.cc:
  - rewrite get_new_handler to accept a memory root and use it for
sql/handler.h:
  - get_new_handler declaration changed
sql/opt_range.cc:
  - get_new_handler declaration changed
sql/sql_base.cc:
  - get_new_handler declaration changed
sql/sql_select.cc:
  - the actual fix for Bug#14210. In create_myisam_from_heap we should
  create the new table handler in TABLE::mem_root, not in THD::mem_root:
  the latter is freed shortly after cursor is open.
  - adjust create_tmp_table to explicitly supply &table->mem_root
  to get_new_handler when creating a handler for a new temporary table
sql/sql_table.cc:
  - get_new_handler declaration changed
sql/table.cc:
  - get_new_handler declaration changed
sql/unireg.cc:
  - get_new_handler declaration changed
tests/mysql_client_test.c:
  A test case for Bug#14210 "Simple query with > operator on large table
   gives server crash": a C API test case is worth adding because of different
  memory allocation/freeing patterns in handling of C API and SP cursors

3fa0dd23

Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0 · 1484d548

unknown authored Nov 03, 2005

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1


Makefile.am:
  Merged from 4.0
mysql-test/mysql-test-run.sh:
  Merged from 4.0

1484d548

Merge mysql.com:/home/hf/work/mysql-4.1.14183 · 6d432642

unknown authored Nov 03, 2005

into mysql.com:/home/hf/work/mysql-5.0.9551


BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged

6d432642

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · dd490fd2

unknown authored Nov 03, 2005

into moonbone.local:/work/14093-bug-5.0-mysql


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/item.h:
  Auto merged

dd490fd2

Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · 4535c354
unknown authored Nov 03, 2005
```
into mysql.com:/home/hf/work/mysql-5.0.9551


sql/sql_select.cc:
  Auto merged
```
4535c354

Fix bug #14093 Query takes a lot of time when date format is not valid · bb841518

unknown authored Nov 03, 2005

Invalid date like 2000-02-32 wasn't converted to int, which lead to not
using index and comparison with field as astring, which results in slow
query execution.

convert_constatn_item() and get_mm_leaf() now forces MODE_INVALID_DATES to
allow such conversion.


sql/item.h:
  Fix bug #14093 Query takes a lot of time when date format is not valid
  To Item_int_with_ref added method real_item() which returns ref.
sql/item_cmpfunc.cc:
   Fix bug #14093 Query takes a lot of time when date format is not valid
  convert_constant_item() now allows conversion of invalid dates like 2000-01-32 to int to make it possible to use index when comparing fields with such dates.
sql/opt_range.cc:
   Fix bug #14093 Query takes a lot of time when date format is not valid
  get_mm_leaf() modified so it allows index usage for comparing fields with invalid dates like 2000-01-32.
mysql-test/r/select.result:
  Test case for bug#14093 Query takes a lot of time when date format is not valid
mysql-test/t/select.test:
  Test case for bug#14093 Query takes a lot of time when date format is not valid

bb841518

Added test-force to Makefile. · fb4c949f
unknown authored Nov 03, 2005

fb4c949f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 096f181d
unknown authored Nov 03, 2005
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
```
096f181d
Added new build script for pentium64. · 9a714420
unknown authored Nov 03, 2005

9a714420
Changed mysql-test-run to correspond to the one in 5.0 tree. · 1fb1802e
unknown authored Nov 03, 2005

1fb1802e
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · b162827e
unknown authored Nov 03, 2005
```
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
```
b162827e
Merge bk@192.168.21.1:mysql-4.1 · 1f37efa0
unknown authored Nov 03, 2005
```
into mysql.com:/home/hf/work/mysql-4.1.14183
```
1f37efa0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4f1a5591
unknown authored Nov 03, 2005
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
```
4f1a5591