Commit graph

22964 commits

Author SHA1 Message Date
konstantin@mysql.com
e7c6282254 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-root
2005-05-18 21:13:45 +04:00
konstantin@mysql.com
f03970bb53 Fix a couple of compilation failures. 2005-05-18 21:11:15 +04: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
konstantin@mysql.com
3b5897e5e9 Fix conflicting declaration and definition of db_output (compilation
failure).
2005-05-18 20:30:22 +04:00
konstantin@mysql.com
14d44f19b5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-root
2005-05-18 20:11:23 +04:00
konstantin@mysql.com
334e302ef0 Merge mysql.com:/opt/local/work/mysql-5.0-root
into mysql.com:/media/sda1/mysql/mysql-5.0-libtool
2005-05-18 20:01:47 +04: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
schwenke@lmy003.wdf.sap.corp
ca5b291be0 Merge aschwenke@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy003.wdf.sap.corp:/home/schwenke/Work/MySQL/bk-internal-tree/mysql-5.0
2005-05-18 15:34:49 +02:00
schwenke@lmy003.wdf.sap.corp
badfc2e4a9 new build scripts for SAP team 2005-05-18 15:28:51 +02:00
ramil@mysql.com
8add105ff5 Merge mysql.com:/usr/home/ram/work/mysql-5.0-build
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-05-18 18:15:14 +05: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
petr@mysql.com
2a5f8ffec1 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-05-18 16:31:14 +04:00
georg@lmy002.wdf.sap.corp
2b04efe21e fixed fatal compiler error (windows) 2005-05-18 14:13:58 +02:00
petr@mysql.com
8053dbca53 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-05-18 16:07:12 +04:00
petr@mysql.com
5395a2db7e fix for compilation problem with --with-openssl reported by Guilhem 2005-05-18 16:05:58 +04:00
georg@lmy002.wdf.sap.corp
b01ad9f88c Merge grichter@bk-internal1.mysql.com:/home/bk/mysql-5.0
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
2005-05-18 13:57:33 +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
petr@mysql.com
1c376d7da4 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-05-18 15:29:37 +04:00
petr@mysql.com
67364e99af fix comments 2005-05-18 15:28:38 +04:00
konstantin@mysql.com
f96de23ad3 Remove automatically generated autotools files from revision control.
Fix build scripts to create them.
2005-05-18 15:23:29 +04: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
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
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
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
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
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