Commits · f236550f2cbd364dac158ef980cca7cfef64f584 · nexedi / MariaDB

05 Dec, 2006 18 commits

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · f236550f

unknown authored Dec 05, 2006

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


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ndb_update.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/common/util/socket_io.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Manual merge
storage/ndb/src/common/util/InputStream.cpp:
  Manual merge

f236550f

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · a77b5e78

unknown authored Dec 05, 2006

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


mysql-test/mysql-test-run.pl:
  Auto merged

a77b5e78

Remove hack that removes vardir · 69e729a1
unknown authored Dec 05, 2006

69e729a1

Merge bk-internal:/home/bk/mysql-4.1-build · 735dc18d

unknown authored Dec 05, 2006

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


mysql-test/mysql-test-run.pl:
  Auto merged

735dc18d

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 · ef553964

unknown authored Dec 05, 2006

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


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/parser.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/sp_gis.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/parser.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

ef553964

Merge bk-internal:/home/bk/mysql-5.1 · 0f7e94d0
unknown authored Dec 05, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
0f7e94d0
Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061204181655|04883 · b9f0e18d
unknown authored Dec 05, 2006
```
client/mysqltest.c:
  Exclude
```
b9f0e18d
Raise version number after cloning 5.1.14-beta · efa1b3c2
unknown authored Dec 05, 2006

efa1b3c2
Update rsult file after merge, error message number increased · 51f30b2d
unknown authored Dec 05, 2006

51f30b2d
Use "sql_print_error" instead of "sql_print_warning" to get a better · 48c4ef46
unknown authored Dec 05, 2006
```
error message in the logs before shutting down the server
```
48c4ef46
mysql.binlog_index renamed to mysql.ndb_binlog_index · da7c2f5d
unknown authored Dec 05, 2006

da7c2f5d
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · d0b17a5e
unknown authored Dec 05, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
d0b17a5e

Merge bk-internal:/home/bk/mysql-5.1-maint · 709457b3

unknown authored Dec 05, 2006

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


sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

709457b3

fix test cases after change to error messages file · 30832b6d

unknown authored Dec 05, 2006


mysql-test/r/sp.result:
  offset error number according to changed error messages file
mysql-test/r/sp_gis.result:
  offset error number according to changed error messages file

30832b6d

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · abe99adc
unknown authored Dec 05, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build


mysql-test/mysql-test-run.pl:
  Auto merged
```
abe99adc

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · 23d7e99f

unknown authored Dec 05, 2006

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


mysql-test/mysql-test-run.pl:
  Auto merged

23d7e99f

re-enable multiple test runs in sequence for 4.1 on non-windows · a14c613f

unknown authored Dec 05, 2006


mysql-test/mysql-test-run.pl:
  delete $default_vardir if the 4.1 vardir trick is to be used to re-enable more than one test run in sequence

a14c613f

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 59664723
unknown authored Dec 05, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
```
59664723

04 Dec, 2006 22 commits

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 602d8340
unknown authored Dec 05, 2006
```
into  example.com:/work/bug22369-v2/my51
```
602d8340
Merge kpettersson@bk-internal:/home/bk/mysql-5.1-new-maint · a87656c3
unknown authored Dec 04, 2006
```
into  naruto.:C:/cpp/mysql-5.1-maint
```
a87656c3
Disabled testcase flush2 until pushbild framework can handle test which · 32e5b86e
unknown authored Dec 04, 2006
```
disables binlog.


mysql-test/t/disabled.def:
  disabled test flush2
```
32e5b86e

Change ::fileno() to fileno() in ndb/common/util/File.cpp. · 719a4fca

unknown authored Dec 04, 2006

fileno(), and many other stdio functions, may be macros
(at least on *BSD).

Don't explicitly qualify it with global scope (::fileno()),
because it causes syntax errors.

<cstdio> doesn't define *most* of these macros.

It still has a macro for fileno(), however, on FreeBSD 6.1,
so even using <cstdio> isn't a fix for this.  Better to
just avoid ::standard_library_function() in general, in
order to be portable.


storage/ndb/src/common/util/File.cpp:
  fileno(), and many other stdio functions, may be macros
  (at least on *BSD).
  
  Don't explicitly qualify it with global scope (::fileno()),
  because it causes syntax errors.
  
  Note that <cstdio> doesn't define *most* of these macros.
  It still has a macro for fileno(), however, on FreeBSD 6.1,
  so even using <cstdio> isn't a fix for this.  Better to
  just avoid ::standard_library_function() in general, in
  order to be portable.

719a4fca

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 540a317f
unknown authored Dec 04, 2006
```
into  example.com:/work/bug22369-v2/my51
```
540a317f

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836 · f0563683

unknown authored Dec 04, 2006

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint


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

f0563683

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 5eb992b4

unknown authored Dec 04, 2006

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


BitKeeper/etc/ignore:
  auto-union
Docs/Makefile.am:
  Auto merged
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Auto merged
include/Makefile.am:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/rpl_sp.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged

5eb992b4

Apply malff@weblab.(none) fix for bug 24736 directly to · 39ccc1d2

unknown authored Dec 04, 2006

mysql-5.1-build tree, in order to get it into mysql-5.1
faster.  See comments from Marc's original push for
patch details.

39ccc1d2

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 645c04e8

unknown authored Dec 04, 2006

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


Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/mysqld.cc:
  Auto merged

645c04e8

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

unknown authored Dec 04, 2006

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


BitKeeper/etc/ignore:
  auto-union
Docs/Makefile.am:
  Auto merged
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/Makefile.am:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_handler.cc:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Manual merge with import of upstream yaSSL

fd3904f4

mysqltest · f009c12e

unknown authored Dec 04, 2006

Close any statements that might be open before program exit
Close any statments that might be open when calling "disable_ps_protocol"


client/mysqltest.c:
  Close any statements that might be open before program exit
  Close any statments that might be open when calling "disable_ps_protocol"

f009c12e

mysql-test-run.pl: Append .nlm to the binary name on NetWare · 10974bc2
unknown authored Dec 04, 2006
```
mysql-test/lib/mtr_misc.pl:
  Append .nlm to the binary name on NetWare
```
10974bc2

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 · f7578aa9

unknown authored Dec 04, 2006

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


BitKeeper/etc/collapsed:
  auto-union
BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Auto merged
include/Makefile.am:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/parser.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/parser.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/system_mysql_db_fix30020.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
mysql-test/r/sp.result:
  Manual merge
mysql-test/r/udf.result:
  Manual merge
mysql-test/t/events_bugs.test:
  Manual merge
sql/share/errmsg.txt:
  Manual merge
support-files/mysql.spec.sh:
  Manual merge

f7578aa9

Merge bk-internal:/home/bk/mysql-5.0-maint · 52748172
unknown authored Dec 04, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
52748172

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · 21740227

unknown authored Dec 04, 2006

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


Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/mysqld.cc:
  Auto merged

21740227

Merge bk-internal:/home/bk/mysql-4.1-maint · ba441943
unknown authored Dec 04, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
```
ba441943

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836 · 8e2032e8

unknown authored Dec 04, 2006

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836


mysql-test/r/distinct.result:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

8e2032e8

Merge bk-internal:/home/bk/mysql-5.1 · 05fae388

unknown authored Dec 04, 2006

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


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged

05fae388

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug17951/my50-bug17951 · a96cd4c7
unknown authored Dec 04, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint


myisam/myisampack.c:
  Auto merged
```
a96cd4c7
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug17951/my51-bug17951 · 1e0b326b
unknown authored Dec 04, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint


storage/myisam/myisampack.c:
  Auto merged
```
1e0b326b

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 083534b6

unknown authored Dec 04, 2006

into  example.com:/work/bug22369-v2/my51


mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/t/alter_table.test:
  manual merge

083534b6

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug17951/my50-bug17951 · eeaf5849
unknown authored Dec 04, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug17951/my51-bug17951


storage/myisam/myisampack.c:
  Auto merged
```
eeaf5849