Commit graph

19948 commits

Author SHA1 Message Date
unknown
a2cfc2045e Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0
2005-02-17 21:45:14 +02:00
unknown
c36f737d54 Fixed Bug#7783, "mysql_free_result removes all resultsets (multi statements)". 2005-02-17 21:45:13 +02:00
unknown
5a295d7a07 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0
2005-02-17 20:58:49 +02:00
unknown
29f460f226 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-02-17 20:21:29 +02:00
unknown
307c2140fd Fixed Bug#7873. 2005-02-17 20:20:48 +02:00
unknown
342a9f7f6f innodb.test, innodb.result:
Remove the test show status like InnoDB_rows_read; the value on IA64 was 0.01 percent bigger than on x86; maybe some different optimization


mysql-test/r/innodb.result:
  Remove the test show status like InnoDB_rows_read; the value on IA64 was 0.01 percent bigger than on x86; maybe some different optimization
mysql-test/t/innodb.test:
  Remove the test show status like InnoDB_rows_read; the value on IA64 was 0.01 percent bigger than on x86; maybe some different optimization
2005-02-17 19:20:13 +02:00
unknown
d0dbd41a3b After review fixes (Bug #5682)
innobase/include/data0type.ic:
  dtype_get_fixed_size(), dtype_get_min_size(): Do not check
  prtype, mbminlen and mbmaxlen for types other than DATA_MYSQL,
  as that is the only type that can hold fixed-length strings of
  variable-length objects (UTF-8 encoded characters).
innobase/row/row0sel.c:
  row_sel_field_store_in_mysql_format(): Document which fields of
  templ will be used.  Add 0x20 padding only to DATA_MYSQL fields.
  Change related debug assertions to real assertions for now, until
  5.0 becomes generally available.  Check with assertion that all
  data types handled in the catch-all branch are appropriate.
2005-02-17 18:40:45 +02:00
unknown
6075463f03 InnoDB: Make CREATE TABLE return error when the minimum row length
exceeds the maximum record size.  (Bug #5682)


innobase/data/data0type.c:
  Remove function dtype_str_needs_mysql_cmp().
  Document dtype_get_at_most_n_mbchars().
  dtype_get_at_most_n_mbchars(): Use mbminlen and mbmaxlen.
innobase/dict/dict0crea.c:
  dict_build_table_def_step(): Reject if minimum row size is too big.
innobase/include/data0type.h:
  Remove dtype_str_needs_mysql_cmp().
  Document dtype_get_at_most_n_mbchars().
  Add dtype_get_min_size().
innobase/include/data0type.ic:
  Add dtype_get_min_size().
innobase/include/row0mysql.h:
  row_mysql_store_col_in_innobase_format(): Add parameter comp,
  as we will only truncate UTF-8 CHAR(n) columns in row_format=compact.
innobase/include/row0mysql.ic:
  row_mysql_store_col_in_innobase_format(): Add parameter comp,
  as we will only truncate UTF-8 CHAR(n) columns in row_format=compact.
innobase/row/row0mysql.c:
  Pass parameter comp to row_mysql_store_col_in_innobase_format().
innobase/row/row0sel.c:
  Pass parameter comp to row_mysql_store_col_in_innobase_format().
  row_sel_field_store_in_mysql_format(): Undo the stripping of
  UTF-8 CHAR(n) columns by padding with spaces.
2005-02-17 17:15:29 +02:00
unknown
e0875776de Fixed a result file. Some redundant notes printing had been removed from source
code, because a warning was given also.
2005-02-17 15:12:49 +02:00
unknown
679bd87b8e Fixed Bug#8042, "mysqld crashes on sighup".
sql/mysql_priv.h:
  Fixed Bug#8042, "mysqld crashes on sighup".
  Removed use of thd. The information added to thd was unneccessary.
sql/sql_test.cc:
  Fixed Bug#8042, "mysqld crashes on sighup".
  Removed thd->proc_infos.
2005-02-17 14:07:28 +02:00
unknown
c2cd419b64 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/pekka/ndb/version/my50
2005-02-17 12:13:17 +01:00
unknown
1b164c7666 ndb - accept ps_7ndb.result
mysql-test/r/ps_7ndb.result:
  accept result
2005-02-17 12:13:16 +01:00
unknown
ca021698d1 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0
support-files/mysql.spec.sh:
  Auto merged
2005-02-17 11:09:35 +01:00
unknown
6889864bbb - fixed a changelog entry in the RPM spec file (wrong author)
support-files/mysql.spec.sh:
  - fixed a changelog entry (wrong author)
2005-02-17 11:07:33 +01:00
unknown
003e7ad18c Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0
mysql-test/mysql-test-run.pl:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
2005-02-17 10:56:20 +01:00
unknown
1c5881ca3d Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-02-17 10:51:56 +01:00
unknown
908857a0b9 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into rurik.mysql.com:/home/igor/mysql-5.0
2005-02-17 01:51:56 -08:00
unknown
a20f238287 Do-hpux-depot:
Perl script to create HP depot packages.
2005-02-17 02:57:40 -06:00
unknown
531ec55aa0 select.test:
Manual post-merge


mysql-test/t/select.test:
  Manual post-merge
2005-02-17 00:51:27 -08:00
unknown
f66111aea0 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2005-02-17 00:38:33 -08:00
unknown
869b65571d Manual merge
mysql-test/r/select.result:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-17 00:34:06 -08:00
unknown
41c0945096 item.h:
Revised the fix for bug #7098.
  Corrected the method Item_string::new_item.
sql_select.cc:
  Revised the fix for bug #7098.
  Aborted the previous modifications.


sql/sql_select.cc:
  Revised the fix for bug #7098.
  Aborted the previous modifications.
sql/item.h:
  Revised the fix for bug #7098.
  Corrected the method Item_string::new_item.
2005-02-16 22:51:32 -08:00
unknown
a4f11cfd38 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.pl:
  Auto merged
2005-02-17 07:36:54 +01:00
unknown
a58a1dace8 Merge
mysql-test/mysql-test-run.pl:
  Auto merged
ndb/include/mgmcommon/ConfigRetriever.hpp:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/include/mgmapi/mgmapi.h:
  merge
2005-02-17 07:05:00 +01:00
unknown
d2a69d8f7d Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-16 21:20:39 -08:00
unknown
7f905da3d8 select.result, select.test:
Added a test case for bug #7098.
sql_select.cc:
  Fixed bug #7098.
  When a string field was substituted for an equal constant
  the collation of the constant was changed by mistake for 
  the binary collation.


sql/sql_select.cc:
  Fixed bug #7098.
  When a string field was substituted for an equal constant
  the collation of the constant was changed by mistake for 
  the binary collation.
mysql-test/t/select.test:
  Added a test case for bug #7098.
mysql-test/r/select.result:
  Added a test case for bug #7098.
2005-02-16 21:17:20 -08:00
unknown
efe1ca2053 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-17 05:25:46 +01:00
unknown
000255ee9d init_db.sql:
Make SQL more readable, substitute hostname at runtime
mysql-test-run.pl:
  Run init scripts with /bin/sh, ignore return code


mysql-test/mysql-test-run.pl:
  Run init scripts with /bin/sh, ignore return code
mysql-test/lib/init_db.sql:
  Make SQL more readable, substitute hostname at runtime
2005-02-17 05:22:14 +01:00
unknown
bb46b2bf99 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-17 03:35:55 +01:00
unknown
d475cece23 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-17 03:34:30 +01:00
unknown
1e4063f5ff Merge 2005-02-16 20:08:56 -06:00
unknown
a2d3bc8d75 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile


mysql-test/t/ps_1general.test:
  Auto merged
2005-02-17 03:04:28 +01:00
unknown
3f80899679 Windows compatibility changes of the 'rpl_delete_all',
'ps_1general' and 'fulltext_cache' test cases.


mysql-test/r/fulltext_cache.result:
  To pass on Windows, round to less digits
mysql-test/t/fulltext_cache.test:
  To pass on Windows, round to less digits
mysql-test/t/ps_1general.test:
  To pass on Windows, change \\ to / in result
mysql-test/t/rpl_delete_all.test:
  To pass on Windows, change \\ to / in result
mysql-test/mysql-test-run.pl:
  Pass mysqld --console to catch output on Windows
mysql-test/lib/mtr_process.pl:
  Check error from exec() to avoid becoming a fork() bomb
2005-02-17 02:59:39 +01:00
unknown
89f031b3e9 Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dellis/bkl/bug-4.1
2005-02-16 19:37:53 -06:00
unknown
1fbeaf710a Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-02-17 04:19:47 +03:00
unknown
08c2f9e791 Fix a typo caused bdb to be skipped when building with BUILD/compile-*-max
Recommited, as I made a typo in the previous patch myself =)


BUILD/SETUP.sh:
  Fix a typo caused bdb to be skipped when building with BUILD/compile-*-max
2005-02-17 04:18:49 +03:00
unknown
bc22f79f12 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-17 02:11:03 +01:00
unknown
6bb46afb5d Merge mysql.com:/home/dellis/bkl/bug-4.1
into mysql.com:/home/dellis/bkl/bug-5.0


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/fulltext.result:
  Auto merged
2005-02-16 17:35:00 -06:00
unknown
8cf5a1cccb Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-xa


configure.in:
  Auto merged
2005-02-17 00:06:09 +01:00
unknown
0e8ad9067d Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-xa
2005-02-16 23:27:20 +01:00
unknown
2071fe55c4 Fixes after 4.1->5.0 merge.
mysql-test/r/rpl_multi_query.result:
  result update
mysql-test/t/rpl_multi_query.test:
  binlog position changes from 4.1 to 5.0
sql/sql_base.cc:
  Manually putting back the old code (like I did in 4.1 already, as the 2nd fix for BUG#8055 does not need to change sql_base.cc anymore)
2005-02-16 23:23:20 +01:00
unknown
d6541adb37 Merge serg@bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-16 22:59:17 +01:00
unknown
600e432143 bug #8556 corrupt ndb_mgm show printout for certain configurations 2005-02-16 21:54:35 +01:00
unknown
fced35f74a ndb - fix new decimal type mysql vs. ndb
mysql-test/r/ndb_index_ordered.result:
  fix new decimal mysql vs. ndb
mysql-test/t/ndb_index_ordered.test:
  fix new decimal mysql vs. ndb
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  fix new decimal mysql vs. ndb
ndb/include/ndb_constants.h:
  fix new decimal mysql vs. ndb
ndb/include/ndbapi/NdbDictionary.hpp:
  fix new decimal mysql vs. ndb
ndb/include/util/NdbSqlUtil.hpp:
  fix new decimal mysql vs. ndb
ndb/src/common/util/NdbSqlUtil.cpp:
  fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbDictionary.cpp:
  fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbRecAttr.cpp:
  fix new decimal mysql vs. ndb
ndb/test/include/NdbSchemaOp.hpp:
  fix new decimal mysql vs. ndb
ndb/test/src/HugoCalculator.cpp:
  fix new decimal mysql vs. ndb
ndb/tools/restore/consumer.cpp:
  fix new decimal mysql vs. ndb
sql/ha_ndbcluster.cc:
  fix new decimal mysql vs. ndb
2005-02-16 21:19:42 +01:00
unknown
eb061b352b Merge
mysql-test/r/drop_temp_table.result:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
configure.in:
  SCCS merged
sql/sql_base.cc:
  SCCS merged
sql/sql_parse.cc:
  SCCS merged
2005-02-16 21:03:58 +01:00
unknown
e5934af166 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-16 20:54:47 +01:00
unknown
2eb2383ed0 reuse nodeid if ndbd is restarted
mysql-test/mysql-test-run.pl:
  start and exit fix for ndbcluster
2005-02-16 20:46:34 +01:00
unknown
88f264f0ce Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.2
2005-02-16 16:54:09 +00:00
unknown
36f6d8afee Merge pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.1
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.2


include/config-win.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
2005-02-16 16:47:29 +00:00
unknown
96f9c9d9d3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.1


sql/ha_innodb.cc:
  Auto merged
2005-02-16 16:33:57 +00:00