1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-10 23:02:54 +03:00
Commit Graph

11810 Commits

Author SHA1 Message Date
unknown
97cddd4a30 Only run test with row based logging 2006-04-19 11:20:11 +03:00
unknown
55668cb435 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-04-19 10:41:33 +03:00
unknown
31024b7c4a Fix compilation failure when compiling with BUILD/compile-pentium-debug-max
(Problem with embedded server and ndb)
Fix broken mysql-test-run.sh
Removed memory leak in ha_example.cc


libmysqld/Makefile.am:
  Fix compiler failure (libmysqld.a was empty)
  Reason was that 'cd' did an echo that confused 'ar'
mysql-test/mysql-test-run.pl:
  Make the port number in a nice range
mysql-test/mysql-test-run.sh:
  Remove deprication message until speed of mysql-test-run.pl is comparable to mysql-test-run.sh
  Fix code that jimw broke in his last change
storage/example/ha_example.cc:
  Removed memory leak
  (example_done_func was not called)
2006-04-19 10:39:57 +03:00
unknown
c83dce6e34 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1
2006-04-19 11:42:41 +05:00
unknown
2b49181d2f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1


include/my_sys.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysys/my_access.c:
  SCCS merged
2006-04-19 09:50:17 +05:00
unknown
c6590081c3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16319
2006-04-19 09:22:04 +05:00
unknown
b97e48a95b Fixed bug #19079.
The bug caused a reported index corruption in the cases when
key_cache_block_size was not a multiple of myisam_block_size,
e.g. when key_cache_block_size=1536 while myisam_block_size=1024.


mysql-test/r/key_cache.result:
  Added a test case for bug #19079.
mysql-test/t/key_cache.test:
  Added a test case for bug #19079.
2006-04-18 20:57:31 -07:00
unknown
f909f9965b Cleanup test cases that leaves "stuff" behind
mysql-test/r/ctype_latin2_ch.result:
  Drot table at end of test
mysql-test/r/grant2.result:
  Drop users
mysql-test/r/openssl_1.result:
  Drop users
mysql-test/r/rpl_openssl.result:
  Drop users
mysql-test/r/sp-security.result:
  Drop users
mysql-test/r/sp_notembedded.result:
  Drop table
mysql-test/r/trigger.result:
  Drop table
mysql-test/t/ctype_latin2_ch.test:
  Drop table
mysql-test/t/grant2.test:
  Drop users
mysql-test/t/openssl_1.test:
  Drop users
mysql-test/t/rpl_openssl.test:
  Drop users
mysql-test/t/sp-security.test:
  Drop users
mysql-test/t/sp_notembedded.test:
  Drop table
mysql-test/t/trigger.test:
  Drop table
2006-04-18 18:10:47 +02:00
unknown
f539e5880b Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug18564/my50-bug18564


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2006-04-18 17:07:35 +02:00
unknown
176cd14352 Fixed BUG#18344: DROP DATABASE does not drop associated routines
We must use the db key length in sp_drop_db_routines (and not the
  number of characters), or long db names will be truncated in the key.


mysql-test/r/sp.result:
  Updated results for new test case (BUG#18344)
mysql-test/t/sp.test:
  Added new test case for BUG#18344.
sql/sp.cc:
  In sp_drop_db_routines(), give the key field's ("db") key length
  instead of the number of characters to index_read(), or the key
  packing will truncate long db names.
2006-04-18 16:01:01 +02:00
unknown
eb9c676fa2 Merge mysql.com:/home/matthias/Arbeit/mysql-4.1/src
into  mysql.com:/home/matthias/Arbeit/mysql-4.1/src-1
2006-04-18 14:18:51 +02:00
unknown
78342cd64b Merge mysql.com:/home/matthias/Arbeit/mysql-5.0/src
into  mysql.com:/home/matthias/Arbeit/mysql-5.0/src-1
2006-04-18 13:43:52 +02:00
unknown
ce79bd5220 Updated result file 2006-04-18 12:16:27 +02:00
unknown
750bc26998 Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
into  mysql.com:/extern/mysql/5.0/bug18787/mysql-5.0-runtime


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_func.cc:
  Auto merged
2006-04-18 11:20:18 +02:00
unknown
661165ee10 Fixed BUG#18949: Test case sp-goto is disabled
Removed sp-goto.test, sp-goto.result and all (disabled) GOTO code.
  Also removed some related code that's not needed any more (no possible
  unresolved label references any more, so no need to check for them).
  NB: Keeping the ER_SP_GOTO_IN_HNDLR in errmsg.txt; it might become useful
      in the future, and removing it (and thus re-enumerating error codes)
      might upset things. (Anything referring to explicit error codes.)


BitKeeper/deleted/.del-sp-goto.result~f343103c63f64b7a:
  Delete: mysql-test/r/sp-goto.result
BitKeeper/deleted/.del-sp-goto.test~5054d3f729692d3d:
  Delete: mysql-test/t/sp-goto.test
mysql-test/t/disabled.def:
  sp-goto.test no longer exists.
sql/lex.h:
  Removed (disabled) GOTO definitions.
sql/sp_head.cc:
  Removed sp_head::check_backpatch() and simplified sp_head::backpatch().
  Without GOTO, unresolved label references are not possible, so no need
  to check for them.
sql/sp_head.h:
  Removed sp_head::check_backpatch(). (Not needed with no GOTO)
sql/sp_pcontext.cc:
  SP_LAB_GOTO was renamed to SP_LAB_IMPL
sql/sp_pcontext.h:
  Removed SP_LAB_REF (no longer needed) and renamed SP_LAB_GOTO
  to SP_LAB_IMPL, since it's only used for implicit labels now.
sql/sql_yacc.yy:
  Removed GOTO symbols and (disabled) code, and the no longer needed
  sp_head::check_backpatch() calls.
2006-04-18 11:07:34 +02:00
unknown
5c1b70beb8 Merge 192.168.0.20:mysql/bug13310/my50-bug13310
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


sql/sql_parse.cc:
  Auto merged
2006-04-18 10:55:57 +02:00
unknown
3bcbf91376 BUG#13310 incorrect user parsing by SP
- Strip surrounding ''s from username when a new user connects. There
   is no user 'a@', it should be a@


mysql-test/r/grant2.result:
  Update test result
mysql-test/t/grant2.test:
  Add tests for bug 13310
sql/sql_parse.cc:
  Strip surrounding ''s from username when a new user connects. There 
  is no user 'a@', it should be a@
2006-04-18 10:46:17 +02:00
unknown
afe484cba6 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
2006-04-18 09:00:02 +02:00
unknown
6465b661e9 BUG#19158 Fixing rpl_row_log_innodb test for pushbuild.
mysql-test/extra/rpl_tests/rpl_log.test:
  Sleep to avoid race condition on pushbuild test machine
2006-04-18 00:30:55 -04:00
unknown
7b6c5a6b76 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1


mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2006-04-17 16:40:16 -07:00
unknown
73c03f8ae9 Fixing a merge from a few days ago.
Without a flush this test is nondeterministic for "row" binlog-format.


mysql-test/r/innodb.result:
  Without a flush this test is nondeterministic for "row" binlog-format.
mysql-test/t/innodb.test:
  Without a flush this test is nondeterministic for "row" binlog-format.
2006-04-17 18:57:01 -04:00
unknown
2c1703db4f Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-04-18 00:56:59 +02:00
unknown
a26c4b15e1 BUG#18752
Fixed forgotten merge fix


mysql-test/r/partition.result:
  Fixed forgotten merge fix
2006-04-17 18:56:58 -04:00
unknown
bf8f30b532 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready
2006-04-17 16:00:49 -04:00
unknown
feb80054f0 ndb - bug#16796
storage/ndb/src/ndbapi/NdbBlob.cpp:
  set part id from main table op (may not be complete fix)
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
  log partition id set/get
2006-04-17 20:24:41 +02:00
unknown
fab001da89 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready
2006-04-17 10:14:38 -04:00
unknown
7b14ac64bc BUG#17152: Wrong result with BINARY comparison on aliased column
Testsuite added
2006-04-17 16:46:56 +03:00
unknown
9844f0abdb Merge mysql.com:/usr/home/bar/mysql-4.1.b18691
into  mysql.com:/usr/home/bar/mysql-5.0


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/item_timefunc.cc:
  After merge fix
2006-04-17 15:01:55 +05:00
unknown
1a3cb50c24 Bug#18170: XML: ExtractValue(): XPath expression can't use QNames (colon in names)
Problem source:
Qualified names (aka QName) didn't work as tag names and attribute names,
because the parser lacked a real rule to scan QName, so it understood
only non-qualified names without prefixes.

Solution:
New rule was added to check both "ident" and "ident:ident" sequences.


mysql-test/r/xml.result:
  Adding test case
mysql-test/t/xml.test:
  Adding test case
sql/item_xmlfunc.cc:
  Adding real QName parser rule and using it in NodeTest rule.
2006-04-17 11:49:20 +05:00
unknown
1540407e60 Fixed a few pieces around support for data directory.
mysql-test/r/archive.result:
  Adding test case for data directory support in create table.
mysql-test/t/archive.test:
  Added test for "data directory" support in archive.
sql/ha_archive.cc:
  Updated comments, added printable bits for support of "data directory"
sql/ha_archive.h:
  Added real_path to share (will come in handy in later code)
2006-04-16 21:55:02 -07:00
unknown
1e2bde0d44 Only expand the empty string to the letters "NULL" if the column
does not have "NOT NULL" attribute set.  Also, calculate the padding
characters more safely, so that a negative number doesn't cause it to 
print MAXINT-n spaces.


mysql-test/r/mysql.result:
  Add test result.
mysql-test/t/mysql.test:
  Add test.
2006-04-16 17:17:36 -04:00
unknown
9a40c5bf33 WL 2826: Error handling of ALTER TABLE for partitioning
After review changes


mysql-test/r/ndb_partition_key.result:
  Fixed result file
sql/ha_ndbcluster.cc:
  Fixed interface to create_handler_files
sql/ha_ndbcluster.h:
  Fixed interface to create_handler_files
sql/ha_partition.cc:
  Fixed interface to create_handler_files and made it two-stage for rename
  Removed print_error and now it's used by MySQL Server parts instead
sql/ha_partition.h:
  Fixed interface to create_handler_files
sql/mysql_priv.h:
  Fixed error injects
  Externalised Global DDL log mutex
  Some interface changes
sql/mysqld.cc:
  Moved close of DDL log until all user threads been closed
sql/sql_base.cc:
  Interface changes
sql/sql_partition.cc:
  Moved print_error to mysql server part
sql/sql_table.cc:
  Lots of after review changes
sql/table.cc:
  Fixed upgrade code
2006-04-15 21:49:13 -04:00
unknown
288fdada03 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
2006-04-15 09:47:33 -04:00
unknown
2ffd95c4c9 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
2006-04-14 17:50:32 -04:00
unknown
0988e2c80f Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752


mysql-test/t/partition.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/partition.result:
  manual merge
sql/share/errmsg.txt:
  manual merge
2006-04-14 17:48:27 -04:00
unknown
6588858552 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new


client/mysql.cc:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
2006-04-14 13:33:02 -04:00
unknown
3e21b9d0da Hand-merged test. 2006-04-14 11:39:36 -04:00
unknown
c0b172f0b1 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new

(With hand-merged tests.)


sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2006-04-14 11:38:09 -04:00
unknown
d7055274ed Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/14169-bug-4.1-mysql
2006-04-14 17:25:58 +04:00
unknown
ac0ec77832 Bug#19097: rpl_view failed on some platforms
removing comments from the opt file.


mysql-test/t/rpl_view-slave.opt:
  removing `#' comments
2006-04-14 12:13:26 +03:00
unknown
7280f8befb Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16319
2006-04-14 13:57:46 +05:00
unknown
9faa297074 Merge mysql.com:/usr/home/bar/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16319


mysql-test/r/xml.result:
  Auto merged
mysql-test/t/xml.test:
  Auto merged
sql/item_xmlfunc.cc:
  Auto merged
2006-04-14 13:34:18 +05:00
unknown
3ef014862b Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-13 18:59:13 -07:00
unknown
8dc06e0f06 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0


sql/item_func.cc:
  Auto merged
2006-04-14 02:02:28 +03:00
unknown
7069599748 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge


sql/sql_yacc.yy:
  Auto merged
2006-04-14 02:38:41 +04:00
unknown
41c0a5a744 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-04-14 00:17:50 +03:00
unknown
1b2312211f update 2006-04-13 23:26:02 +03:00
unknown
34ec514bda Merge mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-13 13:22:44 -07:00
unknown
8dbb580748 The check for recursive view definitions added. (BUG#14308)
mysql-test/r/view.result:
  BUG#14308 test suite.
mysql-test/t/view.test:
  BUG#14308 test suite.
sql/share/errmsg.txt:
  New error message about a recursive view.
sql/sql_view.cc:
  The check of view recursion.
2006-04-13 23:12:26 +03:00
unknown
30bd49831b Merge mysql.com:/opt/local/work/mysql-5.0-root
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge


sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/mysqld.cc:
  SCCS merged
2006-04-14 00:07:04 +04:00