Commits · 630847cb1a133e1f21a0c4faf97332c899d90178 · Kirill Smelkov / mariadb

13 Sep, 2005 9 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 630847cb

unknown authored Sep 13, 2005

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


sql/sql_show.cc:
  Auto merged

630847cb

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 · dca83978

unknown authored Sep 13, 2005

into  eel.(none):/home/jonas/src/mysql-5.1-push


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/test/include/NDBT_Test.hpp:
  Auto merged
storage/ndb/test/ndbapi/Makefile.am:
  Auto merged
storage/ndb/test/ndbapi/bank/Bank.cpp:
  Auto merged
storage/ndb/test/ndbapi/bank/Bank.hpp:
  Auto merged
storage/ndb/test/src/NDBT_Test.cpp:
  Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
  Auto merged

dca83978

Merge neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new · fc8a066a

unknown authored Sep 13, 2005

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


sql/item.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged

fc8a066a

BUG#10713 mysqldump includes database in create view and referenced tables · 2761c648

unknown authored Sep 13, 2005

 - Update test results
 - Updates after review


mysql-test/r/func_in.result:
  Update test results
mysql-test/r/lowercase_view.result:
  Update test results
mysql-test/r/mysqldump.result:
  Update test results
mysql-test/r/sql_mode.result:
  Update test results
mysql-test/r/temp_table.result:
  Update test results
mysql-test/r/view.result:
  Update test results
mysql-test/t/mysqldump.test:
  Update test results
sql/sql_show.cc:
  Updated after review

2761c648

Merge neptunus.(none):/home/msvensson/mysql/bug10713 · 9a96be05

unknown authored Sep 13, 2005

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


sql/sql_select.cc:
  Auto merged
mysql-test/r/mysqldump.result:
  Manual merge
mysql-test/t/mysqldump.test:
  Manual merge
sql/item.cc:
  Manual merge
sql/sql_show.cc:
  Manual merge
sql/table.h:
  Manual merge

9a96be05

Merge · 0260e3dc

unknown authored Sep 13, 2005


configure.in:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
sql/sql_table.cc:
  SCCS merged

0260e3dc

Merge bk-internal:/home/bk/mysql-5.0 · b50eb4cd
unknown authored Sep 12, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean
```
b50eb4cd

innochecksum.c: · 276e9f82

unknown authored Sep 13, 2005

  Changed from C++ comments to C comments
  Did some adaption to MySQL Coding Style


extra/innochecksum.c:
  Changed from C++ comments to C comments
  Did some adaption to MySQL Coding Style

276e9f82

Merge mysql.com:/home/jimw/my/mysql-4.1-clean · 8dc5c95b

unknown authored Sep 12, 2005

into  mysql.com:/home/jimw/my/mysql-5.0-clean


include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/violite.h:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viosocket.c:
  Auto merged
vio/viossl.c:
  Auto merged
configure.in:
  Resolve conflicts

8dc5c95b

12 Sep, 2005 31 commits

Merge bk-internal:/home/bk/mysql-4.1 · accf5c26
unknown authored Sep 12, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged
```
accf5c26

mysql-test-run.pl: · 74aeffda

unknown authored Sep 13, 2005

  Corrected typo


mysql-test/mysql-test-run.pl:
  Corrected typo

74aeffda

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 597b307d
unknown authored Sep 13, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
```
597b307d
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 · cc537b07
unknown authored Sep 13, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-4.1


configure.in:
  Auto merged
```
cc537b07
Merged from 4.1 to 5.0. · 4d29b85d
unknown authored Sep 13, 2005

4d29b85d
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · b33da62c
unknown authored Sep 13, 2005
```
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
```
b33da62c
Adding comment for force manual merge 5.0 -> wl1012 · 3d1658f7
unknown authored Sep 12, 2005

3d1658f7
Merge bk-internal:/home/bk/mysql-4.1 · 06c2d66e
unknown authored Sep 12, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean
```
06c2d66e
Update test result · 38b2cd73
unknown authored Sep 12, 2005
```
mysql-test/r/ndb_autodiscover.result:
  Update results
```
38b2cd73
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 333bc203
unknown authored Sep 12, 2005
```
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-4.1
```
333bc203
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1 · c231cb6a
unknown authored Sep 12, 2005
```
into  selena.:H:/MYSQL/src/#05588-mysql-4.1


include/my_global.h:
  Auto merged
```
c231cb6a
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7254e748
unknown authored Sep 12, 2005
```
into  kite-hub.kitebird.com:/tmp/merge-4.1
```
7254e748
Merge kite-hub.kitebird.com:/tmp/merge-4.0 · 6c8e4044
unknown authored Sep 12, 2005
```
into  kite-hub.kitebird.com:/tmp/merge-4.1


README:
  Auto merged
```
6c8e4044

README: · d262a6e0

unknown authored Sep 12, 2005

  Update README (2nd try)


README:
  Update README (2nd try)

d262a6e0

Merge mysqldev@production.mysql.com:jimw/mysql-4.1-sco · 4975a7f9

unknown authored Sep 12, 2005

into  mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged
include/my_pthread.h:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged

4975a7f9

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 · 8c342365

unknown authored Sep 12, 2005

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0


mysql-test/r/temp_table.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
sql/sql_db.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/create.result:
  Merged from 4.1 to 5.0
mysql-test/r/innodb.result:
  Merged from 4.1 to 5.0
mysql-test/t/create.test:
  Merged from 4.1 to 5.0
sql/item_cmpfunc.cc:
  Merged from 4.1 to 5.0
sql/sql_table.cc:
  Merged from 4.1 to 5.0

8c342365

BUG#12943 - post-merge fix · 3462573f

unknown authored Sep 12, 2005


mysql-test/r/select.result:
  post-merge fix
mysql-test/t/select.test:
  post-merge fix

3462573f

Merge mysql.com:/home/timka/mysql/src/5.0-virgin · e08e620c

unknown authored Sep 12, 2005

into  mysql.com:/home/timka/mysql/src/5.0-bug-12943


sql/sql_parse.cc:
  Auto merged
mysql-test/r/select.result:
  merge BUG#12943
mysql-test/t/select.test:
  merge BUG#12943

e08e620c

Corrected construct of faked Node fail signals in ndb SignalSender · 3f405066
unknown authored Sep 12, 2005

3f405066
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 17233698
unknown authored Sep 12, 2005
```
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
```
17233698
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 3ad213ba
unknown authored Sep 12, 2005
```
into  mishka.mysql.com:/home/my/mysql-4.1
```
3ad213ba

Review fixes since last pull · 90ca6d15

unknown authored Sep 12, 2005

Fix for bug #13025; Server crash in filesort because wrong call to handler::position()


client/mysqltest.c:
  Code cleanup during review
mysql-test/r/innodb.result:
  Added test case for bug #13025; Server crash in filesort because wrong call to handler::position()
mysql-test/t/innodb.test:
  Added test case for bug #13025; Server crash in filesort because wrong call to handler::position()
sql/filesort.cc:
  Don't call handler::position() if row was not found
sql/item_cmpfunc.cc:
  Indentation changes
sql/sql_select.cc:
  Moved variable to outer level

90ca6d15

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5dd24cbe
unknown authored Sep 12, 2005
```
into  mysql.com:/usr/home/bar/mysql-5.0
```
5dd24cbe

Many files: · 95fecf34

unknown authored Sep 12, 2005

  Adding esperanto collation


strings/ctype-uca.c:
  Adding esperanto collation
mysys/charset-def.c:
  Adding esperanto collation
mysql-test/t/ctype_uca.test:
  Adding esperanto collation
mysql-test/r/ctype_uca.result:
  Adding esperanto collation
config/ac-macros/character_sets.m4:
  Adding esperanto collation

95fecf34

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 49e734e6
unknown authored Sep 12, 2005
```
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
```
49e734e6
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · bab5cb78
unknown authored Sep 12, 2005
```
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
```
bab5cb78
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · c29e0f70
unknown authored Sep 12, 2005
```
into  eel.(none):/home/jonas/src/mysql-4.1-push
```
c29e0f70

Merge · 54e99aa5

unknown authored Sep 12, 2005


mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysys/default.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/heap/hp_hash.c:
  Auto merged
storage/ndb/include/util/Parser.hpp:
  Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/test/include/NDBT_Test.hpp:
  Auto merged
storage/ndb/test/ndbapi/Makefile.am:
  Auto merged
storage/ndb/test/ndbapi/bank/Bank.cpp:
  Auto merged
storage/ndb/test/ndbapi/bank/Bank.hpp:
  Auto merged
storage/ndb/test/src/NDBT_Test.cpp:
  Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
  Auto merged
mysql-test/mysql-test-run.pl:
  SCCS merged

54e99aa5

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4efcca02

unknown authored Sep 12, 2005

into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0


mysql-test/t/rpl_slave_status.test:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged

4efcca02

Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS · 63080dc2

unknown authored Sep 12, 2005

  produce warning for 'create database if not exists' if database exists
  do not update database options in this case  
  produce warning for 'create table if not exists' if table exists



mysql-test/r/create.result:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    updated test case result
mysql-test/r/temp_table.result:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    updated test case result
mysql-test/r/warnings.result:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    updated test case result
mysql-test/t/create.test:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    test case
sql/sql_db.cc:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    produce warning for 'create database if not exists' if database exists
    do not update database options in this case
sql/sql_table.cc:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    produce warning for 'create table if not exists' if table exists

63080dc2

removed a few aborts from mgmapi · 0a3202be
unknown authored Sep 12, 2005
```
corrected typo in ndb Parser
```
0a3202be