Commit graph

17489 commits

Author SHA1 Message Date
unknown
d9b8e4b84c More work on truncations in libmysql: after-review fixes.
libmysql/libmysql.c:
  More post-review fixes for truncation patch:
  - use my_strtoll10
  - workaround for Intel FPU executive precision feature
  - one case when we didn't report possible truncation fixed.
strings/my_strtoll10.c:
  Fix a comment.
tests/client_test.c:
  One more test now passes
2004-12-18 03:42:28 +03:00
unknown
b5fcf743a6 InnoDB: fix a compilation error due to missing typedef (Bug #7383)
rem0rec.ic:
  Replace (int16_t) with (signed short).


innobase/include/rem0rec.ic:
  Replace (int16_t) with (signed short).
2004-12-18 00:19:00 +02:00
unknown
a51e2428d6 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2004-12-17 23:17:26 +02:00
unknown
996352b73e Truncations patch: a post-review fix.
include/mysql.h:
  Adding an option for data truncations feature.
libmysql/libmysql.c:
  No 'smart' behaviour now for data truncations: they are always
  reported, unless switched off with 
  mysql_options(mysql, MYSQL_REPORT_DATA_TRUNCATION, (my_bool*) &(option=1));
sql-common/client.c:
  Add support for report-data-truncation variable in my.cnf
tests/client_test.c:
  A test for MYSQL_REPORT_DATA_TRUNCATION option.
2004-12-18 00:17:25 +03:00
unknown
e2916b3227 page0page.ic:
Move inline function page_is_cmp() before its use in page0page.ic; maybe this fixes a linking error reported by Lenz


innobase/include/page0page.ic:
  Move inline function page_is_cmp() before its use in page0page.ic; maybe this fixes a linking error reported by Lenz
2004-12-17 22:46:42 +02:00
unknown
91a7644533 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2004-12-17 18:41:53 +01:00
unknown
1577b63abf Merge mysql.com:/space/my/mysql-5.0
into mysql.com:/space/my/mysql-5.0-build
2004-12-17 18:33:53 +01:00
unknown
6ce4c255df Fixing compile-time failures in recently pushed code (aCC, Sun Studio)
(Bug#7381)


libmysql/libmysql.c:
  Fixing compile-time failures in recently pushed code (aCC)
tests/client_test.c:
  Fix a couple of -pedantic warnings.
2004-12-17 20:22:13 +03:00
unknown
fcd2732de8 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2004-12-17 18:00:59 +01:00
unknown
b998933753 - typo fix 2004-12-17 18:00:05 +01:00
unknown
9d6298a7c5 - make sure to include sql/share/errmsg.txt into the source distribution
sql/share/Makefile.am:
  - make sure to include errmsg.txt into the source distribution
2004-12-17 17:46:46 +01:00
unknown
b5b1e87e75 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.bit.new
2004-12-17 18:58:44 +04:00
unknown
969cebfddc Merge akopytov@bk-internal.mysql.com:/home/bk/mysql-5.0
into polly.local:/home/kaa/src/mysql-5.0


configure.in:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2004-12-17 17:31:16 +03:00
unknown
5177adccc7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.bit.new


sql/field.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
2004-12-17 18:07:05 +04:00
unknown
d7285006cf bit type 2004-12-17 18:06:05 +04:00
unknown
31c7faaca4 The BIT patch by ramil causes that the old data type BIT is no
longer available for most storage engines.
Therefore column c18 BIT is switched TINYINT .


mysql-test/include/ps_conv.inc:
  updated comment
mysql-test/include/ps_create.inc:
  replaced the data type bit with tinyint
mysql-test/r/ps_1general.result:
  updated results
mysql-test/r/ps_2myisam.result:
  updated results
mysql-test/r/ps_3innodb.result:
  updated results
mysql-test/r/ps_4heap.result:
  updated results
mysql-test/r/ps_5merge.result:
  updated results
mysql-test/r/ps_6bdb.result:
  updated results
mysql-test/r/ps_7ndb.result:
  updated results
mysql-test/t/ps_4heap.test:
  replaced the data type bit with tinyint
mysql-test/t/ps_5merge.test:
  replaced the data type bit with tinyint
2004-12-17 14:27:39 +01:00
unknown
eb7e9346e3 - added file innobase/include/trx0xa.h which was missing from the source
distribution when running "make dist"


innobase/include/Makefile.am:
  - added file trx0xa.h which was missing from the source distribution when
    running "make dist"
2004-12-17 14:06:12 +01:00
unknown
d9f5d2f328 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2004-12-17 12:42:53 +03:00
unknown
3ccd78c446 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2004-12-17 12:34:32 +03:00
unknown
e517bb0da3 Fix of test-suite failures which popped up after addition of federated
storage engine.


mysql-test/mysql-test-run.sh:
  We should skip starting of slave server only if test is BOTH 
  not replication related and not federated storage engine related.
mysql-test/r/ps_1general.result:
  Fixed test result after federated storage engine was added.
2004-12-17 12:19:31 +03:00
unknown
ad573e4b5c Fix for pekka's IM compilation failure at ndb.mysql.com
server-tools/instance-manager/mysql_connection.cc:
  move constructor to .cc file
server-tools/instance-manager/mysql_connection.h:
  move constructor to .cc file
2004-12-17 12:08:59 +03:00
unknown
0a53b531e3 WL# 2094 Federated Storage Handler, added fixes per suggestions by Bar and Antony
mysql-test/r/federated.result:
  new test results
mysql-test/t/federated.test:
  added order by, group by
sql/ha_federated.cc:
  - added 'scheme' to URL
  - added proper escaping
  - made sure &my_charset_bin is being used throughout handler
  - made sure create_table catches improper URL in comment upon table creation
sql/ha_federated.h:
  added scheme to share
2004-12-16 19:08:32 -08:00
unknown
286bd2ad60 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into patrick-galbraiths-computer.local:/Users/patg/5.0-federated


sql/Makefile.am:
  Auto merged
sql/field.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
2004-12-16 18:40:25 -08:00
unknown
490ff28a74 Clean up from code review.
sql/examples/ha_archive.cc:
  Fixed from code review. Cleaned up comment and fixed issue with mean length of row.
2004-12-16 16:27:52 -08:00
unknown
ba1139d5f3 Merge 2004-12-16 15:44:46 -08:00
unknown
f9b1e2de19 Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0
into arthur.local:/my/mysql-5.0-clean
2004-12-16 22:17:21 +02:00
unknown
2ae67b0211 Removed incorrect messages; fixed serbian messages.
sql/share/errmsg.txt:
  Removed incorrect error messages; Fixed serbian messages.
2004-12-16 21:21:13 +02:00
unknown
8a8c2272c0 Fix for BUG#7266.
mysql-test/r/greedy_optimizer.result:
  Adjusted query costs accordingly.
sql/sql_select.cc:
  Someone added this 0.001 cost factor to best_extension_by_limited_search(), but forgot to
  add it to the old version of the optimizer - find_best().
2004-12-16 16:44:40 +02:00
unknown
f0f0e62882 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/new/mysql-5.0
2004-12-16 16:44:39 +02:00
unknown
c04ac3c526 errmsg.txt:
My attempt N3


sql/share/errmsg.txt:
  My attempt N3
2004-12-16 18:44:38 +04:00
unknown
b564fb7812 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6843
2004-12-16 18:44:37 +04:00
unknown
0e7f1ae3a0 Fix for bug#7211: information_schema: crash if bad view(after review) 2004-12-16 17:44:36 +03:00
unknown
08eb163859 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6843
2004-12-16 18:33:22 +04:00
unknown
8c5a5c32c5 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.n
2004-12-16 17:33:21 +03:00
unknown
db849cf558 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.n
2004-12-16 16:36:15 +03:00
unknown
05bbcee9e6 Fix for bug#7212: information_schema: "Can't find file" errors if storage engine gone(after review) 2004-12-16 16:31:36 +03:00
unknown
f94cb2b9df A fix (Bug #6843: Wrong function name crashes MySQL if mysql.proc table is missi
sql/sp.cc:
  A fix (Bug #6843: Wrong function name crashes MySQL if mysql.proc table is missi
  We test current_select (in case of error) in the my_message_sql().
2004-12-16 16:29:47 +04:00
unknown
22ae0abb1e Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-wl2126
2004-12-16 12:45:05 +01:00
unknown
92022992a2 Changed C++-ism into C in client_test.c.
tests/client_test.c:
  Moved variable declaration to the beginning of the block.
  (It's a C file, not C++)
2004-12-16 12:10:27 +01:00
unknown
48e1cea3eb Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-wl2126
2004-12-16 11:43:45 +01:00
unknown
9a2c0bd932 Enlarged group item key_length by a varstring length field.
Group item fields are implemented as varstrings nowadays.
Made init_connect.test robust against existing t1.


mysql-test/r/init_connect.result:
  Made init_connect.test robust against existing t1.
mysql-test/t/init_connect.test:
  Made init_connect.test robust against existing t1.
sql/sql_select.cc:
  Enlarged group item key_length by a varstring length field.
  Group item fields are implemented as varstrings nowadays.
2004-12-16 11:41:52 +01:00
unknown
eaec00b19b Portability fix in libmysql (FreeBSD)
include/my_global.h:
  Define UINT_MAX8
libmysql/libmysql.c:
  Replace defines for insteger limits with their custom MySQL versions.
2004-12-16 12:43:02 +03:00
unknown
d518f87171 Added support for a CREATE TABLE...AUTO_INCREMENT = x in InnoDB.
sql/ha_innodb.cc:
  Added support for a CREATE TABLE...AUTO_INCREMENT = x; Note that the new
  value for auto increment field is set if the new values is creater than
  the maximum value in the column.
2004-12-16 08:34:03 +02:00
unknown
7845f99abf Data truncation reporting implementation (libmysql) + post review
fixes. Still to do: 
-  deploy my_strtoll10 in limbysql.c
- add mysql_options option to switch MYSQL_DATA_TRUNCATED on and off.


include/my_time.h:
  More calls are shared between client and server (libmysql now performs
  more intelligent date->number and number->date conversions).
  TODO: rename those which are not starting with 'my_'
include/mysql.h:
  MYSQL_BIND:
  - more elaborated comment
  - some of the ex-private members were given public names - 
    it's sometimes convenient to set bind->error to &bind->error_value.
    However Monty questions the idea, so it should be given
    more thought in future.
  - added new members to support data truncation.
  Added new return value of mysql_stmt_fetch, MYSQL_DATA_TRUNCATED.
libmysql/libmysql.c:
  - added support for data truncation during fetch
  - implementation for is_binary_compatible: now conversion functions
    are used less frequently
  - we now use number_to_datetime and TIME_to_ulonglong for date->number and
    number->date conversions
sql-common/my_time.c:
  - added implementation of date->number and number->date calls shared 
    between client and server (moved from time.cc).
sql/field.cc:
  - implemented Field_time::store_time() to better support date->time
    conversions in prepared mode. After-review fixes.
sql/field.h:
  - Field::store_time now returns int
sql/mysql_priv.h:
  - removed date->number and number->date conversion functions headers
    (moved to my_time.h)
sql/time.cc:
  - removed implementation of date->number and number->date conversion
    functions (moved to my_time.c)
tests/client_test.c:
  - added a test case for data truncation; other test cases adjusted.
  - fixed my_process_stmt_result to set STMT_ATTR_UPDATE_MAX_LENGTH (tables
    are now printed out prettier).
2004-12-16 03:15:06 +03:00
unknown
79bf1ca8d9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/autofail/mysql-5.0
2004-12-15 20:30:15 +03:00
unknown
e87d4e6d18 Fix for IM compilation failure (reported be Ramil).
server-tools/instance-manager/thread_registry.h:
  Fix for the problem, encountered by Ramil
2004-12-15 20:29:17 +03:00
unknown
1815015080 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/new/mysql-5.0
2004-12-15 15:36:37 +02:00
unknown
526fbcbbc5 Forward port of HugeTLB, InnoDB doublewrite and checksums patches to 5.0
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-12-14 22:26:31 +03:00
unknown
9a3de94474 Fixed compile error in extra/comp_err.c with -debug for some compilers.
extra/comp_err.c:
  Fixed compile error with -debug for some compilers.
2004-12-14 17:02:24 +01:00
unknown
8d45c5f9d0 Fix for bug #7220: information_schema: errors in "character_sets" 2004-12-14 16:18:59 +03:00