Commit graph

26769 commits

Author SHA1 Message Date
unknown
9b7e4a2aae Fix for bug #13629 "view test crashes for debug build" (also includes better
fix for bug #13451 "view test produces warning about unfreed memory").


sql/sql_view.cc:
  mysql_rename_view():
    Intead of doing full-blown opening of view and then doing extensive cleanup
    of its and main LEXes afterwards, let us just read and parse its .FRM file.
2005-09-30 17:30:33 +04:00
unknown
0a467b5fcc Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-sept30-test
2005-09-30 14:21:10 +04:00
unknown
b8ad9d1461 BUG#13081: Disable ROR-index_merge for NDB tables (by adding a
HA_KEY_SCAN_NOT_ROR index flag) as NDB index scans are not guaranteed to be ROR 
scans.
2005-09-30 14:20:15 +04:00
unknown
60ee93262b Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-09-30 12:04:10 +02:00
unknown
31f7a0e831 duplicate error message removed
mysql-test/r/innodb.result:
  after merge fix
2005-09-30 12:01:39 +02:00
unknown
1e148ca472 Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle.
client/mysqlbinlog.cc:
  tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog)
mysql-test/r/ctype_ucs_binlog.result:
  update
mysql-test/r/mysqlbinlog.result:
  update
mysql-test/r/mysqlbinlog2.result:
  update
mysql-test/r/rpl_charset.result:
  update
mysql-test/r/rpl_timezone.result:
  update
mysql-test/r/user_var-binlog.result:
  update
2005-09-30 10:58:24 +02:00
unknown
203bb8bc91 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


mysql-test/r/mysqldump.result:
  Auto merged
2005-09-30 09:40:49 +02:00
unknown
33313992bb Comment adjusted (see fix for #13545) 2005-09-30 12:37:58 +05:00
unknown
3c5ae70ef5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/mysql-5.0
2005-09-30 12:30:32 +05:00
unknown
3a806cd674 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
2005-09-30 14:45:02 +10:00
unknown
62233c2091 more post-merge fixes for SingleUser log events
ndb/include/mgmapi/ndb_logevent.h:
  more post-merge fixes
ndb/src/mgmapi/ndb_logevent.cpp:
  more post-merge fixes
2005-09-30 14:44:24 +10:00
unknown
ec5df5f269 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug13455
2005-09-30 07:07:50 +04:00
unknown
0c8d29e062 Adjust test results changed because of fix for BUG#13455 2005-09-30 07:06:04 +04:00
unknown
0f61008129 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into  xiphis.org:/usr/home/antony/work2/p2-bug10586.5
2005-09-30 00:09:51 +01:00
unknown
1b6ddb7f8b Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into  xiphis.org:/usr/home/antony/work2/p2-bug10586.5
2005-09-29 23:54:46 +01:00
unknown
0669d1e024 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug13455


mysql-test/r/innodb.result:
  Auto merged
2005-09-30 01:38:04 +04:00
unknown
8bdb41ab87 Fix for BUG#13455: Make "ref" optimizer able to make this inference:
"t.key BETWEEN c1 AND c2" and c1 = c2 -> can access table t using "t.key = c1".


mysql-test/r/heap.result:
  BUG#13455: updated test results
mysql-test/r/innodb.result:
  BUG#13455: updated test results
mysql-test/r/myisam.result:
  BUG#13455: updated test results
mysql-test/r/range.result:
  Testcase for BUG#13455
mysql-test/t/range.test:
  Testcase for BUG#13455
2005-09-30 01:34:19 +04:00
unknown
11d9e4b6c2 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0
2005-09-29 13:54:36 -07:00
unknown
2f9e42f7eb New flags for new max-no-ndb build script to get a build that has
everything except NDB


BUILD/SETUP.sh:
  Added base_max_no_ndb_configs so I can get a max-type build sans NDB for faster builds.
BUILD/compile-pentium-debug-max-no-ndb:
  new script to compile a max-type build sans NDB
BUILD/compile-ppc-debug-max-no-ndb:
  new script to build a max-type build sans NDB
2005-09-29 13:45:39 -07:00
unknown
4ed46633fc portability.h:
Corrected OpenServer ifdef test
Makefile.am:
  Added test-pl and test-force-pl targets


Makefile.am:
  Added test-pl and test-force-pl targets
server-tools/instance-manager/portability.h:
  Corrected OpenServer ifdef test
2005-09-29 19:37:03 +02:00
unknown
b262e64316 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/mysql-5.0
2005-09-29 16:41:46 +02:00
unknown
7acbea3f3f fix for bug #13545: Server crash caused by select query.
sql/sql_base.cc:
  fix for bug #13545: Server crash caused by select query.
  - compare table qualifier only with tables which are not nested joins.
  - perform recursion accordingly.
  - DBUG_ASSERT(table_list->table); added before the find_field_in_table() call.
2005-09-29 19:34:21 +05:00
unknown
34a56557e6 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0
2005-09-29 16:15:00 +02:00
unknown
71c8588ade Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/mysql-5.0
2005-09-29 15:53:28 +02:00
unknown
35598ff536 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-29 15:09:07 +02:00
unknown
3e519c45a0 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000


mysql-test/r/sql_mode.result:
  Auto merged
mysql-test/t/sql_mode.test:
  Auto merged
sql/sql_show.cc:
  Auto merged
2005-09-29 14:48:14 +02:00
unknown
baa1a83c27 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/mysql-5.0
2005-09-29 14:35:08 +02:00
unknown
66eec84f39 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0
support-files/mysql.spec.sh:
  Auto merged
2005-09-29 14:35:07 +02:00
unknown
0d7a2fb87f after merge fix 2005-09-29 17:21:32 +05:00
unknown
a3c014caf0 Merge mysql.com:/home/mydev/mysql-4.1-4100
into  mysql.com:/home/mydev/mysql-5.0-5000


mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/sql_mode.test:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/sql_mode.result:
  SCCS merged
2005-09-29 14:07:32 +02:00
unknown
7af7e61604 Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1
support-files/mysql.spec.sh:
  Auto merged
2005-09-29 13:57:41 +02:00
unknown
a44907e7a6 - fixed the removing of the RPM_BUILD_ROOT in the %clean section of the RPM
spec file (the $RBR variable did not get expanded, thus leaving old build
   roots behind)


support-files/mysql.spec.sh:
   - fixed the removing of the RPM_BUILD_ROOT in the %clean section (the
     $RBR variable did not get expanded, thus leaving old build roots behind)
2005-09-29 13:55:54 +02:00
unknown
48838170c7 Merge mysql.com:/home/mydev/mysql-4.0-4000
into  mysql.com:/home/mydev/mysql-4.1-4100


mysql-test/t/merge.test:
  Auto merged
mysql-test/r/merge.result:
  SCCS merged
2005-09-29 13:44:17 +02:00
unknown
a671075d3e Bug#9112 - Merge table with composite index producing invalid results with some queries
Second platform fix for floating point rounding.
2005-09-29 13:37:30 +02:00
unknown
fc3efeb09f 4.1 -> 5.0 merge
mysql-test/t/sql_mode.test:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/sql_mode.result:
  Manual merge
2005-09-29 16:35:50 +05:00
unknown
b65c76cb1b Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hundin.mysql.fi:/home/jan/mysql-5.0
2005-09-29 14:30:05 +03:00
unknown
f3ad732052 Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment
"CHARACTER SET", "COLLATE", and "DEFAULT" are always
  printed(excepting MODE_MYSQL323 and MODE_MYSQL40)
  "AUTO_INCREMENT", "ON UPDATE CURRENT_TIMESTAMP" are printed only 
  if NO_FIELD_OPTIONS is not set.


mysql-test/r/sql_mode.result:
  Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment
    test case
mysql-test/t/sql_mode.test:
  Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment
    test case
2005-09-29 16:17:45 +05:00
unknown
811d98adc8 Fix incorrectly merged changeset, these may not be before a first 5.0 test
i.e. range test.
2005-09-29 13:50:27 +03:00
unknown
75345411ce Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/mysql-5.0
2005-09-29 12:39:28 +02:00
unknown
bf7fe05f9c Merge 127.(none):/home/osku/mysql/5.0/clean
into  127.(none):/home/osku/mysql/5.0/revcpy
2005-09-29 13:39:27 +03:00
unknown
496f2b47ab Fix for bug #13451 (memleak in rename view) after Dmitri's review:
- call explicitly destructor for view's LEX
- cs fixes
2005-09-29 12:29:58 +02:00
unknown
3dc93a9c0f Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hundin.mysql.fi:/home/jan/mysql-5.0


mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/ha_innodb.cc:
  Content merge.
2005-09-29 13:15:09 +03:00
unknown
b2d8eb02a7 InnoDB: Fix potential buffer underflow.
innobase/include/ut0mem.h:
  Add ut_strlcpy_rev.
innobase/mem/mem0mem.c:
  Use ut_strlcpy_rev instead of buggy own implementation.
innobase/ut/ut0mem.c:
  Add ut_strlcpy_rev.
2005-09-29 13:02:18 +03:00
unknown
05bcc7ed07 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-29 11:56:59 +02:00
unknown
9cbfaa6788 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/mysql-5.0


sql/item.cc:
  Auto merged
2005-09-29 11:37:28 +02:00
unknown
612b9cebb2 Minor corrections to InnoDB function comments
innobase/include/mem0mem.h:
  Correct the comment of mem_heap_create_func().
innobase/include/mem0mem.ic:
  Correct the comment of mem_heap_create_func().
sql/ha_innodb.cc:
  Correct comments regarding return value
2005-09-29 12:37:27 +03:00
unknown
aa1c81b150 merge fixes - SingleUser logging
ndb/include/mgmapi/ndb_logevent.h:
  Merge fix - add SingleUser log events
ndb/src/common/debugger/EventLogger.cpp:
  merge fix - add text for SingleUser log events.
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  merge fix
ndb/src/mgmapi/ndb_logevent.cpp:
  add SingeUser log info
2005-09-29 19:01:53 +10:00
unknown
aaeb2b38a5 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main


ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/mgmsrv/Services.hpp:
  Auto merged
ndb/include/kernel/signaldata/EventReport.hpp:
  merge
ndb/src/common/debugger/EventLogger.cpp:
  merge
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  merge
ndb/src/mgmsrv/MgmtSrvr.cpp:
  merge
2005-09-29 17:48:49 +10:00
unknown
f4ec1ed519 the test changed to be, simpler, faster, and easier to read 2005-09-29 09:41:30 +02:00
unknown
34b85dc54d Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-29 09:37:21 +02:00