Commits · b70b75567ab54b0465fbb25beba54284eedda6d1 · Kirill Smelkov / mariadb

24 Mar, 2006 1 commit

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · b70b7556

unknown authored Mar 24, 2006

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


mysql-test/lib/mtr_timer.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StartPerm.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TcContinueB.hpp:
  Auto merged
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  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/TransporterCallback.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  Auto merged
storage/ndb/test/ndbapi/testTimeout.cpp:
  Auto merged
storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt:
  Auto merged
storage/ndb/test/run-test/conf-dl145a.txt:
  Auto merged
storage/ndb/test/run-test/conf-ndbmaster.txt:
  Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
  Auto merged
storage/ndb/test/src/NdbRestarter.cpp:
  Auto merged
storage/ndb/test/run-test/conf-shark.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge
storage/ndb/src/ndbapi/TransporterFacade.hpp:
  merge
storage/ndb/test/run-test/Makefile.am:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
storage/ndb/tools/desc.cpp:
  merge

b70b7556

23 Mar, 2006 34 commits

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · a4962ed0
unknown authored Mar 23, 2006
```
into  zim.(none):/home/brian/mysql/dep-5.1
```
a4962ed0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · d953e153
unknown authored Mar 23, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


sql/ha_ndbcluster_binlog.cc:
  Auto merged
```
d953e153
Bug #18472 race condition between multiple mysqld's when setting up cluster/schema · dfbc4b3f
unknown authored Mar 23, 2006
```
- check that event is the correct one, and only delete if wrong version
```
dfbc4b3f
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f911a7fe
unknown authored Mar 23, 2006
```
into  zim.(none):/home/brian/mysql/dep-5.1
```
f911a7fe

ctype-utf8.c, ctype-simple.c: · d4c8ca0c

unknown authored Mar 23, 2006

  Forgot to include into the previous changeset.


strings/ctype-simple.c:
  Forgot to include into the previous changeset.
strings/ctype-utf8.c:
  Forgot to include into the previous changeset.

d4c8ca0c

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · d1381992
unknown authored Mar 23, 2006
```
into  zim.(none):/home/brian/mysql/dep-5.1
```
d1381992
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 378efca2
unknown authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new
```
378efca2

Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 285bb899

unknown authored Mar 23, 2006

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

285bb899

ndb - · deb4d310

unknown authored Mar 23, 2006

  remove bug#18385 from autotest as it only works on 2 node clusters


ndb/test/run-test/daily-basic-tests.txt:
  remove bug#18385 as it only works on 2 node clusters

deb4d310

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f8a18bae
unknown authored Mar 23, 2006
```
into  zim.(none):/home/brian/mysql/dep-5.1
```
f8a18bae

Refactored some code to remove ifdef and removed dead code related to un-useable sync code. · fd8513fa

unknown authored Mar 23, 2006


sql/ha_innodb.cc:
  Removing dead code
sql/handler.cc:
  Removing dead code
sql/handler.h:
  Removing Dead code
sql/sql_class.cc:
  Removing unneeded ifdef code.
sql/sql_repl.cc:
  Removing dead code.

fd8513fa

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new · 26853841
unknown authored Mar 23, 2006
```
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
```
26853841

ndb - · fde02a80

unknown authored Mar 23, 2006

  minor fixes in test programs


ndb/src/kernel/blocks/ERROR_codes.txt:
  Fix conflicting error codes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fix conflicting error codes
ndb/test/ndbapi/testNodeRestart.cpp:
  Fix test program

fde02a80

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · bf8dfb30
unknown authored Mar 23, 2006
```
into  mysql.com:/export/space/pekka/ndb/version/my51
```
bf8dfb30
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new · 3920f19a
unknown authored Mar 23, 2006
```
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new


sql-common/client.c:
  Auto merged
```
3920f19a

Merge mysql.com:/usr/home/bar/mysql-5.0 · 86f3d2d0

unknown authored Mar 23, 2006

into  mysql.com:/usr/home/bar/mysql-5.1-new


mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/t/ctype_ujis.test:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-cp932.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-eucjpms.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
include/m_ctype.h:
  After merge fix.

86f3d2d0

Bug#15376: Unassigned multibyte codes are converted to U+0000 · 1b58717c

unknown authored Mar 23, 2006

Mergeing changes into 5.0


mysql-test/r/ctype_eucjpms.result:
  Adding test
mysql-test/r/ctype_ujis.result:
  After merge fix
mysql-test/t/ctype_eucjpms.test:
  Adding test
strings/ctype-cp932.c:
  After merge fix
strings/ctype-eucjpms.c:
  Applying changes to eucjpms, similar to ujis.
  Note: eucjpms appeared in 5.0 so the original patch,
  which was for for 4.1, didn't fix eucjpms.

1b58717c

m_ctype.h: · 1f129403

unknown authored Mar 23, 2006

  Removing duplicate old definition.
  After merge fix for bug#15375


include/m_ctype.h:
  Removing duplicate old definition.
  After merge fix for bug#15375

1f129403

Merge mysql.com:/usr/home/bar/mysql-4.1.b15376 · 8c8e0567

unknown authored Mar 23, 2006

into  mysql.com:/usr/home/bar/mysql-5.0


BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged
mysql-test/t/ctype_ujis.test:
  Auto merged
sql/sql_string.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
include/m_ctype.h:
  After merge fix.
mysql-test/r/ctype_ujis.result:
  After merge fix

8c8e0567

Merge mysql.com:/users/lthalmann/bk/mysql-5.0 · 4a945058

unknown authored Mar 23, 2006

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new


BitKeeper/deleted/.del-wait_slave_status.inc:
  Delete: mysql-test/include/wait_slave_status.inc
sql-common/client.c:
  Auto merged

4a945058

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · c7df2c6a
unknown authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new
```
c7df2c6a
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5b34888c
unknown authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.0
```
5b34888c
Merge mysql.com:/usr/home/bar/mysql-5.0 · 2dfd0fa6
unknown authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new


sql-common/client.c:
  Auto merged
```
2dfd0fa6
New file to remove sleeps in mysql-test-run (backported from 5.1) · d16d2df5
unknown authored Mar 23, 2006

d16d2df5

ctype-czech.c: · b31eca1e

unknown authored Mar 23, 2006

  Fixing wrong min_sort_char.


strings/ctype-czech.c:
  Fixing wrong min_sort_char.

b31eca1e

Merge bk-internal:/home/bk/mysql-5.1-new · 763b4f47
unknown authored Mar 23, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
763b4f47
Merge bk-internal:/home/bk/mysql-5.0 · 6d771166
unknown authored Mar 23, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
```
6d771166

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 47cee5bf

unknown authored Mar 23, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/parse_file.cc:
  Auto merged

47cee5bf

Move the replcae result to before the correct select · c3e7925f
unknown authored Mar 23, 2006

c3e7925f
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · cea5dcf6
unknown authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new
```
cea5dcf6
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · abbc7e2d
unknown authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.0
```
abbc7e2d

Merge mysql.com:/usr/home/bar/mysql-5.0 · c25669a8

unknown authored Mar 23, 2006

into  mysql.com:/usr/home/bar/mysql-5.1-new


include/m_ctype.h:
  Auto merged
strings/ctype-bin.c:
  Auto merged

c25669a8

Merge mysql.com:/usr/home/bar/mysql-4.1.b17374 · 859aa2f2

unknown authored Mar 23, 2006

into  mysql.com:/usr/home/bar/mysql-5.0


include/m_ctype.h:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-czech.c:
  Auto merged

859aa2f2

ndb - bug#17813 schema.query => blob · 8bc7214f

unknown authored Mar 23, 2006


storage/ndb/include/ndbapi/NdbDictionary.hpp:
  ER_ALL: omit unchanged blob inlines
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  ER_ALL: omit unchanged blob inlines
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  ER_ALL: omit unchanged blob inlines
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  ER_ALL: omit unchanged blob inlines
storage/ndb/src/ndbapi/NdbBlob.cpp:
  atNextEvent: ignore non-data event
sql/ha_ndbcluster_binlog.cc:
  schema.query => blob
storage/ndb/tools/restore/Restore.cpp:
  allow 'system tables' to have blob attrs
storage/ndb/tools/restore/Restore.hpp:
  allow 'system tables' to have blob attrs
storage/ndb/tools/restore/restore_main.cpp:
  allow 'system tables' to have blob attrs

8bc7214f

22 Mar, 2006 5 commits
- Make usage of the MYSQL struct in shared libraries compatible with MySQL 5.0.17 and · 3e6330e7
  unknown authored Mar 23, 2006
```
5.0.18 by not reseting or accessing the info_buffer member
```
  3e6330e7
- Fix unused variable warning · 0003994a
  unknown authored Mar 22, 2006
```
sql/parse_file.cc:
  Remove unused variable
```
  0003994a
- Save core files before removing the data_dir · 40e48024
  unknown authored Mar 22, 2006
  
  40e48024
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new · 5ae7cf46
  unknown authored Mar 22, 2006
```
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
```
  5ae7cf46
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 8e46f640
  unknown authored Mar 22, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  8e46f640