Commits · 93528f288795c6d8efafeeeaf550b3f799b9cc38 · nexedi / MariaDB

24 Jul, 2006 1 commit

Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 · 93528f28

unknown authored Jul 24, 2006

into  chilla.local:/home/mydev/mysql-5.1-amerge


mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
configure.in:
  Manual merge
mysql-test/extra/binlog_tests/blackhole.test:
  Manual merge
mysql-test/r/binlog_stm_blackhole.result:
  Manual merge
sql/ha_myisammrg.cc:
  Manual merge
sql/handler.h:
  Manual merge
storage/blackhole/ha_blackhole.cc:
  Manual merge
support-files/mysql.spec.sh:
  Manual merge

93528f28

23 Jul, 2006 2 commits

BUG#20294 Instance manager test im_instance_conf fails randomly · 7b2cabd9

unknown authored Jul 24, 2006

(well, im_options in this case, but using existing bug report)


mysql-test/t/disabled.def:
  disable im_options test as it's non-deterministic. reopen bug

7b2cabd9

Merge willster.(none):/home/stewart/Documents/MySQL/5.0/main · 299b620d

unknown authored Jul 24, 2006

into  willster.(none):/home/stewart/Documents/MySQL/5.1/main


BitKeeper/etc/config:
  Auto merged
sql/opt_range.cc:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp:
  Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
mysql-test/Makefile.am:
  manual merge
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  manual merge

299b620d

22 Jul, 2006 4 commits

BUG#20340: NODEGROUP wrong field type in partitions information schema table · 0a32f062

unknown authored Jul 22, 2006

Fixes for change that makes default appear in NODEGROUP as it should be instead of 0 which is an error

mysql-test/r/ndb_dd_backuprestore.result:
Fixes for change that makes default appear in NODEGROUP as it should be instead of 0 which is an error
mysql-test/r/ndb_partition_range.result:
Fixes for change that makes default appear in NODEGROUP as it should be instead of 0 which is an error

0a32f062

BUG#20340: NODEGROUP wrong field type in information schema · 4cda13c9
unknown authored Jul 22, 2006
```
Test case fix


mysql-test/r/information_schema_part.result:
  Test case fix
```
4cda13c9
Merge dator5.(none):/home/pappa/bug20340 · d8559b3d
unknown authored Jul 22, 2006
```
into  dator5.(none):/home/pappa/bug20733


sql/sql_show.cc:
  Auto merged
```
d8559b3d
Merge dator5.(none):/home/pappa/clean-mysql-5.1 · aa0ab122
unknown authored Jul 22, 2006
```
into  dator5.(none):/home/pappa/bug20733
```
aa0ab122

21 Jul, 2006 1 commit
- After merge fixes. · 3e2dfa97
  unknown authored Jul 21, 2006
  
  3e2dfa97
20 Jul, 2006 3 commits

Merge chilla.local:/home/mydev/mysql-5.0-mmerge · 05fc3f10

unknown authored Jul 20, 2006

into  chilla.local:/home/mydev/mysql-5.1-amain


configure.in:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_geofunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Manual merge
include/my_sys.h:
  Manual merge
mysql-test/t/federated.test:
  Manual merge
sql/ha_federated.cc:
  Manual merge
tests/Makefile.am:
  Manual merge

05fc3f10

Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-mrg · 013ecd59

unknown authored Jul 20, 2006

into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-mrg


sql/ha_ndbcluster.cc:
  SCCS merged
sql/handler.h:
  SCCS merged
sql/sql_update.cc:
  SCCS merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  SCCS merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  SCCS merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  SCCS merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  SCCS merged

013ecd59

BUG20733: Bug in partition pruning with zerofill field · d3b743ae

unknown authored Jul 20, 2006

Problem was with handling NULL values in ranges


mysql-test/r/partition_hash.result:
  New partition pruning test cases
mysql-test/r/partition_list.result:
  New partition pruning test cases
mysql-test/r/partition_pruning.result:
  New partition pruning test cases
mysql-test/r/partition_range.result:
  New partition pruning test cases
mysql-test/t/partition_hash.test:
  New partition pruning test cases
mysql-test/t/partition_list.test:
  New partition pruning test cases
mysql-test/t/partition_pruning.test:
  New partition pruning test cases
mysql-test/t/partition_range.test:
  New partition pruning test cases
sql/opt_range.cc:
  Added comment
sql/sql_partition.cc:
  Partition pruning didn't handle ranges with NULL values in a proper manner

d3b743ae

18 Jul, 2006 5 commits

Merge lmy004.:/work/mysql-5.1-runtime · e8697194
unknown authored Jul 18, 2006
```
into  lmy004.:/work/mysql-5.1-clean
```
e8697194

Fix windows build of libmysqld. Curious why pushbuild did not · d090462a

unknown authored Jul 18, 2006

catch that.
Stale CMakeLists.txt


libmysqld/CMakeLists.txt:
  event_executor.cc is no more since a lot of time. it has
  been superseeded by event_scheduler.cc

d090462a

after merge fix · 410a2621
unknown authored Jul 18, 2006

410a2621

Merge myoffice.izhnet.ru:/usr/home/gluh/MySQL/tmp_merge · 7f70e111

unknown authored Jul 18, 2006

into  myoffice.izhnet.ru:/usr/home/gluh/MySQL/5.1


mysql-test/r/sp_notembedded.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/handler.h:
  manual merge
sql/table.cc:
  manual merge
sql/unireg.cc:
  manual merge
tests/mysql_client_test.c:
  SCCS merged

7f70e111

BUG#20340: NODEGROUP in information_schema.partitions integer => · 0036ab8c

unknown authored Jul 18, 2006

error in error log when "default is put into it
NODEGROUP string to cater for "default" in it


mysql-test/r/ndb_partition_key.result:
  New test case
mysql-test/t/ndb_partition_key.test:
  New test case
sql/sql_show.cc:
  NODEGROUP string to cater for "default" in it

0036ab8c

17 Jul, 2006 2 commits
- Fixed test case · 98a63cde
  unknown authored Jul 17, 2006
  
  98a63cde
- Fixes for strange appearance of db.opt file · 358c3d79
  unknown authored Jul 17, 2006
  
  358c3d79
15 Jul, 2006 13 commits

Minor fix · 9038b72c
unknown authored Jul 15, 2006

9038b72c
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 · 8b3b9fb8
unknown authored Jul 15, 2006
```
into  dator5.(none):/home/pappa/push_tree_w28
```
8b3b9fb8

Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-1.2461 · 71484c10

unknown authored Jul 15, 2006

into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51


storage/ndb/src/kernel/error/TimeModule.cpp:
  SCCS merged

71484c10

Remove files that tests leave behind · 0fbf14ce

unknown authored Jul 15, 2006


mysql-test/t/ndb_alter_table.test:
  Remove file that the test leaves behind
mysql-test/t/partition.test:
  Remove file that the other tests leaves behind
mysql-test/t/rpl_ndb_bank.test:
  Remove file that the test leaves behind
mysql-test/t/rpl_ndb_dd_advance.test:
  Remove file that the test leaves behind

0fbf14ce

Merge dator5.(none):/home/pappa/clean-mysql-5.1 · b7e2a38d
unknown authored Jul 15, 2006
```
into  dator5.(none):/home/pappa/push_tree_w28
```
b7e2a38d

ndb - ndb_restore: print some dd errors at right verbosity · f29bb17d

unknown authored Jul 15, 2006


storage/ndb/tools/restore/consumer_restore.cpp:
  print disk data tablespace and file error on 'err' level

f29bb17d

Fixes to make tests work in conjunction with other tests · cd0817d4
unknown authored Jul 15, 2006

cd0817d4

Merge dator5.(none):/home/pappa/clean-mysql-5.1 · e1f890e8

unknown authored Jul 15, 2006

into  dator5.(none):/home/pappa/push_tree_w28


sql/ha_partition.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

e1f890e8

Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt · 3a15969c

unknown authored Jul 15, 2006

into  dator5.(none):/home/pappa/push_tree_w28


sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

3a15969c

Merge dator5.(none):/home/pappa/bug20852 · f9eb88e5
unknown authored Jul 15, 2006
```
into  dator5.(none):/home/pappa/push_tree_w28


sql/ha_partition.cc:
  Auto merged
```
f9eb88e5

Merge dator5.(none):/home/pappa/bug20770 · cd87e655

unknown authored Jul 15, 2006

into  dator5.(none):/home/pappa/push_tree_w28


sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged

cd87e655

Merge dator5.(none):/home/pappa/bug20767 · 39e48fb2

unknown authored Jul 15, 2006

into  dator5.(none):/home/pappa/push_tree_w28


sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged

39e48fb2

BUG#20389: Crash when using index scan in reverse order · dd729057

unknown authored Jul 15, 2006


mysql-test/r/partition_order.result:
  Changed a test case to handle ordered index scan reverse order as well
mysql-test/t/partition_order.test:
  Changed a test case to handle ordered index scan reverse order as well
sql/ha_myisam.cc:
  More debug info
sql/ha_partition.cc:
  Introduced partition_index_read_last to ensure we use index_read_last in those
  cases towards underlying handler.
  Ensured that index_read with HA_READ_PREFIX_LAST, HA_READ_PREFIX_LAST_OR_PREV and
  HA_READ_BEFORE_KEY uses ordered index scan in reverse order.
sql/ha_partition.h:
  Introduced partition_index_read_last to ensure we use index_read_last in those
  cases towards underlying handler.
  Ensured that index_read with HA_READ_PREFIX_LAST, HA_READ_PREFIX_LAST_OR_PREV and
  HA_READ_BEFORE_KEY uses ordered index scan in reverse order.

dd729057

14 Jul, 2006 3 commits

Fix information_schema.result after a manual merge. · fc6dcff5
unknown authored Jul 15, 2006
```
mysql-test/r/information_schema.result:
  Post-merge fixes.
```
fc6dcff5

Merge bodhi.local:/opt/local/work/tmp_merge · 5677612a

unknown authored Jul 15, 2006

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0


mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/sp-vars.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/information_schema.result:
  Use local
mysql-test/t/information_schema.test:
  Manual merge.
sql/sql_lex.h:
  Manual merge.

5677612a

Merge mysql.com:/home/psergey/tmp_merge-2 · 906cd90d

unknown authored Jul 14, 2006

into  mysql.com:/home/psergey/mysql-5.1-merge-2


mysql-test/r/range.result:
  Auto merged
mysql-test/t/range.test:
  Auto merged
sql/opt_range.cc:
  Auto merged

906cd90d

13 Jul, 2006 6 commits

Post-merge fixes. · 3657f346

unknown authored Jul 14, 2006


mysql-test/mysql-test-run.sh:
  A post-merge fix (apply a change lost during the merge).
sql/ha_ndbcluster.cc:
  A post-merge fix: resolve a merge error.
sql/item.cc:
  Fix a merge error.
sql/item_xmlfunc.cc:
  Use the new signature of agg_arg_charsets.

3657f346

Merge bodhi.local:/opt/local/work/tmp_merge · 3c3f9d90

unknown authored Jul 13, 2006

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-mysqld_safe-watch.sh~37cbc9a97ffd2555:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysys/my_handler.c:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/heap/hp_test1.c:
  Auto merged
storage/heap/hp_test2.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
sql/table.cc:
  Use local (manual merge)
mysql-test/mysql-test-run.sh:
  Manual merge.
sql/ha_ndbcluster.cc:
  Manual merge.
sql/item.cc:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.

3c3f9d90

Merge trift2.:/M50/tmp_merge2 · 5e643e31

unknown authored Jul 13, 2006

into  trift2.:/M51/merge-5.1


include/my_sys.h:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged

5e643e31

Merge trift2.:/M50/tmp_merge1 · 0293b84a

unknown authored Jul 13, 2006

into  trift2.:/M51/merge-5.1


configure.in:
  Null merge - the 5.0 version number does not propagate into 5.1

0293b84a

Post-merge fixes. · b1d1ea57

unknown authored Jul 13, 2006


mysql-test/r/federated.result:
  A post-merge fix.
mysql-test/r/show_check.result:
  A post-merge fix.
sql/log_event.cc:
  Remove rewrite_db (it's refactored in 5.1 to rpl_filter)
sql/share/errmsg.txt:
  Move ER_NO_TRIGGERS_ON_SYSTEM_SCHEMA to the end of the list.
  This breaks compatibility of errmsg.sys with 5.0 but preserves 
  compatibility with 5.1.11.
sql/sql_class.h:
  A post-merge fix.

b1d1ea57

Merge bodhi.local:/opt/local/work/tmp_merge · d013f9e5

unknown authored Jul 13, 2006

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0


include/my_sys.h:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/func_system.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
sql/slave.h:
  SCCS merged
mysql-test/r/show_check.result:
  Manual merge.
mysql-test/t/show_check.test:
  Manual merge.
sql/log_event.cc:
  Manual merge.
sql/share/errmsg.txt:
  Manual merge.
sql/sql_class.h:
  Manual merge.
sql/sql_db.cc:
  Manual merge.

d013f9e5