Commit graph

27534 commits

Author SHA1 Message Date
igor@rurik.mysql.com
cb439945c0 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-11-02 14:01:08 -08:00
igor@rurik.mysql.com
fddc99bcd8 #view.test#:
new file
sql_table.cc, handler.h:
  Fixed bug #14540.
  Added error mnemonic code HA_ADMIN_NOT_BASE_TABLE
  to report that an operation cannot be applied for views.
view.test, view.result:
  Added a test case for bug #14540.
errmsg.txt:
  Fixed bug #14540.
  Added error ER_CHECK_NOT_BASE_TABLE.
2005-11-02 13:44:58 -08:00
monty@mysql.com
9946b15b3d Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-02 19:44:10 +02:00
konstantin@mysql.com
c2f224be5e Fix -ansi -pedantic compilation failure 2005-11-02 20:44:09 +03:00
monty@mysql.com
74b3e9ae76 Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-02 19:28:50 +02:00
monty@mysql.com
f2f4bf5240 wait_for_update must unlock mutex.
(Fixed failure in rpl0000008.test)
2005-11-02 19:28:49 +02:00
monty@mysql.com
9cab1f08fd Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-11-02 19:09:29 +02:00
monty@mysql.com
65034c9fb2 Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-02 16:29:00 +02:00
monty@mysql.com
2018f26ec0 Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-02 16:28:59 +02:00
monty@mysql.com
54d9d2e116 Portability fix
(BDB test failed in Intel64)
2005-11-02 16:28:58 +02:00
monty@mysql.com
c228d1a9aa Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-02 15:45:26 +02:00
monty@mysql.com
a7c6a100f0 Use --with-openssl instead of --with-yassl for now 2005-11-02 15:45:25 +02:00
bell@sanja.is.com.ua
efbdd24c96 found problem removed 2005-11-02 15:17:57 +02:00
monty@mysql.com
8acd43c4a6 Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-02 14:57:19 +02:00
monty@mysql.com
b43ca42959 Build max builds with --yassl instead of openssl 2005-11-02 14:57:18 +02:00
monty@mysql.com
4e452a71e4 Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-02 14:43:26 +02:00
monty@mysql.com
164b469660 Fixed wrong merge
Optimize new pushed code
2005-11-02 14:43:25 +02:00
monty@mysql.com
438e8b6d6a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-11-02 14:35:07 +02:00
bell@sanja.is.com.ua
35cc6325a7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner-5.0
2005-11-02 12:56:19 +02:00
patg@krsna.patg.net
50817d304b Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-11-01 17:07:13 -08:00
monty@mysql.com
57f15d10ba Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-11-01 22:58:24 +02:00
monty@mysql.com
2c41c77034 Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-01 22:15:09 +02:00
jimw@mysql.com
bb34222087 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-01 12:15:08 -08:00
monty@mysql.com
3a072a0eef Added missing DBUG_ENTER (bug in last push) 2005-11-01 21:59:24 +02:00
monty@mysql.com
f10399d77e Add missing return
Compile max with --yassl instead of --with-openssl
2005-11-01 21:57:24 +02:00
tim@siva.hindu.god
198ead8f4e merge 2005-11-02 08:46:13 +13:00
evgen@moonbone.local
db3b5c50bc Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/14186-bug-5.0-mysql
2005-11-01 21:55:39 +03:00
andrey@lmy004.
d4d777fdf0 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy004.:/work/mysql-5.0-bug14381
2005-11-01 19:41:24 +01:00
andrey@lmy004.
3a08c5257a fix for bug #14381
(BDB keylength limitted to 255)
2005-11-01 19:37:59 +01:00
evgen@moonbone.local
6d3bd1e0ee sql_update.cc:
After merge fix
2005-11-01 20:53:27 +03:00
jimw@mysql.com
d012c49ebf Merge mysql.com:/home/jimw/my/mysql-4.1-13774
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-11-01 09:38:41 -08:00
patg@krsna.patg.net
add878e818 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-11-01 09:08:50 -08:00
lars@mysql.com
aa7dd94962 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
2005-11-01 18:08:24 +01:00
evgen@moonbone.local
bbe58c7e26 Manually merged 2005-11-01 19:47:53 +03:00
lenz@mysql.com
f2eeaca387 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/data0/mysqldev/lenz/mysql-4.1
2005-11-01 17:46:00 +01:00
lars@mysql.com
13686ee371 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
2005-11-01 17:41:59 +01:00
lenz@mysql.com
72343cef75 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/data0/mysqldev/lenz/mysql-5.0
2005-11-01 17:39:09 +01:00
evgen@moonbone.local
47059b89f5 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/14186-bug-4.1-mysql
2005-11-01 17:34:19 +03:00
monty@mysql.com
e5f48e13bf Reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort
Fix for bug #14536: SELECT @a,@a:=... fails with prepared statements
2005-11-01 15:54:30 +02:00
hf@deer.(none)
f3502cd983 Additional fix for bug #14445 (analyse.test fails) 2005-11-01 16:14:26 +04:00
monty@mysql.com
19502e8eb5 Review of new pushed code
Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
Mark that add_time(), time_diff() and str_to_date() can return null values
2005-11-01 13:00:02 +02:00
lars@mysql.com
792a67ea96 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
2005-11-01 10:54:55 +01:00
hf@deer.(none)
b98c93e0a8 Fix for bug #14445 (analyse.test fails) 2005-11-01 13:08:14 +04:00
hf@deer.(none)
69cd4c1ebf gis.test fixed 2005-11-01 11:43:34 +04:00
ramil@mysql.com
fdcb437bdf Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/mysql-4.1
2005-11-01 09:52:45 +04:00
patg@krsna.patg.net
35a0ac6aea Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-10-31 17:28:11 -08:00
patg@krsna.patg.net
d5b252e630 BUG# 14532
Post-review fixes
2005-10-31 17:26:45 -08:00
kent@mysql.com
2c6902a093 mysql-test-run.pl:
Make IM ports change with MTR_BUILD_THREAD
2005-11-01 02:19:06 +01:00
patg@krsna.patg.net
7b611b33f2 BUG #14532
Added FIELD_TYPE_BIT to field method 'needs_quotes' to make BIT columns
work.
2005-10-31 17:17:16 -08:00
bell@sanja.is.com.ua
c54d129224 postreview fixes 2005-10-31 22:14:27 +02:00