Commits · a354bbba8ffd01788119ff3989cc8eeade52ec76 · nexedi / MariaDB

28 Jul, 2006 1 commit
- Add sql_locale.cc to cmake scripts. · a354bbba
  unknown authored Jul 28, 2006
  
  a354bbba
27 Jul, 2006 1 commit

unknown authored Jul 27, 2006


storage/myisam/mi_create.c:
  Post-merge fixes (Thanks Ingo).

5e4ffc79

26 Jul, 2006 3 commits

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

unknown authored Jul 26, 2006

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


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
  Auto merged
BitKeeper/deleted/.del-libmysqld.vcproj~a75d5b9a5967dea0:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  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/ndbapi/ndberror.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/r/federated.result:
  Use local.
mysql-test/r/myisam.result:
  Manual merge.
mysql-test/t/federated.test:
  Manual merge.
mysql-test/t/myisam.test:
  Manual merge.
sql/Makefile.am:
  Manual merge.
sql/set_var.cc:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
sql/sql_update.cc:
  Manual merge.
storage/myisam/mi_create.c:
  Manual merge.

ef256aea

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 8a1692e1
unknown authored Jul 26, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


sql/sql_table.cc:
  Auto merged
```
8a1692e1
Disabled ndb_restore_compat for BUG#21283. · c5d677a3
unknown authored Jul 26, 2006

c5d677a3

25 Jul, 2006 2 commits

Disabled ndb_binlog_ignore_db for BUG 21279. · d9e03487
unknown authored Jul 25, 2006

d9e03487

Fix for bug#16532 mysql server assert in debug if table definition is removed · 6c7675c3

unknown authored Jul 25, 2006

Emit an error instead of doing ASSERT


mysql-test/r/create_not_windows.result:
  update result
mysql-test/t/create_not_windows.test:
  Add test case for bug #16532: mysql server assert in debug if table definition is removed
sql/sql_table.cc:
  it could happen that an user deletes the frm file on OS level.
  In addition if the table was already opened, the file system level
  check for existance of table.frm will pass but get_cached_table_share()
  will return non-NULL value. In this case we will emit the standard
  error that the table exist. The error case is quite obscure but error
  message is better than a sigabort.

6c7675c3

24 Jul, 2006 4 commits

After merge fix · 7a043e00
unknown authored Jul 24, 2006

7a043e00
After merge fix · 6fac20e9
unknown authored Jul 24, 2006

6fac20e9
After merge fix · f74c4a06
unknown authored Jul 24, 2006

f74c4a06

Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 · 050aa61e

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

050aa61e

23 Jul, 2006 2 commits

BUG#20294 Instance manager test im_instance_conf fails randomly · 599df8dc

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

599df8dc

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

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

f20a8c91

22 Jul, 2006 4 commits

BUG#20340: NODEGROUP wrong field type in partitions information schema table · 7e072d48

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

7e072d48

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


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


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

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

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

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

eae506f1

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

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

d7322da3

BUG20733: Bug in partition pruning with zerofill field · 8592305b

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

8592305b

18 Jul, 2006 5 commits

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

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

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

bb5bbc8f

after merge fix · 714c9ad3
unknown authored Jul 18, 2006

714c9ad3

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

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

e26729d9

BUG#20340: NODEGROUP in information_schema.partitions integer => · 7bc8deab

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

7bc8deab

17 Jul, 2006 2 commits
- Fixed test case · 514f2cdb
  unknown authored Jul 17, 2006
  
  514f2cdb
- Fixes for strange appearance of db.opt file · b3dc934f
  unknown authored Jul 17, 2006
  
  b3dc934f
15 Jul, 2006 12 commits

Minor fix · b7b684e6
unknown authored Jul 15, 2006

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

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

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

f1e72486

Remove files that tests leave behind · 355c3690

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

355c3690

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

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

unknown authored Jul 15, 2006


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

723a8592

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

4787aaab

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

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

80e3aa51

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

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

7594237b

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


sql/ha_partition.cc:
  Auto merged
```
69b744e1

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

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

bd70856f

Merge dator5.(none):/home/pappa/bug20767 · 180972e0

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

180972e0