Commits · 51f30b2de988959dc6439ba749954beb48952010 · nexedi / MariaDB

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

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

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

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.

baeb335e

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

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

c625dfe7

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


sql/item_func.cc:
  Auto merged
```
d4bedc87

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

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

3250fa98

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


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

type_varchar.result: · 677a86ca

unknown authored Dec 04, 2006

  fixed a valgrind problem


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

677a86ca

item_func.cc: · 050d9de6

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

050d9de6

03 Dec, 2006 1 commit

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

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

3742e4e4

02 Dec, 2006 8 commits

Makefile.am: · c172e138

unknown authored Dec 03, 2006

  Disabled abi_check, as it was before merge


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

c172e138

Merge mysql.com:/home/kent/bk/mysql-5.0-build · 2c4b27b0

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

2c4b27b0

mysql_install_db.sh: · ca3e99d8

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)

ca3e99d8

Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 5837334f
unknown authored Dec 02, 2006
```
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-maint-24736
```
5837334f
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · cab3a2ea
unknown authored Dec 02, 2006
```
into  example.com:/work/bug24395-v2/my51
```
cab3a2ea
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build · d3208410
unknown authored Dec 02, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.1-build
```
d3208410
Merge mysql.com:/home/kent/bk/mysql-5.0-build · 8b49ec3a
unknown authored Dec 02, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.1-build
```
8b49ec3a

Makefile.am: · bc6e2e9f

unknown authored Dec 02, 2006

  Added "mysql_client_test.def"
mysql_client_test.def:
  BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_client_test.def


netware/mysql_client_test.def:
  BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_client_test.def
netware/Makefile.am:
  Added "mysql_client_test.def"

bc6e2e9f