Commits · a15a9f09346708e472bb02e0ad421dc6b3979995 · nexedi / MariaDB

23 Sep, 2006 8 commits

Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge · a15a9f09

unknown authored Sep 23, 2006

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~3:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/udf_example.c:
  Auto merged
BitKeeper/deleted/.del-udf_example.def:
  Delete: sql/udf_example.def
mysql-test/mysql-test-run.pl:
  Manual merge 5.0->5.1
sql/Makefile.am:
  Manual merge 5.0->5.1

a15a9f09

Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge · 0d9242ce

unknown authored Sep 23, 2006

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

0d9242ce

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · dccc7924
unknown authored Sep 23, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
```
dccc7924

Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 · 2bac6da1

unknown authored Sep 23, 2006

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

2bac6da1

Disabling test case · ea8af488
unknown authored Sep 23, 2006

ea8af488

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl · 9ff1caac

unknown authored Sep 23, 2006

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


BitKeeper/etc/ignore:
  auto-union
mysql-test/t/disabled.def:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged

9ff1caac

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl · 4666c1e9

unknown authored Sep 23, 2006

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

4666c1e9

Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl · b574573f

unknown authored Sep 23, 2006

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

b574573f

22 Sep, 2006 5 commits

Merge trift2.:/MySQL/M50/mysql-5.0 · 588317e7

unknown authored Sep 22, 2006

into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~7:
  Auto merged
Docs/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/stacktrace.h:
  Auto merged

588317e7

Fix for bug #19121: Windows incompatible udf_example · 3e85b24c

unknown authored Sep 22, 2006


mysql-test/mysql-test-run.pl:
  fixed path for udf_example.so when running testsuite on Windows
sql/CMakeLists.txt:
  Added missing udf_example
sql/Makefile.am:
  Added udf_example files for make dist
sql/udf_example.c:
  fix for Windows: Windows doesn't have socket.h and friends
  
  Added replacements for strmov,bzero and memcpy_fixed when compiling standalone.
sql/udf_example.def:
  BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/sql/udf_example.def

3e85b24c

Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl · e998c965

unknown authored Sep 22, 2006

into  dsl-hkigw8-feb9fb00-191.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl


BitKeeper/etc/ignore:
  auto-union

e998c965

BUG#22067 rpl_rbr_to_sbr and some other fail if NDB is default storage · 21376ba6

unknown authored Sep 22, 2006

local file slipped into a previous commit, fixing ignore.


BitKeeper/etc/ignore:
  fixing a slip in previous bk citool invokation.

21376ba6

Added build rule for mysql_upgrade.exe · fa16278b
unknown authored Sep 22, 2006

fa16278b

21 Sep, 2006 22 commits

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 96a3db93
unknown authored Sep 21, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
96a3db93

Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · a25008a9

unknown authored Sep 21, 2006

into  romeo.(none):/home/bkroot/mysql-5.1-new-rpl


sql/log_event.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged

a25008a9

BUG#22550 (Replication of BIT column failing): · f0b8c4da

unknown authored Sep 21, 2006

Using move_field_offset() to move field pointer to other record before
calling pack()/unpack().


sql/log_event.cc:
  Using move_field_offset() to move the field pointer. It is necessary
  for unpack() and pack() of BIT fields to operate correctly.
  Adding debug printouts.
sql/sql_class.cc:
  Using move_field_offset() to move the field pointer. It is necessary
  for unpack() and pack() of BIT fields to operate correctly.
  Adding debug printouts to packing of update rows event.

f0b8c4da

Add a dummy file for "Docs/manual.chm" as we need it for "make dist" to work. · e41aae9d
unknown authored Sep 21, 2006
```
Docs/manual.chm:
  BitKeeper file /MySQL/M50/push-5.0/Docs/manual.chm
```
e41aae9d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 80934444
unknown authored Sep 21, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-toteam
```
80934444

Merge trift2.:/MySQL/M50/extract1-5.0 · 32696eb4

unknown authored Sep 21, 2006

into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/stacktrace.h:
  Auto merged

32696eb4

added udf_example.def for make dist · beae6a65
unknown authored Sep 21, 2006

beae6a65

Windows 64bit fixes · 4574cc93

unknown authored Sep 21, 2006

Fixed udf_example, so tests now can also run udf on win.


sql/udf_example.def:
  BitKeeper file /home/georg/work/mysql/prod/mysql-5.1-win/sql/udf_example.def
include/config-win.h:
  removed USE_32_BIT_TIME
include/my_time.h:
  Fixed size of my_time for Win64 (should be 64bit)
mysql-test/mysql-test-run.pl:
  Added windows paths for udf_example
sql/CMakeLists.txt:
  Added udf_example.dll
sql/udf_example.c:
  Windows doesn't know about socket.h and friends. Use winsock.h instead

4574cc93

After merge fixes · 9d3ea424
unknown authored Sep 21, 2006

9d3ea424

Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge · 0347ab69

unknown authored Sep 21, 2006

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
  Manual merge 5.0->5.1
mysql-test/r/rpl_insert_id.result:
  Manual merge 5.0->5.1
mysql-test/r/rpl_stm_max_relay_size.result:
  Manual merge 5.0->5.1
mysql-test/t/rpl_insert_id.test:
  Manual merge 5.0->5.1

0347ab69

After merge fixes · 9668c01d
unknown authored Sep 21, 2006

9668c01d

Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge · b412be03

unknown authored Sep 21, 2006

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


mysql-test/r/rpl_insert_id.result:
  Merge 4.1-5.0
mysql-test/r/rpl_max_relay_size.result:
  Merge 4.1-5.0
mysql-test/t/rpl_insert_id.test:
  Merge 4.1-5.0
mysql-test/t/rpl_max_relay_size.test:
  Merge 4.1-5.0

b412be03

Adding proper setup phase for test case rpl_insert_id · 41434a4d
unknown authored Sep 21, 2006
```
mysql-test/r/rpl_insert_id.result:
  Updated result file
```
41434a4d

If mysqlslap schema does not exists, it should be an error, so no need for IF EXISTS · 8b8674f9

unknown authored Sep 21, 2006

Setting default database back to 'test', so that next test case don't use the wrong database


mysql-test/r/rpl_insert.result:
  result file update

8b8674f9

Added master-slave synchronization to make sure truncate happen before slave... · cebbc30b
unknown authored Sep 21, 2006
```
Added master-slave synchronization to make sure truncate happen before slave manipulations on every platform
```
cebbc30b

Merge chilla.local:/home/mydev/mysql-5.0--main · 879c7309

unknown authored Sep 21, 2006

into  chilla.local:/home/mydev/mysql-5.0-toteam


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

879c7309

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 303f1273
unknown authored Sep 21, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-win
```
303f1273
Merge chilla.local:/home/mydev/mysql-5.1--main · 87effd1f
unknown authored Sep 21, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-tomain
```
87effd1f

Deleted old storage directories (introduced by a buggy 5.0 -> 5.1 merge). · 7e45d222

unknown authored Sep 21, 2006

Fix for win/Makefile.am


BitKeeper/deleted/.del-CMakeLists.txt~dd682cce1d53c0b4:
  Delete: bdb/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~c20dcd005f596740:
  Delete: myisam/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~4ef559bc8b4695f7:
  Delete: heap/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d:
  Delete: innobase/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~84669765249a4bad:
  Delete: myisammrg/CMakeLists.txt
win/Makefile.am:
  added missing support for 64-bit build file (make dist)

7e45d222

Vertical printout in test to make easier to read · 5112f0fe
unknown authored Sep 21, 2006

5112f0fe
Version 5.1 needs one connection less · 18aa3f17
unknown authored Sep 21, 2006

18aa3f17
Result file fixes after merge · 24497b0f
unknown authored Sep 21, 2006

24497b0f

20 Sep, 2006 5 commits

Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge · 213d6fcf

unknown authored Sep 21, 2006

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


mysql-test/r/rpl_view.result:
  Auto merged
mysql-test/t/rpl_view.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/mysqldump.result:
  Manual merge, merge trees 5.0->5.1

213d6fcf

Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge · 46235a29
unknown authored Sep 21, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


sql/sql_yacc.yy:
  Auto merged
```
46235a29

Fix of result files from merge · 866d046d

unknown authored Sep 21, 2006


mysql-test/r/mysqldump.result:
  Fix of result file (adding the echo's)
mysql-test/r/rpl_view.result:
  Added end of 5.0 echo
mysql-test/t/rpl_view.test:
  Added end of 5.0 echo

866d046d

Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge · 4c2652f8

unknown authored Sep 21, 2006

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


client/mysqldump.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
mysql-test/r/mysqldump.result:
  Manual merge, merge tree 5.0->5.1
mysql-test/r/rpl_view.result:
  Manual merge, merge tree 5.0->5.1
mysql-test/t/mysqldump.test:
  Manual merge, merge tree 5.0->5.1
mysql-test/t/rpl_view.test:
  Manual merge, merge tree 5.0->5.1

4c2652f8

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl · 0d7b3b7a

unknown authored Sep 21, 2006

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
client/mysqldump.c:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
mysql-test/r/mysqldump.result:
  Restoring rpl tree mysqldump test file to main tree test files
mysql-test/r/status.result:
  Manual merge
mysql-test/t/mysqldump.test:
  Restoring rpl tree mysqldump test file to main tree test files

0d7b3b7a