1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Commit Graph

23365 Commits

Author SHA1 Message Date
2d55dd5bbb Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b10539


sql/field.cc:
  Auto merged
2005-06-06 11:30:15 +05:00
d1e9ff363d Merge
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/func_time.result:
  SCCS merged
mysql-test/t/func_time.test:
  SCCS merged
2005-06-06 10:39:21 +05:00
5888d0396e Fix broken linking when building with ha_federated 2005-06-05 23:00:45 +04:00
9a3bb0c74d sp_rcontext.cc, sp_pcontext.cc, sp_head.cc, sp_cache.cc, ha_federated.cc:
Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION


sql/ha_federated.cc:
  Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION
sql/sp_cache.cc:
  Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION
sql/sp_head.cc:
  Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION
sql/sp_pcontext.cc:
  Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION
sql/sp_rcontext.cc:
  Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION
2005-06-05 16:20:22 +02:00
dab1b26b1d Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-04 11:15:36 +02:00
8b5ac76d6b Add missing STMT_ATTR_PREFETCH_ROWS to mysql_stmt_attr_get 2005-06-04 12:37:10 +04:00
0d68fcf91b Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-04 10:23:44 +02:00
c72c3e4ca4 Merge mysql.com:/home/jimw/my/mysql-5.0-10590
into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/item_timefunc.cc:
  Auto merged
2005-06-03 16:06:51 -07:00
8376d81499 client/mysql.cc
make print_field_types() somewhat more useful


client/mysql.cc:
  make print_field_types() somewhat more useful
2005-06-03 21:59:33 +02:00
48078eea1e Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-06-03 20:08:38 +02:00
32c9799596 Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-06-03 19:15:16 +02:00
a9ccff554a Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-03 15:00:53 +02:00
2906e27a7c yassl template instantiation - don't do too much
mysys/my_access.c: remove incorrect fix
comments


extra/yassl/taocrypt/src/integer.cpp:
  yassl template instantiation - don't do too much
extra/yassl/taocrypt/src/template_instnt.cpp:
  yassl template instantiation - don't do too much
mysys/my_access.c:
  remove incorrect fix
sql/item_func.cc:
  a couple of comment. assert added.
2005-06-03 13:43:17 +02:00
29f3b76f58 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-06-03 12:58:23 +02:00
6de5ae6816 Post review fix of BUG#10969.
sql/item.h:
  Return name as LEX_STRING instead of its components.
sql/sql_yacc.yy:
  Name returned as LEX_STRING instead of its components.
2005-06-03 12:56:51 +02:00
fcb3be9f63 check-cpu fixes/improvements (Bug #11065)
- support additional platforms (OpenBSD, Darwin)
    - make use of /proc/cpuinfo CPU flag information
      (needed to distinguish EMT64 Xeons from normal ones)
    - chose the right CPU related options depending on 
      GCC version and target architecture
    - check if the chosen CPU type is actually supported
      by the GCC version , fallback to CPUs predecessor
      until test compile succeeds
2005-06-03 11:21:43 +02:00
33992678e2 Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1
into mysql.com:/home/hartmut/projects/mysql/dev/5.0


BUILD/Makefile.am:
  Auto merged
2005-06-03 10:35:14 +02:00
9979feb35c bundle the check-cpu helper script with source packages.
BUG#10696
2005-06-03 10:30:58 +02:00
8d0d79eda3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0
2005-06-03 11:20:43 +05:00
0305a3a112 Merge
mysql-test/r/ctype_utf8.result:
  Auto merged
sql/field.cc:
  merging from 4.1
2005-06-03 09:44:13 +05:00
0f7a57cb5a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-06-03 06:40:40 +02:00
52b70ceff7 ctype_utf8.result, ctype_utf8.test:
adding test
field.cc:
  bug#10714 Inserting double value into utf8 column crashes server:
  sprintf was executed with too big length, which caused
  crash on some Windows platforms.


sql/field.cc:
  bug#10714 Inserting double value into utf8 column crashes server
  sprintf was executed with too long length, which cau
  crashe on Windows.
mysql-test/t/ctype_utf8.test:
  adding test
mysql-test/r/ctype_utf8.result:
  adding test
2005-06-03 09:37:53 +05:00
9960fc709b Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0
2005-06-03 09:29:20 +05:00
b3ca69b114 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-02 23:00:58 +02:00
4d81713cb8 assemble libmysqld.a 5-10 times faster! 2005-06-02 22:59:37 +02:00
805b16addf Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-root
2005-06-03 00:23:29 +04:00
ae2e80d62d Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
2005-06-03 01:10:26 +05:00
8e18a995e8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-root
2005-06-03 00:03:28 +04:00
892032a2c2 Give Item_arena::is_stmt_prepare a more descriptive name (it marks
the code that is active for SP as well in 5.0)


sql/item.cc:
  Rename of an Item_arena method.
sql/item_subselect.cc:
  Rename of an Item_arena method.
sql/sql_class.h:
  Rename of an Item_arena method.
sql/sql_parse.cc:
  Rename of an Item_arena method.
sql/sql_union.cc:
  Rename of an Item_arena method.
2005-06-03 00:02:47 +04:00
b442d912f9 Merge dl145b.mysql.com:/home/ndbdev/tomas/mysql-4.1
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.0


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
2005-06-02 21:31:25 +02:00
bdbace6666 WL#2286 - Compile MySQL w/YASSL support
Compilation errors fixes.


config/ac-macros/yassl.m4:
  Switch to -l/-L instead of passing file name directly. (more portable for ".a" archives)
extra/yassl/taocrypt/src/integer.cpp:
  Instantiate more templates (needed by some 64bit boxes).
extra/yassl/taocrypt/src/template_instnt.cpp:
  Instantiate more templates (needed by some 64bit boxes).
  Move tcArrayDelete to TaoCrypt namespace (more portable).
2005-06-03 00:28:18 +05:00
336d32b19c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into dl145b.mysql.com:/home/ndbdev/tomas/tmp
2005-06-02 21:25:37 +02:00
28a467c6fa CommandInterpreter.cpp:
Bug #11050  	ndb_mgm "show" prints incorrectly after master data node fails


ndb/src/mgmclient/CommandInterpreter.cpp:
  Bug #11050  	ndb_mgm "show" prints incorrectly after master data node fails
2005-06-02 21:14:14 +02:00
7c62023bc7 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/sql_select.cc:
  Auto merged
2005-06-02 20:55:32 +02:00
fec4347fb3 Merge monster.:D:/Work/mysql-4.1 into monster.:D:/Work/mysql5.0
BitKeeper/etc/logging_ok:
  auto-union
2005-06-02 12:36:55 -05:00
33b114aac2 item_func.h:
Identation correction for the fix of bug #9939.


sql/item_func.h:
  Identation correction for the fix of bug #9939.
2005-06-02 10:00:32 -07:00
b4ed58bf07 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into igor-inspiron.creware.com:/home/igor/mysql-5.0
2005-06-02 09:52:51 -07:00
dd3225b22b fixed compile problem by replacing W_OK with F_OK
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-06-02 11:12:58 -05:00
79dd776724 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into igor-inspiron.creware.com:/home/igor/mysql-5.0


sql/item_func.cc:
  Auto merged
2005-06-02 08:46:10 -07:00
e9799ba6fa ha_innodb.cc:
Weaken InnoDB table locking at the start of a stored procedure call: this will make multi-transaction stored procedures less deterministic for binlogging, but since they are non-deterministic anyway, it is not that bad; this fix will remove the huge amount of InnoDB tranasctional deadlocks caused by table locking at the start of a stored procedure


sql/ha_innodb.cc:
  Weaken InnoDB table locking at the start of a stored procedure call: this will make multi-transaction stored procedures less deterministic for binlogging, but since they are non-deterministic anyway, it is not that bad; this fix will remove the huge amount of InnoDB tranasctional deadlocks caused by table locking at the start of a stored procedure
2005-06-02 18:10:32 +03:00
4360dd164a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-06-02 17:06:51 +02:00
78a9e47e46 Added update_used_tables to add_found_match_trig_cond, to make valgrind happy 2005-06-02 16:56:08 +02:00
6e460e75d7 Merge igor-inspiron.creware.com:/home/igor/mysql-5.0
into igor-inspiron.creware.com:/home/igor/dev/mysql-5.0-0


sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
2005-06-02 07:33:31 -07:00
21989e7d4e item_func.h:
Fixed bug #9939: a wrong conversion of arguments
  for functions COALESCE and IFNULL.
  The str_op virtual method was added into Item_func_numhybrid.
item_func.cc:
  Fixed bug #9939: a wrong conversion of arguments
  for functions COALESCE and IFNULL.
  The str_op virtual method was added into Item_func_numhybrid.
item_cmpfunc.h, item_cmpfunc.cc:
  Fixed bug #9939: a wrong conversion of arguments
  for functions COALESCE and IFNULL.
  Item_func_coalesce and Item_func_ifnull now
  inherit from a modified Item_func_numhybrid.
case.test, case.result:
  Added test cases for bug #9939.


mysql-test/r/case.result:
  Added test cases for bug #9939.
mysql-test/t/case.test:
  Added test cases for bug #9939.
sql/item_cmpfunc.cc:
  Fixed bug #9939: a wrong conversion of arguments
  for functions COALESCE and IFNULL.
  Item_func_coalesce and Item_func_ifnull now
  inherit from a modified Item_func_numhybrid.
sql/item_cmpfunc.h:
  Fixed bug #9939: a wrong conversion of arguments
  for functions COALESCE and IFNULL.
  Item_func_coalesce and Item_func_ifnull now
  inherit from a modified Item_func_numhybrid.
sql/item_func.cc:
  Fixed bug #9939: a wrong conversion of arguments
  for functions COALESCE and IFNULL.
  The str_op virtual method was added into Item_func_numhybrid.
sql/item_func.h:
  Fixed bug #9939: a wrong conversion of arguments
  for functions COALESCE and IFNULL.
  he str_op virtual method was added into Item_func_numhybrid.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-06-02 07:27:02 -07:00
55efc0e254 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/item_func.cc:
  Auto merged
2005-06-02 15:46:55 +02:00
1ea49fecdd cleanup
extra/yassl/src/ssl.cpp:
  unresolved __cxa_pure_virtual
sql/item_func.cc:
  don't call arg[0]->val_xxx() twice
2005-06-02 15:45:20 +02:00
6e7022d18e Merge 2005-06-02 15:40:52 +02:00
1dd50e466d misc. fixes for windoze builds
VC++Files/client/mysql.dsp:
  added missing mysys.lib
VC++Files/client/mysqladmin.dsp:
  added missing mysys.lib
VC++Files/client/mysqlimport.dsp:
  added missing mysys.lib
VC++Files/client/mysqlshow.dsp:
  added missing mysys.lib
VC++Files/libmysql/libmysql.dsp:
  added missing mysys.lib
VC++Files/mysql.dsw:
  added dependencies on mysys
include/config-win.h:
  added missing constant
sql/sql_base.cc:
  pulled declaration of table_list out of for-scope
2005-06-02 15:32:02 +02:00
c8e797b5b6 Fix bug #9669 Ordering on IF function with FROM_UNIXTIME function fails
Integer overflow results in wrong field sortlength.


sql/item_cmpfunc.cc:
  Fix bug #9669 Ordering on IF function with FROM_UNIXTIME function fails.
mysql-test/t/func_if.test:
  Test for bug #9669 Ordering on IF function with FROM_UNIXTIME function fails.
mysql-test/r/func_if.result:
  Test for bug #9669 Ordering on IF function with FROM_UNIXTIME function fails.
2005-06-02 17:00:07 +04:00
2d008198d2 Modified handling of guarded predicates at condition pushdown to storage engine, to make valgrind happy 2005-06-02 14:48:19 +02:00