igor@rurik.mysql.com
3199272e65
sql_yacc.yy:
...
Added missing ';'.
2005-05-18 04:17:13 -07:00
ramil@mysql.com
7b3a9212df
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b10339
2005-05-18 16:06:01 +05:00
gbichot@quadita2.mysql.com
56dbfc99ba
mysqldump.c: disabling --delayed-insert until BUG#7815 is fixed (need table def cache for that,
...
to easily check the storage engine supports DELAYED).
2005-05-18 13:02:09 +02:00
kent@mysql.com
f81e6248d2
make_binary_distribution.sh:
...
To be safe, put "..." around variables to the test command
2005-05-18 12:49:43 +02:00
kent@mysql.com
72ce7299a9
commands.cc, parse.h, parse.cc, instance_options.cc:
...
Prefix enum symbols LOG_* with IM_, not to clash with system headers
2005-05-18 12:34:38 +02:00
kent@mysql.com
7b524409e6
Merge mysqldev@production.mysql.com:my/mysql-5.0-build
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
2005-05-18 12:18:29 +02:00
kent@mysql.com
318c41e94d
default.c:
...
Disabled use of GetSystemWindowsDirectory() when compiled with VC6
mysql.cc:
Removed unused variable 'field' from print_warnings()
libmysql.dsp:
Added "my_chsize.c" and "my_seek.c"
mysqlclient.dsp:
Added "my_chsize.c"
2005-05-18 12:15:28 +02:00
ramil@mysql.com
f32c4cbdb5
A fix (bug #10703 : rpl_variables.test failure).
2005-05-18 15:10:43 +05: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
serg@serg.mylan
28712375d5
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-05-18 11:03:05 +02:00
ramil@ram-book.(none)
6737c2f67c
test result change: now "enum... not null" doesn't print default value.
2005-05-18 14:02:03 +05:00
serg@serg.mylan
48377eb7c4
test fixes
2005-05-18 10:57:07 +02:00
tulin@dl145c.mysql.com
13bbb3dbb3
ndberror.c:
...
updated error message for ndb
2005-05-18 10:22:27 +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
monty@mysql.com
408d7d3d64
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-05-18 10:31:01 +03:00
matt@mysql.com
8ed0aaacdf
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/data0/mysqldev/my/mysql-4.1-build
2005-05-18 04:06:27 +02:00
matt@mysql.com
4dca62401c
make_binary_distribution.sh:
...
Use portable check for empty string.
2005-05-18 03:45:01 +02:00
jimw@mysql.com
b2b9485a94
Merge mysql.com:/home/jimw/my/mysql-5.0-10251
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-05-17 16:59:39 -07: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
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
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
sergefp@mysql.com
cc13545413
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug10095
2005-05-16 22:21:19 +02: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