1
0
mirror of https://github.com/MariaDB/server.git synced 2025-10-21 08:47:42 +03:00
Commit Graph

16816 Commits

Author SHA1 Message Date
msvensson@neptunus.(none)
ba6d2bbf64 Pass --no-defaults to embedded server to avoid that it reads any defaults file 2006-12-11 12:16:20 +01:00
bar@mysql.com/bar.intranet.mysql.r18.ru
531cae29de After merge fix for bug N20396 2006-12-11 15:08:04 +04:00
msvensson@neptunus.(none)
510c9627e1 Fix merge error in mysql-test/Makefile.am 2006-12-11 12:06:12 +01:00
msvensson@neptunus.(none)
160a3dce64 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-11 11:28:11 +01:00
df@kahlann.erinye.com
78e1df3e9f Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
2006-12-11 10:51:29 +01:00
df@kahlann.erinye.com
476632aad9 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
2006-12-11 10:49:31 +01:00
df@kahlann.erinye.com
024597b3e1 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
2006-12-11 10:45:39 +01:00
Kristofer.Pettersson@naruto.
81ec16b751 Merge naruto.:C:/cpp/bug17489/my50-bug17489
into  naruto.:C:/cpp/bug17489/my51-bug17489
2006-12-10 17:01:27 +01:00
Kristofer.Pettersson@naruto.
57abd1dc1e Merge naruto.:C:/cpp/bug17489/my41-bug17489
into  naruto.:C:/cpp/bug17489/my50-bug17489
2006-12-10 16:40:15 +01:00
patg@govinda.patg.net
ca65d01701 WL #3031
Change to test results, committing so I can clone to another box to complete merge.
2006-12-09 13:33:26 -05:00
jonas@perch.ndb.mysql.com
d5cd8df3be ya typo 2006-12-09 11:45:33 +01:00
jonas@perch.ndb.mysql.com
3c3f65c42b fix bug in make install 2006-12-09 11:08:12 +01:00
patg@govinda.patg.net
f9097b86af Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-arch-wl3031-merge
2006-12-08 22:30:18 -05:00
patg@govinda.patg.net
98062f567d WL# 3031
Post-commit issues fixed
* Test results for other tests fixed due to added error #s
* Memory allocation/free issues found with running with valgrind
* Fix to mysql-test-run shell script to run federated_server test (installs
mysql.servers table properly)
2006-12-08 22:19:51 -05:00
lars@black.(none)
d85ca0dc1d Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-12-08 23:41:29 +01:00
lars@mysql.com/black.(none)
e2e3f0e5c3 Merge mysql.com:/home/bkroot/mysql-5.0-rpl
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
2006-12-08 23:33:39 +01:00
lars@mysql.com/black.(none)
587330f125 Merge mysql.com:/home/bkroot/mysql-4.1-rpl
into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
2006-12-08 23:33:15 +01:00
jonas@perch.ndb.mysql.com
11edb43a37 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-12-08 22:18:59 +01:00
kaa@polly.local
d9dc018226 Merge polly.local:/tmp/maint/bug24261/my51-bug24261
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
2006-12-08 23:47:49 +03:00
kaa@polly.local
6d1e7bcf7b Merge polly.local:/tmp/maint/bug24261/my50-bug24261
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
2006-12-08 22:38:03 +03:00
msvensson@neptunus.(none)
5817838c06 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-08 17:10:54 +01:00
msvensson@neptunus.(none)
cb903ec340 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-08 17:09:43 +01:00
msvensson@neptunus.(none)
9636ead18d Bug#19410 Test 'kill' fails on Windows + SCO 2006-12-08 17:09:07 +01:00
msvensson@neptunus.(none)
aba988485a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-08 16:53:59 +01:00
rafal@quant.(none)
dc57928573 Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl
into  quant.(none):/ext/mysql/bk/mysql-5.0-bug24507
2006-12-08 16:50:06 +01:00
istruewing@chilla.local
05dde1f311 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  chilla.local:/home/mydev/mysql-5.1-axmrg
2006-12-08 15:55:56 +01:00
kaa@polly.local
439ce0307b Merge polly.local:/tmp/maint/bug24261/my50-bug24261
into  polly.local:/tmp/maint/bug24261/my51-bug24261
2006-12-08 16:02:42 +03:00
msvensson@neptunus.(none)
8b6e5d4dfa Backport fix for mysqladmin on windows test failure 2006-12-08 13:37:40 +01:00
bar@bar.intranet.mysql.r18.ru
6e5bd8a7f8 Merge mysql.com:/usr/home/bar/mysql-5.0.b24158
into  mysql.com:/usr/home/bar/mysql-5.1.b20396
2006-12-08 16:15:43 +04:00
holyfoot/hf@deer.(none)
edfbcc12cb Merge bk@192.168.21.1:mysql-5.1-opt
into  mysql.com:/home/hf/work/embt/my51-embt
2006-12-08 15:49:43 +04:00
istruewing@chilla.local
df2b93439f Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-08 12:28:21 +01:00
holyfoot/hf@mysql.com/deer.(none)
4091806268 Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/home/hf/work/embt/my50-embt
2006-12-08 15:22:46 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
3df9fde7aa Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into  mysql.com:/usr/home/bar/mysql-5.0.b24158
2006-12-08 15:18:03 +04:00
holyfoot/hf@mysql.com/deer.(none)
f83bedabed Merge bk@192.168.21.1:mysql-4.1-opt
into  mysql.com:/home/hf/work/embt/my41-embt
2006-12-08 15:15:33 +04:00
msvensson@neptunus.(none)
0b41593db6 Fix problems with "make dist" and running from "binary dist" 2006-12-08 12:13:43 +01:00
bar@mysql.com/bar.intranet.mysql.r18.ru
c57bde5ff1 After merge fix 2006-12-08 15:13:12 +04:00
rafal@quant.(none)
fe2d5c59c2 Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl
into  quant.(none):/ext/mysql/bk/mysql-5.0-bug24507
2006-12-08 11:47:48 +01:00
bar@bar.intranet.mysql.r18.ru
864ad7daa0 After merge fix 2006-12-08 10:33:05 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
0d4b26fa71 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into  mysql.com:/usr/home/bar/mysql-5.0.b20396
2006-12-08 09:48:46 +04:00
kostja@bodhi.local
90072e69b3 A fix and test cases for
Bug#4968 "Stored procedure crash if cursor opened on altered table"
Bug#19733 "Repeated alter, or repeated create/drop, fails"
Bug#19182 "CREATE TABLE bar (m INT) SELECT n FROM foo; doesn't work from 
stored procedure."
Bug#6895 "Prepared Statements: ALTER TABLE DROP COLUMN does nothing"
Bug#22060 "ALTER TABLE x AUTO_INCREMENT=y in SP crashes server"

Test cases for bugs 4968, 19733, 6895 will be added in 5.0.

Re-execution of CREATE DATABASE, CREATE TABLE and ALTER TABLE 
statements in stored routines or as prepared statements caused
incorrect results (and crashes in versions prior to 5.0.25).
In 5.1 the problem occured only for CREATE DATABASE, CREATE TABLE
SELECT and CREATE TABLE with INDEX/DATA DIRECTOY options).

The problem of bugs 4968, 19733, 19282 and 6895 was that functions
mysql_prepare_table, mysql_create_table and mysql_alter_table were not
re-execution friendly: during their operation they used to modify contents
of LEX (members create_info, alter_info, key_list, create_list),
thus making the LEX unusable for the next execution.
In particular, these functions removed processed columns and keys from
create_list, key_list and drop_list. Search the code in sql_table.cc 
for drop_it.remove() and similar patterns to find evidence.

The fix is to supply to these functions a usable copy of each of the
above structures at every re-execution of an SQL statement. 

To simplify memory management, LEX::key_list and LEX::create_list
were added to LEX::alter_info, a fresh copy of which is created for
every execution.

The problem of crashing bug 22060 stemmed from the fact that the above 
metnioned functions were not only modifying HA_CREATE_INFO structure in 
LEX, but also were changing it to point to areas in volatile memory of 
the execution memory root.
 
The patch solves this problem by creating and using an on-stack
copy of HA_CREATE_INFO (note that code in 5.1 already creates and
uses a copy of this structure in mysql_create_table()/alter_table(),
but this approach didn't work well for CREATE TABLE SELECT statement).
2006-12-08 02:20:09 +03:00
Kristofer.Pettersson@naruto.
ecbb4eb987 Bug#17498 failed to put data file in custom directory use "data directory" option
- Using DATA/INDEX DIRECTORY option on Windows put data/index file into
  default directory because the OS doesn't support readlink().
- The procedure for changing data/index file directory is 
  different under Windows.
- With this fix we report a warning if DATA/INDEX option is used,
  but OS doesn't support readlink().
2006-12-07 17:01:00 +01:00
mskold/marty@mysql.com/linux.site
79542f0584 ps_7ndb problem now fixed 2006-12-07 16:30:30 +01:00
mskold/marty@mysql.com/linux.site
6b4b402977 Bug#24818 CREATE UNIQUE INDEX (...) USING HASH on a NDB table crashes mysqld: Re-generated test result 2006-12-07 16:27:38 +01:00
df@kahlann.erinye.com
8fffa20a5a Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
2006-12-07 16:08:55 +01:00
mskold/marty@linux.site
c39c7b6f2b Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-12-07 16:08:14 +01:00
df@kahlann.erinye.com
75c7114124 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-12-07 16:07:14 +01:00
df@kahlann.erinye.com
19ec379b15 do not autorelease build ids when a child of mysql-test-run.pl dies 2006-12-07 16:06:29 +01:00
mskold/marty@linux.site
8ca573857f Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-12-07 16:03:31 +01:00
mskold/marty@mysql.com/linux.site
072133459f Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-4.1-ndb
2006-12-07 15:59:15 +01:00
mskold/marty@mysql.com/linux.site
84a8d1759b Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-12-07 15:54:43 +01:00