Commits · 9446cfe925b3cf1953704b78e5fa1814f7c6e602 · Kirill Smelkov / mariadb

07 Dec, 2006 2 commits

Merge shakedown.(none):/home/jpipes/dev/bug20246/my41-bug20246 · 9446cfe9
unknown authored Dec 07, 2006
```
into  shakedown.(none):/home/jpipes/dev/mysql-5.1-maint


include/mysql.h:
  Auto merged
```
9446cfe9

Fix for Bug #20246 (enum mysql_enum_shutdown_level not well-defined in mysql_com.h) · 9e48e73f

unknown authored Dec 06, 2006

MYSQL_VERSION_ID is tested before it has been defined.  This leads to
a warning when compiling with -Wundef and it also will break the
internal logic of mysql_com.h as soon as MYSQL_VERSION_ID exceeds
50000.

The fix entailed a simple re-ordering of included files in mysql.h


include/mysql.h:
  Fix for Bug #20246 (enum mysql_enum_shutdown_level not well-defined in mysql_com.h)
  
  MYSQL_VERSION_ID is tested before it has been defined.  This leads to
  a warning when compiling with -Wundef and it also will break the
  internal logic of mysql_com.h as soon as MYSQL_VERSION_ID exceeds
  50000.
  
  Placed the #include for mysql_version.h above mysql_com.h to resolve conflict

9e48e73f

06 Dec, 2006 1 commit

Initialize guarded_instance to NULL in constuctor. Avoid looping over · 1963159f

unknown authored Dec 06, 2006

uninitialized list of guarded instances.


server-tools/instance-manager/guardian.cc:
  Initialize guarded_instance to NULL in constuctor. Avoid looping over
  uninitialized list of guarded instances

1963159f

05 Dec, 2006 23 commits

Merge bk-internal:/home/bk/mysql-5.1-maint · e669bcd6
unknown authored Dec 05, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
```
e669bcd6

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

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

64f5ce7e

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

unknown authored Dec 05, 2006

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


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

429cf988

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

b121562b

Merge bk-internal:/home/bk/mysql-4.1-build · 00cfa1c0

unknown authored Dec 05, 2006

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


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

00cfa1c0

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

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

439e4aff

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

713af2ae
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836 · 3149347c
unknown authored Dec 05, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint


sql/sql_class.cc:
  Auto merged
```
3149347c
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836 · 087bf566
unknown authored Dec 05, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836


sql/sql_class.cc:
  Auto merged
```
087bf566
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836 · 784f0aab
unknown authored Dec 05, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836


sql/sql_class.cc:
  manual merge
```
784f0aab
Bug#20836 Selecting into variables results in wrong results being returned · 1d216487
unknown authored Dec 05, 2006
```
- Comment Cleanup.


sql/sql_class.cc:
  Removed misleading comment.
```
1d216487
Update rsult file after merge, error message number increased · 40762f91
unknown authored Dec 05, 2006

40762f91
Use "sql_print_error" instead of "sql_print_warning" to get a better · 0cc13dea
unknown authored Dec 05, 2006
```
error message in the logs before shutting down the server
```
0cc13dea
mysql.binlog_index renamed to mysql.ndb_binlog_index · df249b03
unknown authored Dec 05, 2006

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

Merge bk-internal:/home/bk/mysql-5.1-maint · aee2b62c

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

aee2b62c

fix test cases after change to error messages file · 2429b7e8

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

2429b7e8

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · 8ad7bd64
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
```
8ad7bd64

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

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

db2a5783

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

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

5f2e2a5c

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

04 Dec, 2006 14 commits

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


mysql-test/t/disabled.def:
  disabled test flush2
```
1abd026e

Change ::fileno() to fileno() in ndb/common/util/File.cpp. · 56142bb2

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.

56142bb2

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

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

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

23a30bdb

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

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

f3bac9cf

Apply malff@weblab.(none) fix for bug 24736 directly to · 1f695dbf

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.

1f695dbf

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

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

cd38313c

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

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

2e5a6f9e

mysqltest · 9f1fa169

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"

9f1fa169

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

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

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

dea988a0

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