Commit graph

19259 commits

Author SHA1 Message Date
unknown
e8ae338356 Merge
mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster.cc:
  merge bug#8101 and setBound usage if id instead of name
2005-01-26 13:22:07 +01:00
unknown
662823c209 after review fixup (bug #8129: help.test fails using --ps-protocol) 2005-01-26 16:02:19 +04:00
unknown
9e9a96b880 Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-01-26 12:15:41 +01:00
unknown
54a1e372e1 a fix (bug #8129: help.test fails using --ps-protocol)
sql/sql_help.cc:
  a fix (bug #8129: help.test fails using --ps-protocol)
  In case of 'range' we have to call quick->reset().
2005-01-26 15:11:55 +04:00
unknown
9ffd94d929 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2005-01-26 12:56:13 +02:00
unknown
d9274b337c Added -DDBUG_ON to CXXFLAGS when compiling with debugging
This fixes a memory allocation bug in Innobase as structs was defined differently in .c and .cc files
2005-01-26 12:55:35 +02:00
unknown
ccd08ea843 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-26 11:32:22 +01:00
unknown
d041ed2d8c Bug#8101 unique indexes which attribute are _not_ specified in the order of the table does not work 2005-01-26 11:31:46 +01:00
unknown
d42fbb43fd WL#1420 convert NIST test for mysql
Test cases using common object (database,user,table,..) names could probably
  destroy customer data, when connecting to an already running server.
  
  This Changeset contains an auxiliary routine  include/testdb_only.inc" which
  should be sourced by tests doing such dangerous things. 
  The test case will get a "[skipped]" when the environment variable 
  USE_RUNNING_SERVER is not 0 .
  The modified mysql-test-run.sh sets USE_RUNNING_SERVER to 0, when 
  the "mysql-test-run" starts its own server, aka there was no "--extern"
  option.


mysql-test/mysql-test-run.sh:
  If mysql-test-run spawns the server by itself, USE_RUNNING_SERVER will be set to 0 instead of "".
      If the option "--extern" was detected, USE_RUNNING_SERVER will be set to 1 instead of "1".
      Several comparisons have to be changed
           [ -z "$USE_RUNNING_SERVER" ] --> [ $USE_RUNNING_SERVER -eq 0 ]
           [ -n "$USE_RUNNING_SERVER" ] --> [ $USE_RUNNING_SERVER -eq 1 ]
      USE_RUNNING_SERVER will be exported.
2005-01-26 10:19:28 +01:00
unknown
fdae13db98 merged 2005-01-26 09:54:12 +01:00
unknown
9d1701898b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-26 09:42:52 +01:00
unknown
61aa9e745b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
2005-01-26 12:37:25 +04:00
unknown
168f04bdde Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg7637


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-01-26 11:23:14 +03:00
unknown
548295d818 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-26 09:10:34 +01:00
unknown
f712a3d8d9 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100


sql/sql_select.cc:
  Auto merged
2005-01-26 09:09:53 +01:00
unknown
cb271ffec8 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


innobase/include/univ.i:
  Auto merged
sql/item_create.cc:
  Auto merged
2005-01-26 09:05:58 +01:00
unknown
ea2795025e innobase/include/univ.i
remove a change that broke the test


innobase/include/univ.i:
  remove a change that broke the test
sql/item_create.cc:
  better fix
2005-01-26 08:57:43 +01:00
unknown
56bf2ce986 change to Makefile.am per Serg's request
libmysqld/examples/Makefile.am:
  Change to Makefile.pm per serg's request, was to go out with federated push, but this fix is needed asap for Lenz. This has passed 'make test'
2005-01-25 23:52:47 -08:00
unknown
235edc2144 order_by.result, order_by.test:
Added test case for bug #7672 that existed only in 4.0.


mysql-test/t/order_by.test:
  Added test case for bug #7672 that existed only in 4.0.
mysql-test/r/order_by.result:
  Added test case for bug #7672 that existed only in 4.0.
2005-01-25 23:13:36 -08:00
unknown
52332cce92 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
2005-01-25 19:03:30 -08:00
unknown
6975ce41d7 rem0rec.h:
Corrected formatting of comments.
rem0rec.ic:
  rec_set_info_and_status_bits(): pass arguments to rec_set_info_bits()
  in the correct order.
  Corrected formatting of comments.


innobase/include/rem0rec.ic:
  rec_set_info_and_status_bits(): pass arguments to rec_set_info_bits()
  in the correct order.
  Corrected formatting of comments.
innobase/include/rem0rec.h:
  Corrected formatting of comments.
2005-01-25 22:40:20 +02:00
unknown
5afe81ae61 merged
BitKeeper/etc/ignore:
  auto-union
BUILD/SETUP.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-01-25 21:11:04 +01:00
unknown
c7a317d440 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-25 20:55:29 +01:00
unknown
ffc492cdd1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2005-01-25 21:29:09 +02:00
unknown
c2a2f5afb8 Cleanups during review
BitKeeper/etc/ignore:
  added libmysqld/examples/mysqltest_embedded
client/mysqlbinlog.cc:
  Call mysql_close() before die()
innobase/include/eval0eval.ic:
  Remove assert that fails on 64 bit machines
  (Tested with BUILD/compile-pentium64-valgrind-max on 64 bit Intel CPU)
sql/mysqld.cc:
  Force lower_case_table_names to 0 if set to 2 on case insensitive file name
sql/sql_select.cc:
  Remove #if 0
2005-01-25 21:27:51 +02:00
unknown
616d5a6fbb Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2005-01-25 21:10:36 +02:00
unknown
d9ac7c80fc Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
2005-01-25 11:10:07 -08:00
unknown
91827782dd Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000


sql/sql_select.cc:
  Auto merged
2005-01-25 19:37:15 +01:00
unknown
026dacc1ac Some minor fixes.
mysql-test/mysql-test-run.sh:
  Less restricted permissions.
mysql-test/r/rpl_rotate_logs.result:
  If the path where mysql-test-run was run was symlinked, this test could
  fail. This is a fix.
mysql-test/t/rpl_rotate_logs.test:
  If the path where mysql-test-run was run was symlinked, this test could
  fail. This is a fix.
2005-01-25 20:08:16 +02:00
unknown
2622ed76f3 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0


sql/set_var.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
2005-01-25 09:35:57 -08:00
unknown
082ea84824 Merge 2005-01-25 18:35:11 +02:00
unknown
a2fdebaa8d Some bug fixes and a feature add to mysql-test-run
client/mysql.cc:
  Fixed Bug#981  ".mysql_history is lost if mysql clinent exit when out of space"
client/mysqlbinlog.cc:
  Fix for mysqlbinlog, mysql_close() needs to be called.
libmysql/Makefile.shared:
  Added use of my_rename()
mysql-test/mysql-test-run.sh:
  Added possibility to add file t/testname.disabled. This will disable a
  test with same base name. Additionally, if the .disabled file contains text,
  it will be appended as a comment after the test during run.
2005-01-25 18:32:09 +02:00
unknown
3ec5446c0a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-01-25 17:03:28 +01:00
unknown
fc9a6528fe Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-25 16:37:18 +01:00
unknown
f796818f94 merge
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
2005-01-25 16:11:47 +01:00
unknown
47c46e254a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-25 15:57:08 +01:00
unknown
e749259da6 ndb - Move mysql-test-run & testBackup into "basic suite"
ndb/test/run-test/atrt-mysql-test-run:
  Fix result handling
ndb/test/run-test/daily-basic-tests.txt:
  Move mysql-test-run & testBackup into "basic"
ndb/test/run-test/daily-devel-tests.txt:
  Move mysql-test-run & testBackup into "basic"
2005-01-25 15:56:20 +01:00
unknown
fec9018eff Fix two typos in comments.
sql/sql_parse.cc:
  Fix a comment.
sql/sql_select.cc:
  Fix a comment.
2005-01-25 17:25:46 +03:00
unknown
8fd38c7ab3 Fix for failing INSERT IGNORE in test ndb_insert 2005-01-25 15:08:51 +01:00
unknown
f0a6c7e287 Merge 4.1 -> 5.0 2005-01-25 15:24:04 +02:00
unknown
892adb947e One more after merge fix of Jan Lindström's changeset in 4.1
innobase/row/row0ins.c:
  One more after merge fix
2005-01-25 14:49:30 +02:00
unknown
449cb3b3f0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-25 13:48:12 +01:00
unknown
984e7d29b2 changed from using column names to column id in ndb setBound in ha_ndbcluster 2005-01-25 13:46:40 +01:00
unknown
2ecd83a37b After merge fixes
innobase/include/univ.i:
  Auto merged
innobase/row/row0ins.c:
  After merge fixes of Jan Lindström's patch to 4.1
2005-01-25 14:44:34 +02:00
unknown
f332605b1f tT replaced with T1 to be more predictable. 2005-01-25 16:42:16 +04:00
unknown
65a0093dc9 Makefile.am:
after merge fix


tests/Makefile.am:
  after merge fix
2005-01-25 16:29:24 +04:00
unknown
b9ae83d5b8 Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.1


innobase/include/univ.i:
  Auto merged
2005-01-25 14:17:51 +02:00
unknown
b7c59b9e22 InnoDB: Enable ut_ad() assertions in MySQL debug builds.
innobase/include/univ.i:
  InnoDB: Define UNIV_DEBUG when DBUG_ON (in MySQL) is defined.
  This enables InnoDB debug assertions in debug builds of mysqld.
2005-01-25 14:16:41 +02:00
unknown
9735fb42e2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1


BUILD/SETUP.sh:
  Auto merged
2005-01-25 14:02:09 +02:00
unknown
2ade7521b5 Add flags for Intel 64 bit 2005-01-25 14:00:35 +02:00