mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
23346 commits 2790 branches 343 tags 1.7 GiB
Commit graph

11168 commits

Author SHA1 Message Date
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
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
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
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
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
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
serg@serg.mylan
4df47b9e4a cleanup 2005-06-02 15:45:20 +02:00
schwenke@lmy003.wdf.sap.corp
49e5fafeaf Merge 2005-06-02 15:40:52 +02:00
schwenke@lmy003.xl.local
7d6b47c994 misc. fixes for windoze builds 2005-06-02 15:32:02 +02:00
evgen@moonbone.local
f89352602c Fix bug #9669 Ordering on IF function with FROM_UNIXTIME function fails 
Integer overflow results in wrong field sortlength.
 2005-06-02 17:00:07 +04:00
mskold@mysql.com
ca679df824 Modified handling of guarded predicates at condition pushdown to storage engine, to make valgrind happy 2005-06-02 14:48:19 +02:00
mskold@mysql.com
cc524b4fda Removed bug introduced when implementing support for IN and BETWEEN 2005-06-02 14:46:58 +02:00
bar@mysql.com
95484f7996 Merge mysql.com:/usr/home/bar/mysql-4.1.sysvar 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-06-02 17:13:37 +05:00
bar@mysql.com
e686057259 item_func.cc: 
set_var.cc:
variables.result
variables.test

  Bug #10904 Illegal mix of collations between a system variable and a constant
  Changing coercibility of system variables to SYSCONST,
  to be the same with USER(), DATABASE(), etc.
 2005-06-02 16:17:44 +05:00
serg@serg.mylan
f3a95357fe Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-02 11:02:01 +02:00
brian@zim.(none)
d11ba2ca04 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into zim.(none):/home/brian/mysql/mysql-5.0
 2005-06-01 22:50:00 -07:00
brian@zim.(none)
113a99626d Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
kent@mysql.com
f0fcc54b0c Merge 2005-06-02 04:45:09 +02:00
brian@zim.(none)
efb5ed5bab Merge 2005-06-01 18:48:29 -07:00
jimw@mysql.com
1c387c8f71 Restore a bit of code accidently deleted during merge 2005-06-01 18:08:39 -07:00
kent@mysql.com
f889f0884c Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-06-02 02:57:18 +02:00
kent@mysql.com
bd48eed988 tztime.cc: 
Set #pragma implementation" earlier
Many files:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
 2005-06-02 02:43:32 +02:00
brian@zim.(none)
ba9b9f8993 Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed a number of dumb things in ha_tina. 2005-06-01 17:34:10 -07:00
jimw@mysql.com
8b0daa8445 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-01 16:13:25 -07:00
jimw@mysql.com
5a271e2c12 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-01 16:13:24 -07:00
jimw@mysql.com
f5f88703b2 Fix compile error when HAVE_BERKELEY_DB 2005-06-01 16:03:41 -07:00
jimw@mysql.com
b8f3c515ba Merge mysql.com:/home/jimw/my/mysql-4.1-9660 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-01 13:02:26 -07:00
jimw@mysql.com
4f6db49795 Merge mysql.com:/home/jimw/my/mysql-4.1-10944 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-01 13:00:32 -07:00
jimw@mysql.com
0a2d95e983 Merge mysql.com:/home/jimw/my/mysql-4.1-8135 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-01 12:59:11 -07:00
serg@serg.mylan
0c69fe8428 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-01 20:04:53 +02:00
jimw@mysql.com
7ac7bfc3c8 Fix handling of NULL fields in FIELD(). (Bug #10944) 2005-06-01 09:48:25 -07:00
serg@serg.mylan
34df99ab82 more than 64 indexes per table. bugfixes. bug#10995 2005-06-01 18:33:16 +02:00
pem@mysql.com
f711a3d7c1 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-06-01 15:50:52 +02:00
pem@mysql.comhem.se
5afef58364 Fixed BUG#10969: Stored procedures: crash if default() function 
Return an error if default() is used on a local variable.
  This is actaully a side-effect of BUG#5967: Stored procedure declared
  variable used instead of column (to be fixed later), so this is really a
  workaround until that is fixed.
 2005-06-01 15:42:40 +02:00
ingo@mysql.com
4a25417394 Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement. 
After merge fixes.
 2005-06-01 13:22:17 +02:00
pem@mysql.comhem.se
85f19d5da5 Fixed BUG#10961: Stored procedures: crash if select * from dual 
Have to catch errors from SELECT when opening a cursor.
 2005-06-01 12:18:41 +02:00
mskold@mysql.com
e8613e53b9 Fixed handling of condition pushdown to storage engine of NO BETWEEN and NOT IN 2005-06-01 11:56:47 +02:00
ingo@mysql.com
0a1e38b7ed Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement. 
Manual merge from 4.1.
 2005-06-01 11:15:21 +02:00