Commit graph

27625 commits

Author SHA1 Message Date
unknown
a7956c817e Post-merge fixes 2005-11-03 12:38:46 +03:00
unknown
f8aa1db39c Bug#13957 yassl: opensrv6c compile failure
- Added some ifdefs and turn off auto template instantiation, use explicit template instantiation


configure.in:
  Use -Tno_implict to indicate that we specifiy which template should be instantiated.
  Turn on HAVE_EXPLICIT_TEMPLATE_INSTATNTIATION
extra/yassl/src/socket_wrapper.cpp:
  Include sys/filio.h if __SCO_VERSION__ is defined
extra/yassl/src/timer.cpp:
  Dont' include files from within namespace yaSSL.
2005-11-03 10:37:49 +01:00
unknown
096f181d3a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-03 10:34:15 +01:00
unknown
9a71442067 Added new build script for pentium64. 2005-11-03 11:19:06 +02:00
unknown
1fb1802e71 Changed mysql-test-run to correspond to the one in 5.0 tree. 2005-11-03 11:05:52 +02:00
unknown
b162827e65 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-11-03 11:01:30 +02:00
unknown
1f37efa0ad Merge bk@192.168.21.1:mysql-4.1
into mysql.com:/home/hf/work/mysql-4.1.14183
2005-11-03 12:50:28 +04:00
unknown
aa647c9b5d Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug14026-r2
2005-11-03 11:20:01 +03:00
unknown
4f1a55911d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-03 08:42:02 +01:00
unknown
883b38a2cd Merged 2005-11-03 10:28:12 +03:00
unknown
4d65081cc5 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.13573


sql/item_func.cc:
  Auto merged
2005-11-03 11:05:34 +04:00
unknown
2b1652046d Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0


mysql-test/r/view.result:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
2005-11-02 22:24:36 -08:00
unknown
3e2e44f044 Post review fixes.
sql/sql_table.cc:
  Post review fixes
2005-11-02 22:13:10 -08:00
unknown
4934c9be9d Don't allow startup when default storage engine is specified to be a
storage engine that is disabled. This was fixed once in 4.1, but regressed
in 5.0 because of changes to storage engine initialization. (Bug #9815)


sql/mysqld.cc:
  Move check of whether default storage engine is available to after
  storage engine initialization.
2005-11-02 17:56:12 -08:00
unknown
e2220f4766 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/14466-bug-5.0-mysql


sql/table.cc:
  Auto merged
2005-11-03 01:51:47 +03:00
unknown
6b2379afeb func_gconcat.result:
Fixed wrong test case
table.cc:
  Fixed wrong DBUG_ENTER placement


sql/table.cc:
  Fixed wrong DBUG_ENTER placement
mysql-test/r/func_gconcat.result:
  Fixed wrong test case
2005-11-03 01:50:36 +03:00
unknown
ae68221d75 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-11-02 14:01:08 -08:00
unknown
8a80936517 #view.test#:
new file
sql_table.cc, handler.h:
  Fixed bug #14540.
  Added error mnemonic code HA_ADMIN_NOT_BASE_TABLE
  to report that an operation cannot be applied for views.
view.test, view.result:
  Added a test case for bug #14540.
errmsg.txt:
  Fixed bug #14540.
  Added error ER_CHECK_NOT_BASE_TABLE.


mysql-test/r/view.result:
  Added a test case for bug #14540.
mysql-test/t/view.test:
  Added a test case for bug #14540.
sql/handler.h:
  Fixed bug #14540.
  Added error mnemonic code HA_ADMIN_NOT_BASE_TABLE
  to report that an operation cannot be applied for views.
sql/share/errmsg.txt:
  Added error ER_CHECK_NOT_BASE_TABLE.
sql/sql_table.cc:
  Fixed bug #14540.
  Added error mnemonic code HA_ADMIN_NOT_BASE_TABLE
  to report that an operation cannot be applied for views.
2005-11-02 13:44:58 -08:00
unknown
4245608b35 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-02 22:06:00 +01:00
unknown
6364edc663 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-02 20:20:56 +01:00
unknown
b8633901d0 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/14466-bug-5.0-mysql
2005-11-02 21:47:35 +03:00
unknown
b45cdbbd86 Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-02 19:44:10 +02:00
unknown
8d13a5f4bc Fix -ansi -pedantic compilation failure 2005-11-02 20:44:09 +03:00
unknown
a8ad5d1601 Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/my/mysql-5.0


sql/item_func.cc:
  Auto merged
sql/table.cc:
  Auto merged
2005-11-02 19:28:50 +02:00
unknown
44a8096dd4 wait_for_update must unlock mutex.
(Fixed failure in rpl0000008.test)
2005-11-02 19:28:49 +02:00
unknown
62a2162c1c Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0


sql/item_func.cc:
  Auto merged
sql/table.cc:
  Auto merged
2005-11-02 19:09:29 +02:00
unknown
11244083b9 BUG#14514
- Add tests


mysql-test/r/ndb_basic.result:
  Add test result
mysql-test/t/ndb_basic.test:
  Add test case
2005-11-02 17:34:40 +01:00
unknown
e9af959eef make the IM compile on Windows
server-tools/instance-manager/instance_options.cc:
  fix for coding guidelines
server-tools/instance-manager/parse_output.cc:
  fix for coding guidelines
server-tools/instance-manager/priv.cc:
  don't call pthread_attr_setstacksize on Windows
server-tools/instance-manager/priv.h:
  include my_pthread so the thread functions will compile on Windows
2005-11-02 09:30:01 -06:00
unknown
57ca4facb9 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/14466-bug-5.0-mysql
2005-11-02 18:00:13 +03:00
unknown
17149bbd14 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.13573


sql/item_func.cc:
  Auto merged
2005-11-02 18:58:25 +04:00
unknown
316e95049d BUG#14514 Creating table with packed key fails silently
include/my_base.h:
  Move HA_CREATE_FROM_ENGINE to HA_OPTION_CREATE_FROM_ENGINE
sql/ha_ndbcluster.cc:
  Use HA_OPTION_CREATE_FROM_ENGINE
sql/handler.cc:
  Use HA_OPTION_CREATE_FROM_ENGINE
2005-11-02 15:53:04 +01:00
unknown
b6a711bf88 Additional fix for #13573
strings/decimal.c:
  here we can run over the buffer - need to check on overflow
2005-11-02 18:46:13 +04:00
unknown
7d49eca96b Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/my/mysql-5.0


sql/item_func.cc:
  Auto merged
sql/table.cc:
  Auto merged
2005-11-02 16:29:00 +02:00
unknown
4e2b6133b6 Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-02 16:28:59 +02:00
unknown
37f5c1a82c Portability fix
(BDB test failed in Intel64)


mysql-test/r/bdb.result:
  Portability fix
mysql-test/t/bdb.test:
  Portability fix
2005-11-02 16:28:58 +02:00
unknown
ec69ca57c8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysys/base64.c:
  Auto merged
2005-11-02 15:04:16 +01:00
unknown
3edfc012b9 Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-02 15:45:26 +02:00
unknown
d76d9dcded Use --with-openssl instead of --with-yassl for now
BUILD/SETUP.sh:
  Use --with-openssl instead of --with-yassl for now
  (We need to fix that libmysqlclient_r links with a -PIC compiled yassl library before enabling yassl)
2005-11-02 15:45:25 +02:00
unknown
98d050fdf6 Portability fix, opnsrv6c
mysys/base64.c:
  Use unsigned char for d
2005-11-02 14:32:50 +01:00
unknown
3c76331f4c found problem removed
sql/sql_parse.cc:
  allow query_tables_own_last work correctly
sql/table.cc:
  fixed returning value for libmysqld
2005-11-02 15:17:57 +02:00
unknown
8c38a382a4 Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-02 14:57:19 +02:00
unknown
a9b6631888 Build max builds with --yassl instead of openssl
BUILD/SETUP.sh:
  Build with --yassl instead of openssl
2005-11-02 14:57:18 +02:00
unknown
5ce36e8134 more refinement of IM patch to fix Windows pathnames with spaces
server-tools/instance-manager/instance_options.cc:
  move declaration of end to start of function so gcc is happy
server-tools/instance-manager/parse_output.cc:
  remove space before =
  use my_isspace to determine if *end is white space
  remove comments related to get_word which was removed
  replace tab character with appropriate # of spaces
2005-11-02 06:51:44 -06:00
unknown
94298b10ab Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-02 14:43:26 +02:00
unknown
a73b682af9 Fixed wrong merge
Optimize new pushed code


sql/item_func.cc:
  Fixed wrong merge
sql/sql_update.cc:
  Optimize new pushed code
  (There is no reason to add extra test for not common error case if code can handle it anyway)
2005-11-02 14:43:25 +02:00
unknown
256d286174 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-11-02 14:35:07 +02:00
unknown
b601d8f079 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner-5.0


sql/item_func.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/table.cc:
  merge
2005-11-02 12:56:19 +02:00
unknown
768b1e5087 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.13573


sql/item_func.cc:
  Auto merged
2005-11-02 13:01:21 +04:00
unknown
17fcbcf772 BUG#14026: When doing the end-of-prepare fix up for TABLE_LISTs used in the PS, do the fixup
for underlying tables of a merge VIEWs, too.


mysql-test/r/view.result:
  Testcase for BUG#14026
mysql-test/t/view.test:
  Testcase for BUG#14026
2005-11-02 07:05:19 +03:00
unknown
02ac7bef87 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-11-01 17:07:13 -08:00