Commit graph

21577 commits

Author SHA1 Message Date
unknown
750180d299 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-03-30 23:42:53 +03:00
unknown
a593a0a739 Enabled more tests of STR_TO_DATE()
Fixed that datetime gives warning for zero dates in traditional mode


mysql-test/r/strict.result:
  Enabled more tests of STR_TO_DATE()
mysql-test/t/strict.test:
  Enabled more tests of STR_TO_DATE()
sql/field.cc:
  Fixed that datetime gives warning for zero dates in traditional mode
sql/log_event.h:
  Fix wrong ifdef from last push
2005-03-30 23:41:42 +03:00
unknown
3a44dcd1a3 after merge fix/ 2005-03-30 18:57:56 +05:00
unknown
eed8071891 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


sql/log_event.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
2005-03-30 16:01:30 +03:00
unknown
a5b1b9d924 Give warnings if wrong date/time/datetime argument for STR_TO_DATE
Small fixes while doing review of new pushed code
More test cases for decimal


mysql-test/r/date_formats.result:
  Warnings added for STR_TO_DATE()
mysql-test/r/ps_1general.result:
  Better description for BLACKHOLE
mysql-test/r/strict.result:
  Added tests for STR_TO_DATE
mysql-test/r/type_decimal.result:
  Test to test ranges of DECIMAL
mysql-test/t/date_formats.test:
  More tests
mysql-test/t/strict.test:
  Added tests for STR_TO_DATE
mysql-test/t/type_decimal.test:
  Test to test ranges of DECIMAL
sql/field.cc:
  Simple optimization
sql/handler.cc:
  Better description for BLACKHOLE
sql/item_timefunc.cc:
  Give warnings if wrong date/time/datetime argument for STR_TO_DATE
sql/log_event.cc:
  Indentation fixes
sql/log_event.h:
  #ifdef-ed not used code
sql/share/errmsg.txt:
  New error message
sql/sql_show.cc:
  Ensure that we do a proper restore in case of error
2005-03-30 16:00:31 +03:00
unknown
6b24a50dc1 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/mysql-5.0


include/violite.h:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-03-30 17:51:40 +05:00
unknown
8d8cb24efb Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
2005-03-30 14:14:52 +02:00
unknown
72aef9c207 Merge
include/violite.h:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Manual merge
2005-03-30 17:07:40 +05:00
unknown
e7121bf9a7 merged
BitKeeper/etc/logging_ok:
  auto-union
include/violite.h:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-03-30 12:03:02 +02:00
unknown
633a2468ec Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/mysql-4.1
2005-03-30 14:51:23 +05:00
unknown
216ed8c7e2 A fix (bug #9401: type_timestamp segfaults mysqld)
sql/sql_select.cc:
  A fix (bug #9401: type_timestamp segfaults mysqld).
  1. create_tmp_field_from_field() is modified to take 'Item_ref *item' and 'char *name'
  instead of 'bool modify_item' and 'Item *item'.
  2. For Item_sum_min/max we should never modify item, so NULL is 
  passed as item to the create_tmp_field_from_field().
2005-03-30 14:43:56 +05:00
unknown
8af53376cf Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2005-03-30 14:11:17 +05:00
unknown
103dddfbd2 Remove .opt file for faster test running.
BitKeeper/deleted/.del-ctype_cp1251-master.opt~68be9a59ec8ee106:
  Delete: mysql-test/t/ctype_cp1251-master.opt
2005-03-30 14:10:27 +05:00
unknown
039519721c Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-30 10:59:27 +02:00
unknown
fc7b19d480 merged 2005-03-30 10:52:28 +02:00
unknown
fe811dd892 don't strcmp db if it's a pattern 2005-03-30 10:43:24 +02:00
unknown
32ff7adeb0 Merge
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Merge from 4.0 and 4.1
2005-03-30 02:59:17 +02:00
unknown
dad034597e Merge
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Merge from 4.0
2005-03-30 02:49:21 +02:00
unknown
73e5f698a9 Do-compile:
Added option --with-big-tables


Build-tools/Do-compile:
  Added option --with-big-tables
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-30 02:41:08 +02:00
unknown
69a9e2b789 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile


Build-tools/Do-compile:
  Auto merged
2005-03-30 02:34:21 +02:00
unknown
4c24806006 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-03-30 02:31:23 +02:00
unknown
655d97ee12 Do-compile:
Added option --with-blackhole


Build-tools/Do-compile:
  Added option --with-blackhole
2005-03-30 02:28:41 +02:00
unknown
802e635183 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-30 00:27:35 +02:00
unknown
149b43f3c5 after merge fix 2005-03-30 00:24:58 +02:00
unknown
3e2f7ed4f5 Fedora now defines read(2)/write(2) as macros.
Argh!
2005-03-29 23:31:56 +02:00
unknown
ce3253cfd1 typo fixed 2005-03-29 23:03:36 +02:00
unknown
c7201c1381 Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/merge-5.0 2005-03-29 21:17:51 +02:00
unknown
e73766f809 Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/push-5.0 2005-03-29 21:13:56 +02:00
unknown
343abb750d Implement the new '--with-big-tables' flag to "configure".
Using it comes merged from 4.1.


config/ac-macros/misc.m4:
  Implement the new '--with-big-tables' flag to "configure".
2005-03-29 21:11:52 +02:00
unknown
36668b3cd2 Propagate the new '--with-big-tables' flag from 4.1 to 5.0.
Incomplete, as the macro body must ne in the new file 'config/ac-macros/misc.m4'
which will follow in a separate changeset.


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Merge the 4.0 and 4.1 change of the new '--with-big-tables' flag.
configure.in:
  Call the new macro to evaluate the '--with-big-tables' flag.
mysql-test/mysql-test-run.sh:
  No change in 5.0, as 4.1 was a backport (Martin).
mysql-test/r/ps_7ndb.result:
  Merge from 4.1 (Martin).
2005-03-29 21:06:22 +02:00
unknown
2c4a99d084 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


mysql-test/r/ps_7ndb.result:
  Auto merged
2005-03-29 20:16:35 +02:00
unknown
328781c959 Merge
configure.in:
  Auto merged
acinclude.m4:
  SCCS merged
2005-03-29 19:25:55 +02:00
unknown
646f072d2c init_db.sql:
Updates to be in sync with 'mysql_create_system_tables'


mysql-test/lib/init_db.sql:
  Updates to be in sync with 'mysql_create_system_tables'
2005-03-29 19:04:19 +02:00
unknown
1a960df7ab Post-review fix: Drop the duplicate assignment. 2005-03-29 18:55:47 +02:00
unknown
1d3e1bdbbe Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-03-29 18:53:44 +02:00
unknown
01ba6b1d09 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-03-29 18:48:31 +02:00
unknown
344e0a2d78 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-03-29 17:56:34 +02:00
unknown
054c0650e9 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod
2005-03-29 17:47:48 +02:00
unknown
0f3183cc38 making Q_CATALOG_CODE be understood by 5.0.4 slave, so that 5.0.3->5.0.4 repl can work (but 5.0.4->5.0.3 won't). 2005-03-29 17:26:38 +02:00
unknown
34cebb7176 Introduce "configure" support for a new '-with-big-tables' option that can replace
the current way of passing '-DBIG_TABLES' to the compilers.

This is needed even in 4.0, as 'Do-compile-all' must use this new approach for
all "max" builds in 4.0, 4.1, and up.


acinclude.m4:
  Provide a new macro 'MYSQL_CHECK_BIG_TABLES' to check a '-with-big-tables' option 
  and set the CPP symbol 'BIG_TABLES' accordingly.
configure.in:
  Call the new 'MYSQL_CHECK_BIG_TABLES' macro.
2005-03-29 16:34:33 +02:00
unknown
a7b6b20c1e New test result 2005-03-29 15:36:02 +02:00
unknown
9dc90a162d Backport of ChangeSet 1.1700.256.8: Export the variable MASTER_MY_PORT1 from the place where the second master is started 2005-03-29 15:15:28 +02:00
unknown
37695aaf35 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-29 14:58:03 +02:00
unknown
fd5c0aff66 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-29 14:56:11 +02:00
unknown
939901661c type_bit.result:
after merge fix
  ,


mysql-test/r/type_bit.result:
  after merge fix
  ,
2005-03-29 17:41:17 +05:00
unknown
e633aebd91 after merge fix 2005-03-29 17:37:10 +05:00
unknown
26ff24f0f7 merge
mysys/charset-def.c:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
  Auto merged
sql/mysqld.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
mysql-test/r/type_blob.result:
  after merge fix
2005-03-29 17:24:26 +05:00
unknown
bbd7265aa0 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-03-29 16:16:12 +04:00
unknown
c0477b0298 more merge fixes 2005-03-29 16:15:22 +04:00
unknown
f38d7d6d8d update results 2005-03-29 13:57:15 +02:00