Commit graph

17017 commits

Author SHA1 Message Date
unknown
9a9b3f285c 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-27 14:16:54 +04:00
unknown
513a70a34b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2005-01-27 13:01:57 +04:00
unknown
d2e2de1b59 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-01-26 10:42:46 -08:00
unknown
3c3ca269ec Only enable Innodb extra debugging when using the --debug=full configure option
BUILD/SETUP.sh:
  Abort if wrong options
BUILD/compile-pentium64-debug:
  Always use full debugging
innobase/fil/fil0fil.c:
  Fixed wrong printf() format
2005-01-26 16:07:53 +02:00
unknown
a898252a45 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2005-01-26 15:33:02 +02:00
unknown
edda6bb02c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1


include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-01-26 17:09:38 +04:00
unknown
21bc76b98f 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 16:54:22 +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
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
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
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
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
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
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
8fd38c7ab3 Fix for failing INSERT IGNORE in test ndb_insert 2005-01-25 15:08:51 +01: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
f332605b1f tT replaced with T1 to be more predictable. 2005-01-25 16:42:16 +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
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
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
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
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
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
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
unknown
4332ac91cd Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


tests/mysql_client_test.c:
  Auto merged
2005-01-24 19:45:15 +01:00
unknown
ccbc6f0573 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


mysql-test/mysql-test-run.sh:
  Auto merged
2005-01-24 19:15:44 +01:00
unknown
7109999b92 remove the entry from the list, before freeing 2005-01-24 18:38:46 +01:00
unknown
2eabdaa2f7 my_global.h:
Bug#7145 Added cast to doublestore() and ARM


include/my_global.h:
  Added cast to doublestore() and ARM
2005-01-24 17:10:03 +01:00
unknown
cc18b5f72a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl


mysql-test/mysql-test-run.sh:
  Auto merged
2005-01-24 16:57:57 +01:00
unknown
0af8f70108 mysql_client_test.test, mysql-test-run.sh:
Let MYSQL_CLIENT_TEST be set with command line from mysql-test-run script
mysql-test-run.sh:
  Renamed client_test to mysql_client_test
  Support --embedded-server test on installed server
mysql_client_test.test:
  Renamed client_test to mysql_client_test
  Use env var CLIENT_TEST with full name, it differs when run with --embedded-server
  Rename: mysql-test/t/client_test.test -> mysql-test/t/mysql_client_test.test


mysql-test/mysql-test-run.sh:
  Let MYSQL_CLIENT_TEST be set with command line from mysql-test-run script
mysql-test/t/mysql_client_test.test:
  Let MYSQL_CLIENT_TEST be set with command line from mysql-test-run script
2005-01-24 16:56:17 +01:00
unknown
ba3b78d968 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


mysys/mf_keycache.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged
2005-01-24 15:50:13 +01:00
unknown
8bdb500105 fixes/cleanups according to Coverity report 2005-01-24 15:48:25 +01:00