1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-22 17:44:29 +03:00
Commit Graph

15171 Commits

Author SHA1 Message Date
unknown
ab31e4278d Fix for bug#22369: Alter table rename combined
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.
2006-12-04 18:22:38 +01:00
unknown
4f912e0498 Merge bk-internal:/home/bk/mysql-5.1-maint
into  shellback.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
2006-11-29 11:18:06 +01:00
unknown
7c2c9ed741 Update result file for func_misc to 5.1 version format 2006-11-29 10:11:36 +01:00
unknown
81391758e4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/usr/home/ram/work/bug22229/my51-bug22229


mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
2006-11-29 10:59:52 +04:00
unknown
b15425adb9 Merge mysql.com:/usr/home/ram/work/bug22229/my50-bug22229
into  mysql.com:/usr/home/ram/work/bug22229/my51-bug22229


sql/item_timefunc.cc:
  Auto merged
mysql-test/r/func_time.result:
  SCCS merged
mysql-test/t/func_time.test:
  SCCS merged
2006-11-29 09:42:59 +04:00
unknown
3aca00e105 rpl_init_slave.result:
Update test result due to fix for bug 23883.


mysql-test/r/rpl_init_slave.result:
  Update test result due to fix for bug 23883.
2006-11-28 16:39:04 -07:00
unknown
b022aef7cb Merge shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
into  shakedown.(none):/home/jpipes/dev/mysql-5.1-new-maint2


BitKeeper/etc/ignore:
  auto-union
client/mysql.cc:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/mysql.result:
  Manually merged
mysql-test/t/mysql.test:
  Manually merged
sql/item_func.h:
  Manually merged
2006-11-27 14:46:48 -05:00
unknown
277d5db58f Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/deleted/.del-CMakeLists.txt~14:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~7:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
mysys/my_mmap.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/udf_example.c:
  Auto merged
support-files/mysql.spec.sh:
  Use local
client/Makefile.am:
  Manual merge
include/my_sys.h:
  Manual merge
2006-11-27 10:48:41 +01:00
unknown
07da228592 Merge bk-internal:/home/bk/mysql-5.1-new-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2006-11-27 10:39:40 +01:00
unknown
4f91e9f7ab Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint


sql/sql_parse.cc:
  Auto merged
2006-11-24 23:45:31 +03:00
unknown
cbee58e384 Merge polly.local:/tmp/maint/bug22077/my50-bug22077
into  polly.local:/tmp/maint/bug22077/my51-bug22077


mysql-test/t/read_only.test:
  Auto merged
sql/sql_parse.cc:
  Manual merge
2006-11-24 16:23:40 +03:00
unknown
9498bc4e40 Merge ymer.(none):/usr/local/mysql/tmp/mysql-5.0-gca
into  ymer.(none):/usr/local/mysql/tmp/mysql-5.1-new-maint


mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
2006-11-24 12:40:23 +01:00
unknown
66e49e3763 Merge ymer.(none):/usr/local/mysql/tmp/mysql-4.1-maint
into  ymer.(none):/usr/local/mysql/tmp/mysql-5.0-gca


mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
2006-11-24 12:39:16 +01:00
unknown
4d2665f01e Do not link /usr/lib/debug/* on Debian <=3.1, as it causes broken stack
traces in Valgrind (broken libc6-dbg).
Installing libc6-dbg on Debian will still provide proper bactraces, even
without setting LD_LIBRARY_PATH explicitly.


mysql-test/lib/mtr_io.pl:
  Do not link /usr/lib/debug/* on Debian <=3.1, as it causes broken stack
  traces in Valgrind.
mysql-test/mysql-test-run.pl:
  Do not link /usr/lib/debug/* on Debian <=3.1, as it causes broken stack
  traces in Valgrind.
2006-11-24 12:38:39 +01:00
unknown
c4bdfc7bb0 mysql_fix_priviileg_tables.sql might be in share/ but not in $path_share
since that is where  the lang files etc are
2006-11-23 21:12:50 +01:00
unknown
e727890427 Convert one more opt_source_dist 2006-11-23 20:08:48 +01:00
unknown
32f349ed75 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/etc/collapsed:
  auto-union
configure.in:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/extra/rpl_tests/rpl_deadlock.test:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/windows.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/windows.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged
BitKeeper/deleted/.del-ps_not_windows.result:
  Delete: mysql-test/r/ps_not_windows.result
BitKeeper/deleted/.del-ps_not_windows.test:
  Delete: mysql-test/t/ps_not_windows.test
mysql-test/mysql-test-run.pl:
  Manual merge
mysql-test/r/rpl_deadlock_innodb.result:
  Manual merge
2006-11-23 18:38:27 +01:00
unknown
5c9d6a68e3 Merge bk-internal:/home/bk/mysql-5.1-new-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-23 18:23:35 +01:00
unknown
bd18a1adfc Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-23 18:19:54 +01:00
unknown
7695cab8aa Make source_dist a "local" global variable
And it's not an "opt"
2006-11-23 17:30:32 +01:00
unknown
e1c17c6518 Remove duplicate "$report_features" 2006-11-23 17:26:06 +01:00
unknown
df333b1ffe Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-release
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysql_upgrade.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge
2006-11-23 11:57:18 +01:00
unknown
43cc5f74f5 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-23 11:54:25 +01:00
unknown
5f7b3a8266 after-merge fix-up. 2006-11-22 17:59:46 +04:00
unknown
f4821225c7 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  example.com:/work/bug24396/my51
2006-11-22 14:11:11 +01:00
unknown
2a434f728f fix for bug#24396
mysql-test/t/events_bugs.test:
  increase wait time..this had to be > 0.7
2006-11-22 14:06:59 +01:00
unknown
a865876b1d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/usr/home/ram/work/bug21789/my41-bug21789


mysql-test/r/date_formats.result:
  Auto merged
sql-common/my_time.c:
  Auto merged
2006-11-22 14:06:37 +04:00
unknown
2c80707e74 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/usr/home/ram/work/bug21789/my51-bug21789


mysql-test/r/date_formats.result:
  Auto merged
sql-common/my_time.c:
  Auto merged
2006-11-22 13:41:33 +04:00
unknown
d5988e52d8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/bug21789/my50-bug21789


mysql-test/r/date_formats.result:
  Auto merged
sql-common/my_time.c:
  Auto merged
2006-11-22 12:40:15 +04:00
unknown
96de5fabb2 Merge mysql.com:/usr/home/ram/work/bug21789/my50-bug21789
into  mysql.com:/usr/home/ram/work/bug21789/my51-bug21789


mysql-test/r/date_formats.result:
  Auto merged
sql-common/my_time.c:
  Auto merged
2006-11-22 12:13:09 +04:00
unknown
b275e4f019 Merge mysql.com:/usr/home/ram/work/bug21789/my41-bug21789
into  mysql.com:/usr/home/ram/work/bug21789/my50-bug21789


mysql-test/r/date_formats.result:
  Auto merged
sql-common/my_time.c:
  merging
2006-11-22 12:10:18 +04:00
unknown
aff59a7021 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
2006-11-22 10:52:44 +04:00
unknown
1460859253 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/usr/home/ram/work/bug22029/my51-bug22029
2006-11-22 10:49:24 +04:00
unknown
c65ce2e09f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/usr/home/ram/work/bug22029/my41-bug22029


mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
2006-11-22 10:30:46 +04:00
unknown
184b37a6d7 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my50-bug19799
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my51-bug19799


mysql-test/r/mysql.result:
  Auto merged
2006-11-22 01:27:44 -05:00
unknown
ca0658d471 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/bug22029/my50-bug22029


mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
2006-11-22 10:27:11 +04:00
unknown
1b3f04caa4 Bug#19799 delimiter command not working correctly when sourcing a sql file
- Use more appropriate test case.


mysql-test/r/mysql.result:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - Alt. Result.
mysql-test/t/mysql_delimiter.sql:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - Alt. Test
2006-11-22 01:27:06 -05:00
unknown
904e46968a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/usr/home/ram/work/bug22029/my51-bug22029


sql/item_timefunc.cc:
  Auto merged
2006-11-22 10:10:55 +04:00
unknown
560bc0ea84 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my50-bug19799
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my51-bug19799


mysql-test/r/mysql.result:
  Auto merged
2006-11-22 00:53:36 -05:00
unknown
bd82fb526a Bug#19799 delimiter command not working correctly when sourcing a sql file
- Post Merge Fix.


mysql-test/r/mysql.result:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - Post merge fix.
2006-11-22 00:52:32 -05:00
unknown
c77bd19bc6 Merge mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
into  mysql.com:/usr/home/ram/work/bug22029/my51-bug22029


mysql-test/t/date_formats.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/date_formats.result:
  merging
2006-11-22 09:29:22 +04:00
unknown
8473844792 Merge mysql.com:/usr/home/ram/work/bug22029/my41-bug22029
into  mysql.com:/usr/home/ram/work/bug22029/my50-bug22029


mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/item_timefunc.cc:
  merging
2006-11-22 09:19:51 +04:00
unknown
1a922cdacb Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my50-bug19799
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my51-bug19799


mysql-test/r/mysql.result:
  Auto merged
2006-11-21 21:10:54 -05:00
unknown
0c7d10bde7 Bug#19799 delimiter command not working correctly when sourcing a sql file
- Client side readline functions unconditionally search for Unix '\n' line
endings. In this case, the delimiter statement was set to '//\r' instead 
of the intended '//'. When removing the '\n' check for and remove 
preceeding '\r' character as well.


client/readline.cc:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - When removing the '\n' character, check for and remove preceeding '\r' 
  character as well.
mysql-test/r/mysql.result:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - Added Results.
mysql-test/t/mysql_delimiter.sql:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - Added Tests.
mysql-test/t/mysql_delimiter_19799.sql:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - File containing delimiter statement followed by '\r\n' line ending.
2006-11-21 21:10:02 -05:00
unknown
75d834a3e7 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
2006-11-21 21:46:00 +01:00
unknown
456959cfef When runnig from binary dist the .sql files are found in share/ directory
scripts/mysql_fix_privilege_tables.sql:
  Remove annoying single '
2006-11-21 21:39:37 +01:00
unknown
28f6157539 Update mysql_fix_privilege_tables.sql to handle upgrade from 5.0 while retaining
old upgrade behaviour.
Add test for upgrade from 5.0.30


mysql-test/t/system_mysql_db_fix40123.test:
  Drop alos the new 5.1 tables after test
scripts/mysql_fix_privilege_tables.sql:
  Update 5.1 version of mysql_fix_privilege_tables.sql to also do 
  an "ALTER TABLE MODIFY" on the new column(s) it adds. This allows us to 
  make sure that both new and already existing columsn get the right type.
mysql-test/t/system_mysql_db_fix50030-master.opt:
  New BitKeeper file ``mysql-test/t/system_mysql_db_fix50030-master.opt''
mysql-test/t/system_mysql_db_fix50030.test:
  New BitKeeper file ``mysql-test/t/system_mysql_db_fix50030.test''
2006-11-21 17:44:43 +01:00
unknown
14f8d7685e Merge bk-internal:/home/bk/mysql-5.1-new-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


client/mysql_upgrade.c:
  Auto merged
client/mysqltest.c:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
2006-11-21 16:54:44 +01:00
unknown
8f93a6c977 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


client/mysql_upgrade.c:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/system_mysql_db_fix30020.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
2006-11-21 16:51:47 +01:00
unknown
a4c1ce7f67 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-21 15:58:05 +01:00