Commits · 3149347c1dd4bf559e87fe3dbe02fae9ea412a38 · Kirill Smelkov / mariadb

05 Dec, 2006 8 commits
- 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 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
04 Dec, 2006 27 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
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

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

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

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

c0612e45

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

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

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

af20ca6b

Merge bk-internal:/home/bk/mysql-5.1 · 23b2d1d2

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

23b2d1d2

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


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


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

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

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

c275fce7

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


storage/myisam/myisampack.c:
  Auto merged
```
9624927d

Fix for bug#22369: Alter table rename combined · ab31e427

unknown authored Dec 04, 2006

with other alterations causes lost tables

Using RENAME clause combined with other clauses of ALTER TABLE led to
data loss (the data was there but not accessible). This could happen if the
changes do not change the table much. Adding and droppping of fields and
indices was safe. Renaming a column with MODIFY or CHANGE was unsafe operation,
if the actual column didn't change (changing from int to int, which is a noop)
  
Depending on the storage engine (SE) the behavior is different:
1)MyISAM/MEMORY - the ALTER TABLE statement completes
  without any error but next SELECT against the new table fails.
2)InnoDB (and every other transactional table) - The ALTER TABLE statement
  fails. There are the the following files in the db dir -
  `new_table_name.frm` and a temporary table's frm. If the SE is file
  based, then the data and index files will be present but with the old
  names. What happens is that for InnoDB the table is not renamed in the
  internal DDIC.

Fixed by adding additional call to mysql_rename_table() method, which should
not include FRM file rename, because it has been already done during file
names juggling.


mysql-test/r/alter_table.result:
  update result
mysql-test/r/grant.result:
  update result
mysql-test/t/alter_table.test:
  2006/11/29 11:46:23+01:00 andrey@example.com +44 -9
  Error to bug number
      
  Added test case for #22369: Alter table rename combined
  with other alterations causes lost tables
mysql-test/t/grant.test:
  add test for bug#22369 - alter table was missing check
  for DROP_ACL when ALTER_RENAME clause is specified. Synchronise
  with RENAME TABLE DDL.
sql/mysql_priv.h:
  Add a new flag for mysql_rename_table()
sql/sql_parse.cc:
  To be consistent with SQLCOM_RENAME_TABLE, SQLCOM_ALTER_TABLE has
  to check for DROP_ACL if there is ALTER_RENAME flag set.
sql/sql_table.cc:
  ALTER_RENAME, the data and index files weren't renamed in the engine
  but only the FRM was new, when the tables old and new tables are compatible.
  In the chain of FRM renames we add a call to mysql_rename_table() which should
  instruct the engine to rename the table but not rename the FRM.
  This bug was there only in 5.1 branch. 4.1 and 5.0 always do copy data on RENAME
  if there are more clauses than just rename.

ab31e427

Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0 · bfee156a

unknown authored Dec 04, 2006

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.1


mysql-test/r/type_varchar.result:
  Auto merged
mysql-test/t/type_varchar.test:
  Auto merged
sql/item_func.cc:
  Auto merged

bfee156a

Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt · 85b1701a
unknown authored Dec 04, 2006
```
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0


sql/item_func.cc:
  Auto merged
```
85b1701a

Bug#24389 mysqltest: Could not open connection 'default': 2013 Lost connection to MySQL · d2f1fd79

unknown authored Dec 04, 2006

 - Add CR_CONN_HOST_ERROR to list of errorcode that trigger another connection
   attempt in mysqltest


client/mysqltest.c:
  Add CR_CONN_HOST_ERROR to errorcodes that trigger a reconnect

d2f1fd79

Merge naruto.:C:/cpp/bug17733/my51-bug17733 · a57037e3
unknown authored Dec 04, 2006
```
into  naruto.:C:/cpp/mysql-5.1-maint


sql/sql_parse.cc:
  Auto merged
```
a57037e3

type_varchar.result: · 818bec7f

unknown authored Dec 04, 2006

  fixed a valgrind problem


mysql-test/r/type_varchar.result:
  fixed a valgrind problem

818bec7f

item_func.cc: · 63b2be3c

unknown authored Dec 04, 2006

   fixed a valgrind warning
type_varchar.test:
  fixed a valgrind warning


mysql-test/t/type_varchar.test:
  fixed a valgrind warning
sql/item_func.cc:
   fixed a valgrind warning

63b2be3c

03 Dec, 2006 1 commit

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · da7016ee

unknown authored Dec 03, 2006

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/table.cc:
  Auto merged

da7016ee

02 Dec, 2006 4 commits

Makefile.am: · ddb679ed

unknown authored Dec 03, 2006

  Disabled abi_check, as it was before merge


include/Makefile.am:
  Disabled abi_check, as it was before merge

ddb679ed

Merge mysql.com:/home/kent/bk/mysql-5.0-build · 531f2eed

unknown authored Dec 02, 2006

into  mysql.com:/home/kent/bk/mysql-5.1-build


Makefile.am:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged

531f2eed

mysql_install_db.sh: · 1172c8ae

unknown authored Dec 02, 2006

  If --srcdir and --windows is given, check if error message file
  is in source or build tree (bug#24557)
Makefile.am:
  Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)
mysql_install_db.sh:
  Added --srcdir=DIR option, used from top Makefile.am in dist-hook
  target, to find "fill_help_tables.sql" in VPATH build (bug#24557)
Makefile.am:
  Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
  the source and build tree.
  Call "mysql_install_db" with new option --srcdir, to enable the script
  to find all that is needed, if source and build directory is not the same
  (bug#24557)


scripts/mysql_install_db.sh:
  If --srcdir and --windows is given, check if error message file
  is in source or build tree (bug#24557)
Makefile.am:
  Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
  the source and build tree.
  Call "mysql_install_db" with new option --srcdir, to enable the script
  to find all that is needed, if source and build directory is not the same
  (bug#24557)
include/Makefile.am:
  Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)

1172c8ae

Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 7043524c
unknown authored Dec 02, 2006
```
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-maint-24736
```
7043524c