mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
23358 commits 2778 branches 343 tags 1.6 GiB
Commit graph

11185 commits

Author SHA1 Message Date
serg@serg.mylan
8044488d7c merged 2005-05-18 22:14:08 +02:00
serg@serg.mylan
2e93680773 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2005-05-18 21:36:46 +02:00
serg@serg.mylan
50d369bb43 udf: when banning paths from soname in CREATE FUNCTION, check for \ on windows. 
when reporting an error, use an appropriate buffer for udf->name
 2005-05-18 21:31:39 +02:00
msvensson@neptunus.(none)
89415d272c Merge 2005-05-18 20:52:59 +02:00
msvensson@neptunus.(none)
2d515425a3 BUG#9626 
- Fix valgrind warnings
 - Remove static db, schema and table name buffers from Ndb.cpp
 2005-05-18 20:50:29 +02:00
monty@mysql.com
a9c4379c15 Fixed bug from last push 2005-05-18 21:12:59 +03:00
jimw@mysql.com
3f6aad900c Resolve merge from 4.1 2005-05-18 11:06:34 -07:00
ingo@mysql.com
21bf35fce0 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-05-18 19:45:59 +02:00
ingo@mysql.com
26f2e57ecb Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE 
After review version.
Added a condition for MERGE tables. These do not have unique
indexes. But every key could be a unique key on the underlying
MyISAM table. So get the maximum key length for MERGE tables
instead of the maximum unique key length. This is used for
buffer allocation in write_record().
 2005-05-18 19:40:39 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
c63ad3b549 New file default_modify.c. Fixed a typo on mysqld.cc 
Changed name of function my_correct_default_file to
modify_defaults_file. Improved function and fixed some
bugs in it.
 2005-05-18 20:10:17 +03:00
Sinisa@sinisa.nasamreza.org
aec54dcc7c Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2005-05-18 19:43:48 +03:00
monty@mysql.com
e3111b31d1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-05-18 19:01:16 +03:00
monty@mysql.com
db40af2a6f Fix warnings from icc 
Added BUILD scripts for icc
Fixed (one time) memory leak in grant handling
 2005-05-18 19:00:21 +03:00
konstantin@mysql.com
8b302cbb99 A draft comment for mysql_select. Feel free to moderate and improve. 2005-05-18 19:35:20 +04:00
pem@mysql.com
65bce553c5 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-05-18 14:31:15 +02:00
Sinisa@sinisa.nasamreza.org
78a1688351 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2005-05-18 15:28:13 +03:00
igor@rurik.mysql.com
80aa0062db olap.result, olap.test: 
Added test cases for bug #7914.
sql_select.cc:
  Fixed bug #7914: rollup over expresssions such as sum(a)+1.
 2005-05-18 05:15:48 -07:00
georg@lmy002.wdf.sap.corp
2b04efe21e fixed fatal compiler error (windows) 2005-05-18 14:13:58 +02:00
pem@mysql.com
bc9e072eff Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-05-18 13:37:59 +02:00
igor@rurik.mysql.com
3199272e65 sql_yacc.yy: 
Added missing ';'.
 2005-05-18 04:17:13 -07:00
ramil@mysql.com
e08c287c93 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0.b10339
 2005-05-18 14:50:57 +05:00
gluh@mysql.com
4047905d8e Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9286
 2005-05-18 14:48:04 +05:00
ramil@mysql.com
66b6bbfaea Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0.b10339
 2005-05-18 14:46:05 +05:00
pem@mysql.com
38c44af8b8 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-05-18 11:09:30 +02:00
pem@mysql.comhem.se
9472627b8a Fixed BUG#6048: Stored procedure causes operating system reboot. 
Memory leak in locally evalutated expressions during SP execution fixed by
  reusing allocated item slots when possible.
  Note: No test case added, since the test is a stress test that tries to make
  the machine to run out of memory.
 2005-05-18 11:07:57 +02:00
gluh@mysql.com
053f753a0d Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9286
 2005-05-18 12:52:02 +05:00
gluh@eagle.intranet.mysql.r18.ru
b44a474449 Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables(for 5.0) 2005-05-18 12:47:45 +05:00
ramil@mysql.com
86538b338b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/ram/work/5.0.b6267
 2005-05-18 12:41:36 +05:00
monty@mysql.com
c1b512fad3 Change update_auto_increment to return 1 if get_auto_increment() returned ~(ulonglong) 
This makes it easier to give an error in the handler if there was a problem generating an auto-increment value
 2005-05-18 10:41:35 +03:00
sergefp@mysql.com
b6179919f3 Change Last_query_cost status variable from global to thread-local. 2005-05-18 05:39:10 +02:00
monty@mysql.com
02b4a6f8f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-05-18 02:09:24 +03:00
acurtis@xiphis.org
390e0bbc2a Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into xiphis.org:/usr/home/antony/work2/p1-bug10246.1
 2005-05-17 23:57:42 +01:00
acurtis@xiphis.org
ed899c0da2 fix embedded build 2005-05-17 23:49:01 +01:00
monty@mysql.com
6757ed59ee Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-05-18 00:31:01 +03:00
tulin@dl145c.mysql.com
4a1d6f6a18 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-05-17 23:25:13 +02:00
msvensson@neptunus.(none)
02bd2cf049 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-05-17 22:58:13 +02:00
monty@mysql.com
ef860705c7 Merge 2005-05-17 23:54:32 +03:00
monty@mysql.com
79909808d8 After merge fix 2005-05-17 23:52:36 +03:00
acurtis@xiphis.org
1b87bf5164 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into xiphis.org:/usr/home/antony/work2/p1-bug10246.1
 2005-05-17 21:13:25 +01:00
acurtis@xiphis.org
11a174302b Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into xiphis.org:/usr/home/antony/work2/p1-bug10246.1
 2005-05-17 19:57:27 +01:00
acurtis@xiphis.org
8df5887ad5 Bug#10246 - Parser: bad syntax for GRANT EXECUTE 
Rename some functions
  more fine-grained sp privileges
  make grant/revoke sp grammar less ambigious
 2005-05-17 19:54:20 +01:00
heikki@hundin.mysql.fi
69b3b81734 ha_innodb.cc: 
Fix bug #10359 : remove extra code
 2005-05-17 21:47:28 +03:00
heikki@hundin.mysql.fi
0e642803b3 ha_innodb.h, ha_innodb.cc: 
Fix bug #10359 : the critical AUTO-INC bug in InnoDB; since reading of the auto-inc counter in an INSERT was not protected by the AUTO-INC table lock of InnoDB, two inserted rows could get the same value for the auto-inc counter, leading to a duplicate key error
 2005-05-17 21:43:15 +03:00
msvensson@neptunus.(none)
02a3295a60 Merge neptunus.(none):/home/msvensson/mysql/bug9535 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-05-17 20:32:00 +02:00
msvensson@neptunus.(none)
e6ba48b942 BUG#9535 Warning for "create table t as select uuid();" 
- Set max_length of Item_func_uuid to max_length*system_charset_info->mbmaxlen
  Note! Item_func_uuid should be set to use 'ascii' charset when hex(), format(), md5() etc will use 'ascii'
 2005-05-17 20:31:26 +02:00
ndbdev@dl145c.mysql.com
1513aad1e9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-05-17 20:07:03 +02:00
bell@book.sanja.is.com.ua
295722520f Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-4.1 
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1
 2005-05-17 19:10:53 +03:00
serg@serg.mylan
56fa40e558 sql_yacc.yy: 
missing semicolon added
sql_base.cc:
  bad merge fixed
sp_head.cc, view.test, view.result:
  Correct restoring view name in SP table locking BUG#9758
configure.in:
  restore -fno-implicit-templates -fno-exceptions -fno-rtti in configure
 2005-05-17 17:08:43 +02:00
tulin@dl145c.mysql.com
23f79bd1f2 merge 2005-05-17 10:17:53 +02:00
jimw@mysql.com
be4920cd81 Merge mysql.com:/home/jimw/my/mysql-5.0-7800 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-05-16 14:33:46 -07:00