Commit graph

19286 commits

Author SHA1 Message Date
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
unknown
a9ba3fe0db Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/j/mysql-5.0
2005-01-25 12:13:34 +02:00
unknown
16ecc67559 InnoDB: Write status bits to MLOG_COMP_REC_INSERT entries.
It is not safe to infer the status bits from the B-tree page
level, because after MLOG_COMP_LIST_END_COPY_CREATED, the
level will not be initialized before the records have been inserted.
(Bug #7973)


innobase/btr/btr0cur.c:
  Add parameter "offsets" to page_cur_insert_rec_low()
innobase/include/page0cur.h:
  page_cur_rec_insert(), page_cur_insert_rec_low(): Add param "offsets"
innobase/include/page0cur.ic:
  page_cur_rec_insert(), page_cur_insert_rec_low(): Add param "offsets"
innobase/include/rem0rec.h:
  Add rec_get_info_and_status_bits() and rec_set_info_and_status_bits()
innobase/include/rem0rec.ic:
  Add rec_get_info_and_status_bits() and rec_set_info_and_status_bits()
innobase/page/page0cur.c:
  page_cur_insert_rec_write_log(), page_cur_parse_insert_rec():
  write the status bits of the record to the log (Bug #7973)
  page_cur_insert_rec_low(): add parameter "offsets"
  page_copy_rec_list_end_to_created_page(): remove unnecessary call
  to mem_heap_create()
innobase/page/page0page.c:
  page_copy_rec_list_end_no_locks(), page_copy_rec_list_start():
  compute offsets and pass them to page_cur_rec_insert()
2005-01-25 12:10:24 +02:00
unknown
4992049337 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-25 13:39:19 +04:00
unknown
b00551a282 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-25 10:33:07 +01:00
unknown
ffff170528 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-25 10:06:09 +01:00
unknown
c889ba5ea3 Merge gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
into gw.mysql.r18.ru:/usr/home/ram/work/5.0


mysql-test/r/lowercase_table2.result:
  Auto merged
sql/sql_table.cc:
  Auto merged
2005-01-25 13:05:15 +04:00
unknown
1e9a367f1f Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/ndb/ndbcluster.sh:
  Auto merged
2005-01-25 10:05:14 +01:00
unknown
bb762b50a3 backported ndb_mgm options from 5.0
changed ndb_restore test somewhat to fisrt make the tables in myisam


mysql-test/mysql-test-run.sh:
  backported ndb_mgm options from 5.0
mysql-test/ndb/ndbcluster.sh:
  backported ndb_mgm options from 5.0
mysql-test/r/ndb_restore.result:
  changed ndb_restore test somewhat to fisrt make the tables in myisam
mysql-test/t/ndb_restore.test:
  changed ndb_restore test somewhat to fisrt make the tables in myisam
2005-01-25 10:03:27 +01:00
unknown
b2ca597426 Merge
mysql-test/mysql-test-run.sh:
  SCCS merged
2005-01-25 09:53:39 +01:00
unknown
d31a16d9b2 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000


sql/set_var.cc:
  Auto merged
2005-01-25 09:47:01 +01:00
unknown
64fcbec855 fix for make error in Makefile.am of mysql_client_test.c 2005-01-25 09:47:00 +01:00
unknown
27d28a2987 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-25 09:06:11 +01:00
unknown
b6ad6a12a0 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261


sql/sql_table.cc:
  Auto merged
2005-01-25 11:06:12 +04:00
unknown
b7b042689c Test case (bug #7261: Alter table loses temp table with lower_case_table_names=2). 2005-01-25 10:58:30 +04:00
unknown
7b9468da2d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-25 07:23:07 +01:00
unknown
f49910d32d Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-01-25 08:00:23 +02:00
unknown
b796a7e4d0 Fix for BUG#8003 attempt 2:
Call file->external_lock() for handler objects that index_merge code creates in addition to 
  the handler object opened in open_and_lock_tables.
2005-01-25 07:37:06 +03:00
unknown
9531db9127 Merge mysql.com:/home/kostja/work/mysql-4.1-5787
into mysql.com:/home/kostja/work/mysql-5.0-root


vio/viosocket.c:
  Auto merged
2005-01-25 02:54:17 +03:00
unknown
4bb1c716e8 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-24 15:39:41 -08:00
unknown
dc43c6ea4b A fix for Bug#5787 "mysql_stmt_prepare is upto 8 times slower":
it's crucial to disable Nagle algorithm on client for no-reply commands
(like mysql_stmt_free) to always work fast.
Nagle algorithm instructs the sender to buffer (store) data if any 
unacknowledged data is outstanding and the size of to-send data is less than
the network segment. It was exactly the case with COM_STMT_CLOSE after 
COM_STMT_PREPARE, so the client was waiting for Nagle timer to expire or
 for ACK from the server, while the server was holding up ACK because of 
delayed acknowledgement algorithm.
The tricky part is that we have been already disabling Nagle 
algorithm (by setting TCP_NODELAY)
almost everywhere except Windows (and maybe Netware).
It is the reason why the bug was repeatable only with Windows client.


vio/viosocket.c:
  A fix for Bug#5787 "mysql_stmt_prepare is upto 8 times slower":
  if we disable Nagle algorithm, do it everywhere.
2005-01-25 02:31:51 +03:00
unknown
c312cf2762 Merge
BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2005-01-24 13:48:48 -08:00
unknown
844fe1ea6d Merge mysql.com:/home/jimw/my/mysql-4.1-7887
into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/mysqld.cc:
  Auto merged
2005-01-24 12:47:19 -08:00
unknown
15f37ac2b4 Set lower_case_file_system when it is being tested to check if
lower_case_tables_names=2 is sensible. Related to Bug #7887.


sql/mysqld.cc:
  Set lower_case_file_system when it is being tested to check
  if lower_case_tables_names=2 is sensible.
2005-01-24 12:31:14 -08:00