mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
16367 commits 2790 branches 343 tags 1.7 GiB
Commit graph

16367 commits

This branch
This branch
All branches
Author SHA1 Message Date
serg@serg.mylan
358b8a4914 Merge 2004-12-10 18:58:28 +01:00
serg@serg.mylan
09b2dc89be manually merged 2004-12-10 18:49:36 +01:00
ram@gw.mysql.r18.ru
89a0623e55 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
 2004-12-10 21:26:28 +04:00
heikki@hundin.mysql.fi
2c1e258586 row0mysql.h: 
Remove accidentally pushed unnecessary change
 2004-12-10 18:09:07 +02:00
ram@gw.mysql.r18.ru
41a509ba86 A fix (bug #7129: Test failure: 'type_ranges' when using '--ps-protocol' 
bug #7126: Test failure: 'func_str' when using '--ps-protocol'
       bug #7130: Test failure: 'type_uint' when using '--ps-protocol').
 2004-12-10 20:07:00 +04:00
heikki@hundin.mysql.fi
713a3103c6 dict0dict.c, log.cc: 
Remove accidentally merged 4.0 changes
dict0dict.c:
  Remove the 4.0 fix accidentally auto-merged to 4.1
row0mysql.h, dict0dict.h:
  Remove a change auto-merged from 4.0
 2004-12-10 18:03:43 +02:00
heikki@hundin.mysql.fi
d9fbdff6a2 Merge 2004-12-10 17:15:23 +02:00
heikki@hundin.mysql.fi
ea6b5e117a dict0dict.h, dict0dict.c, ha_innodb.cc: 
Fix for the 0xA0 character problem in the InnoDB FOREIGN KEY parser: if my_isspace() treats 0xA0 as space, then let InnoDB do the same; this might break some multi-byte charset id's, though for big5, ujis, sjis this seems not to change the current behavior (I checked the tables in /share/charsets); this fix must NOT be merged to 4.1 because in 4.1 everything is in UTF-8
 2004-12-10 17:12:47 +02:00
heikki@hundin.mysql.fi
536702f4c5 dict0dict.c: 
In the FOREIGN KEY parser, do not cut 0xC2A0 from the end of an identifier if it was quoted
 2004-12-10 17:05:40 +02:00
bar@mysql.com
f1e876252d Privileges columns were removed from output to be able 
to reuse test results for both server and --embedded-server
versions.
 2004-12-10 17:58:13 +04:00
kent@mysql.com
56c47c6549 mysql-test-run.sh: 
Use different TESTS_BINDIR for --embedded-server
 2004-12-10 14:01:03 +01:00
kent@mysql.com
df6e569e0d Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-patches
 2004-12-10 13:31:51 +01:00
bar@mysql.com
0cfa0adda5 Bug #6819 Some ujis characters cannot be inserted into table 
Allow to insert not-assigned UJIS codes.
 2004-12-10 16:08:18 +04:00
kent@mysql.com
081fdcc2e1 Makefile.am: 
Moved "../regex/libregex.a" before "../libmysql/libmysqlclient.la"
  when linking. For -all-static linking libtool put -lc after the .la
  file and this put the libc regex functions before our regex functions
  when linking on Linux.
 2004-12-10 13:06:58 +01:00
tomas@poseidon.ndb.mysql.com
8c387cac37 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
 2004-12-10 13:06:50 +01:00
hf@deer.(none)
192715dbbb Fix for bug #6516 (Server crash loading spatial data) 
(after discussion with SerG)
 2004-12-10 16:06:49 +04:00
heikki@hundin.mysql.fi
4915d196eb dict0dict.c: 
Fix the bug that the character 0xA0 that EMS MySQL Manager in ALTER TABLE adds after a table name confuses the InnoDB FOREIGN KEY parser, causing an error 121 when we try to add a new constraint; a full fix would require the lexer to be aware of thd->charset_info() and UTF-8
 2004-12-10 02:36:45 +02:00
Sinisa@sinisa.nasamreza.org
d7734fd8ac Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2004-12-10 00:19:52 +02:00
Sinisa@sinisa.nasamreza.org
6772f0a721 A fix for a crashing bug #7101, which occures when the 
expression involving LEFT() function is used in GROUP BY
field.
 2004-12-10 00:17:43 +02:00
marko@hundin.mysql.fi
15152a380d srv0srv.c: 
srv_printf_innodb_monitor(): Removed extraneous rewind() call.
  The caller of this function calls rewind() if necessary.
  In this way, we avoid rewind()ing stderr in
  srv_lock_timeout_and_monitor_thread().
 2004-12-10 00:06:33 +02:00
mwagner@mysql.com
5ad7286bd5 Do-compile: 
Added --with-csv and --with-example for CSV and Example storage engines
 2004-12-09 19:47:41 +01:00
pekka@mysql.com
23c5bd4c35 ndb: sunfire100c: fix aligment when 32-bit pointers and 64-bit ha_rows 2004-12-09 15:18:31 +01:00
joreland@mysql.com
c3db04f6a4 Merge mysql.com:/home/jonas/src/mysql-4.1-fix 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-12-09 14:04:27 +01:00
joreland@mysql.com
4614cdfad9 bug#6995 - fixed so that ndb_restore 4.1.8 can read files 
created by 4.1.7 as bugfix changed binary format
 2004-12-09 13:36:23 +01:00
bar@mysql.com
c735aaebfc Bugs: #7111: server crashes when regexp is used 2004-12-09 15:56:19 +04:00
dlenev@mysql.com
611abb882b Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg6765
 2004-12-09 14:14:03 +03:00
monty@mysql.com
b68f2307e0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-12-09 12:50:37 +02:00
monty@mysql.com
01e4740f4c Ensure that we free memory used with --order-by-primary (in mysqldump) 
Simple, non critical, fix to mysql_fix_privilege_tables
 2004-12-09 12:47:20 +02:00
dlenev@mysql.com
62a6d9749b Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg6765
 2004-12-09 13:33:12 +03:00
dlenev@brandersnatch.localdomain
4b0882e0a6 Fix for bug #6765 "Implicit access to time zone description 
tables requires privileges for them if some table or column level grants
present" (with after-review fixes).

We should set SELECT_ACL for implicitly opened tables in 
my_tz_check_n_skip_implicit_tables() to be able to bypass privilege
checking in check_grant(). Also we should exclude those tables from
privilege checking in multi-update.
 2004-12-09 13:31:46 +03:00
joreland@mysql.com
0ab8c723fa bug#6995 - ndb 
don't store keys in normalized form
instead save everythings as normal attributes
 2004-12-09 11:29:17 +01:00
tomas@poseidon.ndb.mysql.com
fbda2fc152 fixed so that trailing ';' are accepted by the ndb_mgm to be more "mysql client" like 
some cleanup
 2004-12-09 09:39:20 +00:00
tomas@poseidon.ndb.mysql.com
bf72f5daaa Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
 2004-12-08 23:00:57 +00:00
tomas@poseidon.ndb.mysql.com
11e0481955 added possibility for comment into management client 
added sleep command to management client
all for testing purposes
 2004-12-08 23:00:08 +00:00
tomas@poseidon.ndb.mysql.com
be4de23f3c ndbcluster.sh: 
made compare of logs possible in ndb test
restart_log.result, restart.test, restart.result:
  new file
 2004-12-08 22:56:23 +00:00
tomas@poseidon.ndb.mysql.com
798d933bb3 ndbcluster.sh: 
added test switch
basic_log.result, basic.test, basic.result:
  new file
 2004-12-08 21:48:32 +00:00
konstantin@mysql.com
356005efd7 A fix and test case for Bug#6873 "PS, having with subquery, crash 
during execute"
 2004-12-09 00:37:17 +03:00
lenz@mysql.com
c09c191121 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2004-12-08 19:35:04 +01:00
lenz@mysql.com
5a813ad546 - added two new options to Do-compile: 
--ps-test: run the test suite using prepared statements
  --embedded-test: run the test suite against the embedded server
 2004-12-08 19:34:11 +01:00
tomas@poseidon.ndb.mysql.com
bd52833d63 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
 2004-12-08 17:24:55 +00:00
heikki@hundin.mysql.fi
a90b40fcd3 os0file.c: 
Print a better error message to the .err log if InnoDB's advisory file locking fails
 2004-12-08 17:53:01 +02:00
tomas@poseidon.ndb.mysql.com
02dab28517 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
 2004-12-08 14:25:36 +00:00
tomas@poseidon.ndb.mysql.com
c2c618332e bug #7104 
+ some extra debug printouts
 2004-12-08 14:24:59 +00:00
stewart@mysql.com
3519e554e7 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/stewart/Documents/MySQL/4.1/ndb-pristine
 2004-12-08 11:11:20 +11:00
konstantin@mysql.com
b40fc58245 A followup to Bug#6878 "Crash with engine=memory", reported as Bug#6986 
""show_check" fails on 64bit platforms": now minimal rec_length
of a HEAP table >= sizeof(void*), hence it's platform-dependant.
 2004-12-08 01:34:50 +03:00
serg@serg.mylan
36cee4b4d9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-12-07 21:43:12 +01:00
serg@serg.mylan
36e80455f5 allocate a buffer large enough for a longer matching string 2004-12-07 21:41:29 +01:00
jani@ua141d10.elisa.omakaista.fi
aac5f57b4d Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
 2004-12-07 21:58:26 +02:00
jani@ua141d10.elisa.omakaista.fi
e554642528 Fixed Bug#7043, "SHOW CREATE TABLE security hole". 2004-12-07 21:57:54 +02:00
bell@sanja.is.com.ua
acbca25dd2 postreview fix 2004-12-07 21:18:15 +02:00