Commit graph

29619 commits

Author SHA1 Message Date
konstantin@mysql.com
4d272aba67 Merge mysql.com:/opt/local/work/mysql-4.1-root
into  mysql.com:/opt/local/work/mysql-5.0-root
2006-01-11 17:49:56 +03:00
konstantin@mysql.com
9105d06dd6 A fix for Bug#13944 "libmysqlclient exporting sha1_result function":
rename sha1_* to mysql_sha1_*
2006-01-11 17:31:52 +03:00
svoj@april.(none)
be55de4ff3 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/warnings/mysql-5.1-new
2006-01-11 17:20:44 +04:00
knielsen@mysql.com
dd3dc1e398 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmpbuild2
2006-01-11 14:04:44 +01:00
mskold@mysql.com
0453feff9a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-01-11 13:55:04 +01:00
mats@mysql.com
67a48b02bf Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/bkroot/mysql-5.1-new
2006-01-11 13:53:35 +01:00
knielsen@mysql.com
aaca50207d Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-11 13:06:20 +01:00
knielsen@mysql.com
db7e7cbef9 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/local/mysql/tmpbuild
2006-01-11 13:03:19 +01:00
msvensson@devsrv-b.mysql.com
7e97a12212 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  devsrv-b.mysql.com:/space/magnus/my51-wl2930_fixup
2006-01-11 13:03:09 +01:00
andrey@lmy004.
b7117c448e Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-11 12:51:17 +01:00
andrey@lmy004.
c326d96535 WL #1034 (Internal CRON) pre-push fixes
after another merge fixes.
2006-01-11 12:49:56 +01:00
gluh@mysql.com
2f27c6499d Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-01-11 15:45:03 +04:00
mskold@mysql.com
946300c89b WL#1892 Post-review fix, removed index insertion in list at create 2006-01-11 12:41:38 +01:00
jonas@perch.ndb.mysql.com
b2d5ea4676 Fix handlerton alter_tablespace for example storage engine 2006-01-11 12:39:09 +01:00
mskold@mysql.com
e39e2d9a22 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-01-11 12:36:38 +01:00
mskold@mysql.com
67cbb3b11e Restructered index management, to prepare for add/drop index (WL#1892) 2006-01-11 12:35:28 +01:00
gluh@mysql.com
f07d2aaac6 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-01-11 15:05:40 +04:00
gluh@eagle.intranet.mysql.r18.ru
9f729c45d7 Additional fix for wl#2506 2006-01-11 15:04:18 +04:00
andrey@lmy004.
8515610f2e manual merge 2006-01-11 12:01:36 +01:00
mats@mysql.com
0933a3bc34 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b16095-mysql-5.1-new
2006-01-11 11:50:09 +01:00
jonas@perch.ndb.mysql.com
161645c81e wl2723 - ndb opt. nr 2006-01-11 11:35:25 +01:00
msvensson@neptunus.(none)
4b913614fc Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-11 11:24:57 +01:00
msvensson@neptunus.(none)
4bcc1845eb Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
into  neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup
2006-01-11 11:21:23 +01:00
msvensson@neptunus.(none)
f60f757689 Add comments that groups and describes the inits 2006-01-11 11:10:58 +01:00
msvensson@neptunus.(none)
f4ad824df9 Remove obsolete comment 2006-01-11 11:07:17 +01:00
msvensson@neptunus.(none)
2f48e4f1dc Fix problem with strange printout of line numbers, detected on aix52, but existing on all platforms, just being masked by init of vars to zero. 2006-01-11 11:06:26 +01:00
knielsen@mysql.com
adce077dfb Merge mysql.com:/usr/local/mysql/mysql-5.0-sol10-sparc-a-fix
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-11 09:21:11 +01:00
mats@mysql.com
31c3ae5603 Bug#16095 (INSERT DELAYED crashes mysqld server):
Checking that binlog is open before calling binlog_query().
2006-01-11 09:16:24 +01:00
knielsen@mysql.com
246690cb1e Merge mysql.com:/usr/local/mysql/mysql-5.0-sol10-sparc-a-fix
into  mysql.com:/usr/local/mysql/mysql-5.0
2006-01-11 09:02:13 +01:00
brian@zim.(none)
b56432cd19 Added support for CREATE TABLE AUTO_INCREMENT and added more tests. Also non-unique index scans of autoincrement not function. 2006-01-10 22:54:34 -08:00
msvensson@neptunus.(none)
d42d399464 Disable code for "let" to assign each column from query to it's own variable 2006-01-11 00:24:57 +01:00
anozdrin@mysql.com
e5d26fc446 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alik/MySQL/devel/5.0-bug15110
2006-01-11 02:10:59 +03:00
anozdrin@mysql.com
b04b851ef9 Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause
There are two main idea of this fix:
  - introduce a common function for server and client to split user value
    (<user name>@<host name>) into user name and host name parts;
  - dump DEFINER clause in correct format in mysqldump.
2006-01-11 02:07:40 +03:00
ingo@mysql.com
fc85125a93 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/nfstmp1/ingo/autopush-773/mysql-5.0
2006-01-10 21:57:47 +01:00
andrey@lmy004.
cda83534b1 WL #1034 (Internal CRON) pre-push update
fix errmsg.txt
2006-01-10 21:47:12 +01:00
mskold@mysql.com
0f7214d9dc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-01-10 21:43:09 +01:00
mskold@mysql.com
cb1bd7d7ae Can't repeat bug#15004, enable tests again 2006-01-10 21:39:12 +01:00
andrey@lmy004.
7c049782fa WL #1034 (Internal CRON)
merge before push
2006-01-10 21:02:19 +01:00
ingo@mysql.com
4c447ea454 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug5390
2006-01-10 20:03:28 +01:00
jani@hasky.mysql.fi
5182d40412 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hasky.mysql.fi:/home/jani/mysql-5.0
2006-01-10 20:56:24 +02:00
andrey@lmy004.
d2f0002e77 WL #1034 (Internal CRON) pre-push updates
- fixed test results
- fixed bug caught by information_schema.test . Bison temporal
  variables are very nice but extremely error-prone (Count one more
  time just to be sure).
2006-01-10 19:16:58 +01:00
aivanov@mysql.com
cdf3e4c02e Post-merge changes 2006-01-10 21:03:02 +03:00
jani@ua141d10.elisa.omakaista.fi
d9d6dfea3a Changed function prototype. 2006-01-10 19:19:56 +02:00
monty@mysql.com
2970e71ce8 Re-run fix-fields on condition if table was reopened in HANDLERREAD 2006-01-10 19:13:12 +02:00
msvensson@neptunus.(none)
43d563b073 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2006-01-10 18:09:39 +01:00
jani@ua141d10.elisa.omakaista.fi
df801decef Fixed refresh_status function. 2006-01-10 18:56:23 +02:00
aivanov@mysql.com
2871e85f2e Merge mysql.com:/home/alexi/dev/mysql-4.1-15805
into  mysql.com:/home/alexi/dev/mysql-5.0-15805
2006-01-10 19:22:47 +03:00
monty@mysql.com
3143daf8ac Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/my/mysql-4.1
2006-01-10 18:03:54 +02:00
gluh@eagle.intranet.mysql.r18.ru
be4ebd9038 WL#2506: Information Schema tables for PARTITIONing
added I_S 'PARTITIONS' table
2006-01-10 19:44:04 +04:00
msvensson@neptunus.(none)
4a000ba857 Merge neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-small_fix
into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2006-01-10 16:00:37 +01:00