Commit graph

22916 commits

Author SHA1 Message Date
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
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
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
konstantin@mysql.com
8355b39d11 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-9643
2005-05-17 15:55:27 +04: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
konstantin@mysql.com
bb8348fa53 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-9643
2005-05-16 23:44:08 +04:00
monty@mysql.com
3b3d00c4a2 Merge with 4.1 to get fix for memory leak 2005-05-16 20:21:38 +03:00
jimw@mysql.com
4412ad4e11 Cleanups based on feedback from Monty. 2005-05-16 10:21:28 -07:00
monty@mysql.com
8b1673f18e Fix memory leak 2005-05-16 20:16:46 +03:00
konstantin@mysql.com
fc98f726bc Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-9643
2005-05-16 21:05:57 +04:00
konstantin@mysql.com
d0b4e71bbd Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-9643
2005-05-16 18:48:01 +04:00
serg@serg.mylan
165bb064cb Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-05-16 16:44:53 +02:00
konstantin@mysql.com
f1916b87d2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-9643
2005-05-16 18:29:04 +04:00
konstantin@mysql.com
38d68559bf A fix and a test case for Bug#9643 " CURSOR_TYPE_SCROLLABLE dos not work"
- check on the client the unsupported feature and return 
an error message if it's been requested.
Additionally added API support for STMT_ATTR_PREFETCH_ROWS.
Post-review fixes.
2005-05-16 18:27:21 +04:00
sergefp@mysql.com
58d05b0794 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug10221
2005-05-16 14:10:02 +00:00
sergefp@mysql.com
47ad6a6daa Some improvement in Item_int_with_ref class comment. 2005-05-16 14:06:52 +00:00
serg@serg.mylan
bdd3452115 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-05-16 15:28:58 +02:00
monty@mysql.com
5641664de7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-05-16 15:26:40 +03:00
monty@mysql.com
d06bb6fa39 After merge fixes 2005-05-16 15:21:35 +03:00
monty@mysql.com
bacc512193 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/my/mysql-5.0
2005-05-16 13:36:17 +03:00
monty@mysql.com
7d70579917 Fixed failing tests for not 32 bit intel machines
Fixed bug in mysql_stmt_fetch() when retrieving rows to return
2005-05-16 13:34:23 +03:00
serg@serg.mylan
c28accc9a9 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-05-16 12:05:42 +02:00
msvensson@neptunus.(none)
d54c1ecf39 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-16 11:25:38 +02:00
msvensson@neptunus.(none)
ffd6f926ca Build fixes 2005-05-16 11:24:41 +02:00
ramil@mysql.com
09168e0474 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b10655
2005-05-16 13:45:13 +05:00
ramil@mysql.com
0b90c8bfd6 a fix (bug #10655: mysys/default.c compilation problem). 2005-05-16 13:40:57 +05:00
mskold@mysql.com
d6d9a7f45c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-05-16 08:12:35 +02:00
kent@mysql.com
63fcb5de6f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-05-16 02:55:51 +02:00
kent@mysql.com
27c4182e6a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-05-16 02:03:18 +02:00
kent@mysql.com
24b34fa9fe Merge 2005-05-16 01:25:14 +02:00
kent@mysql.com
b076cdb208 mysqltest.c:
To solve bug#8455, call mysql_affected_rows() earlier, before query to find warnings
2005-05-16 01:08:42 +02:00
petr@mysql.com
834c47f336 Merge 2005-05-16 03:01:05 +04:00
petr@mysql.com
180d0ed620 post-review fixes 2005-05-16 01:54:02 +04:00
kent@mysql.com
0d73975517 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-05-15 20:53:19 +02:00
kent@mysql.com
6374bfeb61 mysqltest.c:
To solve bug#6193, also reset require when using 'eval' for running query
mysql-test-run.pl:
  In cleanup, remove possible soft link to var directory
2005-05-15 20:38:54 +02:00
pekka@mysql.com
3131434dcf ndb - wl-2451 update schemafile format change to 5.0.6 2005-05-15 18:10:30 +02:00
pekka@mysql.com
143ad5081a ndb - testScan -n ScanRead488O fix 2005-05-15 17:56:39 +02:00
kent@mysql.com
7858004c51 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-05-15 17:36:36 +02:00
kent@mysql.com
81b36addc9 mtr_report.pl, mtr_process.pl, mysql-test-run.pl:
Added option --vardir=<directory> for feature bug#10096
2005-05-15 17:22:54 +02:00
kent@mysql.com
e2d7efb238 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-05-15 07:38:42 +02:00
kent@mysql.com
f37bdbe059 mysql-test-run.pl:
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
init_db.sql:
  Initial db updates
2005-05-15 07:34:09 +02:00
kent@mysql.com
bd70ce726b Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-05-15 07:06:47 +02:00
kent@mysql.com
221b1ccae8 mysqltest.c, mysql-test-run.sh:
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
mysql-test-run.sh, suppress.purify:
  Use Purify suppress file
2005-05-15 06:59:34 +02:00
kent@mysql.com
a628878bbf Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
2005-05-14 23:48:15 +02:00