mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
23456 commits 2781 branches 343 tags 1.6 GiB
Commit graph

23456 commits

This branch
This branch
All branches
Author SHA1 Message Date
jimw@mysql.com
0f8c2e2a4b Merge mysql.com:/home/jimw/my/mysql-5.0-10590 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-03 16:06:51 -07:00
monty@mysql.com
a49387a1e8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-06-03 23:46:44 +03:00
monty@mysql.com
29fd1f2fd9 Move USE_PRAGMA_IMPLEMENTATION to proper place 
Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable
 2005-06-03 23:46:03 +03:00
serg@serg.mylan
d26c13b439 client/mysql.cc 
make print_field_types() somewhat more useful
 2005-06-03 21:59:33 +02:00
serg@serg.mylan
aaa4c11d11 mergemerged 2005-06-03 21:24:13 +02:00
serg@serg.mylan
5b810bc607 after merge fixes 2005-06-03 21:08:45 +02:00
hartmut@mysql.com
4208f74948 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
hartmut@mysql.com
1e5f1078c6 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
serg@serg.mylan
e4d4baed62 merged 2005-06-03 18:29:36 +02:00
lenz@mysql.com
852a57300d - include/config-win.h: removed double HAVE_CHARSET_cp932 #define 
- mysql-test/Makefile.am: added a pattern match for t/*.sql 
  (t/mysql_delimiter.sql was missing from the source distribution)
 2005-06-03 18:20:25 +02:00
serg@serg.mylan
52340c550b Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2005-06-03 16:01:44 +02:00
serg@serg.mylan
f55a378e9a *don't* mess with kernel defines, boy. 
and HAVE_ATOMIC_ADD/HAVE_ATOMIC_SUB is tested in configure
 2005-06-03 15:05:18 +02:00
serg@serg.mylan
7288ef873f 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
serg@serg.mylan
91f6308d00 yassl template instantiation - don't do too much 
mysys/my_access.c: remove incorrect fix
comments
 2005-06-03 13:43:17 +02:00
pem@mysql.com
0d5e311176 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
pem@mysql.comhem.se
5370ffc9c1 Post review fix of BUG#10969. 2005-06-03 12:56:51 +02:00
monty@mysql.com
fd17d75923 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-06-03 13:35:58 +03:00
hartmut@mysql.com
03056a2892 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
ndbdev@dl145b.mysql.com
25cb14234a sql_repl.cc: 
Bug #11064  	some read error not detected in replication on 64-bit platform
 2005-06-03 11:16:37 +02:00
hartmut@mysql.com
5f2f34079b Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1 
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
 2005-06-03 10:35:14 +02:00
hartmut@mysql.com
082a3ec958 bundle the check-cpu helper script with source packages. 
BUG#10696
 2005-06-03 10:30:58 +02:00
bar@mysql.com
4876612ae3 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
bar@mysql.com
618934fe5f Merge 2005-06-03 09:44:13 +05:00
mskold@mysql.com
a6df700259 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
bar@mysql.com
1002a9416b 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.
 2005-06-03 09:37:53 +05:00
bar@mysql.com
fdc7d4cc07 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
monty@mysql.com
0dd94ed426 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-06-03 01:16:29 +03:00
monty@mysql.com
ed5774f0c3 Removed duplicated and wrong merged code 2005-06-03 01:15:56 +03:00
serg@serg.mylan
639f8ceb25 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
serg@serg.mylan
1cad5c8c4b assemble libmysqld.a 5-10 times faster! 2005-06-02 22:59:37 +02:00
konstantin@mysql.com
c661f47380 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
svoj@mysql.com
cce70dd17c 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
konstantin@mysql.com
e2a37c63fb 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
konstantin@mysql.com
123bcb9d8d Give Item_arena::is_stmt_prepare a more descriptive name (it marks 
the code that is active for SP as well in 5.0)
 2005-06-03 00:02:47 +04:00
tulin@dl145b.mysql.com
82d32b88e9 Merge dl145b.mysql.com:/home/ndbdev/tomas/mysql-4.1 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.0
 2005-06-02 21:31:25 +02:00
svoj@mysql.com
681b974b1e WL#2286 - Compile MySQL w/YASSL support 
Compilation errors fixes.
 2005-06-03 00:28:18 +05:00
tulin@dl145b.mysql.com
342f6d54a3 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
tulin@dl145b.mysql.com
72288df8fc CommandInterpreter.cpp: 
Bug #11050  	ndb_mgm "show" prints incorrectly after master data node fails
 2005-06-02 21:14:14 +02:00
mskold@mysql.com
6720cb7d69 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-06-02 20:55:32 +02:00
reggie@monster.
0e139b8908 Merge monster.:D:/Work/mysql-4.1 into monster.:D:/Work/mysql5.0 2005-06-02 12:36:55 -05:00
igor@igor-inspiron.creware.com
83fae64323 item_func.h: 
Identation correction for the fix of bug #9939.
 2005-06-02 10:00:32 -07:00
igor@igor-inspiron.creware.com
c10b32f4b4 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
reggie@monster.
7b9d4eaa92 fixed compile problem by replacing W_OK with F_OK 2005-06-02 11:12:58 -05:00
igor@igor-inspiron.creware.com
e5ac58e64a Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into igor-inspiron.creware.com:/home/igor/mysql-5.0
 2005-06-02 08:46:10 -07:00
heikki@hundin.mysql.fi
894de1686a 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
mskold@mysql.com
9cebe281bb Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-06-02 17:06:51 +02:00
mskold@mysql.com
565e3ef640 Added update_used_tables to add_found_match_trig_cond, to make valgrind happy 2005-06-02 16:56:08 +02:00
igor@igor-inspiron.creware.com
380411607a Merge igor-inspiron.creware.com:/home/igor/mysql-5.0 
into igor-inspiron.creware.com:/home/igor/dev/mysql-5.0-0
 2005-06-02 07:33:31 -07:00
igor@igor-inspiron.creware.com
186e8c5891 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.
 2005-06-02 07:27:02 -07:00
serg@serg.mylan
cdb1474dae Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-02 15:46:55 +02:00