mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
32110 commits 2789 branches 343 tags 1.7 GiB
Commit graph

32110 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kristofer.Pettersson@naruto.
887f3b9d42 Bug#21811 Odd casting with date + INTERVAL arithmetic 
- Type casting was not consequent, thus when adding a DATE type with
  a WEEK interval the result type was DATETIME and not DATE as is the
  norm.
- By changing the order of the date internal enumerations the deviant
  type casting is resolved (Item_date_add_interval::fix_length_and_dec()
  which determines result type for this operation assumes that addition
  of any interval with value <= INTERVAL_DAY to date value will result
  in date). There are two independant places to change:
  interval_names[] and interval_type.
 2006-10-02 12:37:01 +02:00
msvensson@shellback.(none)
5a912955d5 Increase suite timeout even more - 6 times - when running with valgrind 2006-09-19 19:41:41 +02:00
msvensson@shellback.(none)
883a3809c9 Pass --debug arguments to mysqld also when bootstrapping if --debug is tunrned on 2006-09-19 18:39:04 +02:00
msvensson@shellback.(none)
895d986266 Don't bother to remove the pid_file in mtr_kill_leftovers as it could potentially remove a the pidfile before the process is killed. 
The pid file will be removed later when var/ directory is recreated.
 2006-09-19 16:48:01 +02:00
msvensson@shellback.(none)
fa26e83fd2 Fix warnings in mysql-test-run.pl 2006-09-19 16:43:42 +02:00
msvensson@shellback.(none)
2b014bedaf Add directive to not update files from bitkeeper 2006-09-18 19:37:22 +02:00
msvensson@shellback.(none)
dafb50055f Add character-sets-dir argument to "mysql". That avoids a local 
installed charset dir being used.
 2006-09-18 17:46:36 +02:00
msvensson@shellback.(none)
6a0841a1bc Add definition of SHUT_RDWR for compiling on windows 2006-09-15 17:53:45 +02:00
msvensson@shellback.(none)
b178e40cae Merge shellback.(none):/home/msvensson/mysql/bug20602/my50-bug20602 
into  shellback.(none):/home/msvensson/mysql/work/my50-work
 2006-09-15 16:57:37 +02:00
msvensson@shellback.(none)
bfc3cfd4ee Merge msvensson.mysql.internal:mysql/my50-m-bug16574 
into  shellback.(none):/home/msvensson/mysql/work/my50-work
 2006-09-15 16:55:47 +02:00
msvensson@shellback.(none)
fb89352b47 Merge msvensson.mysql.internal:mysql/my50-m-bug16576 
into  shellback.(none):/home/msvensson/mysql/work/my50-work
 2006-09-15 16:52:08 +02:00
msvensson@shellback.(none)
a297c29243 Merge msvensson.mysql.internal:mysql/my50-m-bug21222 
into  shellback.(none):/home/msvensson/mysql/work/my50-work
 2006-09-15 16:49:24 +02:00
msvensson@shellback.(none)
c3e2d543db Bug#22326 Build problems on hurd-i386: conflicting declaration of socklen_t 2006-09-15 15:41:04 +02:00
msvensson@shellback.(none)
c4177ec484 Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown 2006-09-15 14:27:45 +02:00
ted@ted.mysql.internal
cb08c534a0 Bug#21011 The [client] group header was overwritten by "password" option in upgrade_defaults file which confused mysqlcheck thus used to prevent the whole thing from running correctly when the "--password=" option is specified on mysql_upgrade command line with no corresponding "--user=" option 2006-09-15 04:01:47 +04:00
iggy@rolltop.ignatz42.dyndns.org
4fa6c8c776 Bug#21424 mysqldump failing to export/import views. 
Dumps are created for the tables in each specified database then for the views in each specified database. This bug occurs when any database's views depend on the mysql database's table data while being restored. 
Added command line option --flush-privileges to the mysqldump utility which causes a FLUSH PRIVILIGES statement to be written to the dump after the mysql database.
 2006-09-14 14:56:14 -04:00
msvensson@shellback.(none)
df2fbc784d Bug#14862 undefined reference to `isinf' on SOLARIS - strings/strtod.c 
- Change the configure test looking for 'isinf' so the value returned from isinf is used. That avoids the call to isinf being optimized away.
 2006-09-12 15:47:48 +02:00
msvensson@neptunus.(none)
e38f04a09f Merge neptunus.(none):/home/msvensson/mysql/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-12 11:23:07 +02:00
msvensson@neptunus.(none)
66bce61a88 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-12 11:14:09 +02:00
gluh@mysql.com/gluh.(none)
4afd20545c Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0
 2006-09-08 16:17:42 +05:00
gluh@mysql.com/gluh.(none)
a3300c3983 after merge fix 2006-09-08 16:16:39 +05:00
joerg@trift2.
b6071f06ce configure.in : NDB version and general version must be (kept) in sync - do that. 2006-09-07 17:51:28 +02:00
joerg@trift2.
d7b47f4dfd Merge trift2.:/M50/clone-5.0 
into  trift2.:/M50/push-5.0
 2006-09-07 17:47:57 +02:00
joerg@trift2.
1fc7b01507 Fix a change to "configure.in" that broke building commercial sources. 
To be pushed to both the cloned 5.0.25 and the general 5.0 tree.
 2006-09-07 17:37:51 +02:00
gluh@mysql.com/gluh.(none)
e2684ad5d7 after merge fix 2006-09-07 18:09:49 +05:00
gluh@mysql.com/gluh.(none)
76b97433c2 Merge mysql.com:/home/gluh/MySQL/Merge/4.1-merge 
into  mysql.com:/home/gluh/MySQL/Merge/5.0
 2006-09-07 15:17:46 +05:00
tsmith@maint1.mysql.com
330fb6a3be Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx 
into  maint1.mysql.com:/data/localhome/tsmith/bk/50
 2006-09-07 01:20:03 +02:00
tsmith@maint1.mysql.com
b5f67a642f Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx 
into  maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx
 2006-09-07 00:59:08 +02:00
tsmith@maint1.mysql.com
2480ec8e3e Force conflict to avoid bk automerge behavior; will be undone during merge. 2006-09-07 00:54:48 +02:00
tsmith@maint1.mysql.com
b6cd727ed1 Bug #21054: myisam_stats_method ignored in my.cnf and cmdline 
Fix OPT_MYISAM_STATS_METHOD case, where the NULLS_EQUAL and NULLS_NOT_EQUAL methods were mixed up
 2006-09-07 00:11:43 +02:00
tsmith@maint1.mysql.com
f4265f7a57 Bug #21250: esolve stack traces on AMD64 (backport to mysql-4.1) 2006-09-07 00:01:00 +02:00
cmiller@zippy.cornsilk.net
14eaca47d0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-06 14:28:53 -04:00
bteam/mysqldev@mysql.com/production.mysql.com
bd7fefcb78 Raise version number 2006-09-06 17:56:59 +02:00
jonas@perch.ndb.mysql.com
3a80cee4b2 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-09-06 02:14:50 +02:00
guilhem@gbichot3.local
e4d3595b18 Fix for BUG#11151 "LOAD DATA INFILE commits transaction in 5.0". 
In 5.0 we made LOAD DATA INFILE autocommit in all engines, while
only NDB wanted that. Users and trainers complained that it affected
InnoDB and was a change compared to 4.1 where only NDB autocommitted.
To revert to the behaviour of 4.1, we move the autocommit logic out of mysql_load() into
ha_ndbcluster::external_lock().
The result is that LOAD DATA INFILE commits all uncommitted changes
of NDB if this is an NDB table, its own changes if this is an NDB
table, but does not affect other engines.
Note: even though there is no "commit the full transaction at end"
anymore, LOAD DATA INFILE stays disabled in routines (re-entrency
problems per a comment of Pem).
Note: ha_ndbcluster::has_transactions() does not give reliable results
because it says "yes" even if transactions are disabled in this engine...
 2006-09-05 16:52:05 +02:00
jonas@perch.ndb.mysql.com
fe808115e9 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-09-04 14:34:42 +02:00
jonas@perch.ndb.mysql.com
7ff631e890 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-09-04 13:46:56 +02:00
jonas@perch.ndb.mysql.com
96ff8b4c52 bug#21965 - replication 
fix deadlock if master switches log file in parallell with "show master logs"
 2006-09-04 13:43:34 +02:00
msvensson@neptunus.(none)
4d0430c8fd Merge dl145s:/data/tkatchaounov/5.0-bug-21787 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-09-04 11:45:43 +02:00
msvensson@neptunus.(none)
1bea6cf1a2 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-09-04 11:42:16 +02:00
msvensson@neptunus.(none)
1fd3958ea6 Merge bk-internal:/home/bk/mysql-5.0-opt 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-09-04 11:39:58 +02:00
msvensson@neptunus.(none)
d253cf7813 Fix problem where mysql-test-run.pl fails to start up the mysqld after a failed test. Shows up on win hosts where one failed test case make subsequent ones fails with error "Could not open connection 'default': 2003 Can't connect to MySQL server on 'localhost'" 2006-09-04 11:30:04 +02:00
msvensson@neptunus.(none)
e40e56346d Merge bk-internal:/home/bk/mysql-5.0-cmake 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-09-04 10:36:01 +02:00
tnurnberg@maint1.mysql.com
ab7810c8e9 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  maint1.mysql.com:/data/localhome/tnurnberg/my50-21913
 2006-09-04 07:45:49 +02:00
tnurnberg@salvation.intern.azundris.com
72c6c14bb2 Merge salvation.intern.azundris.com:/home/tnurnberg/21913/my41-21913 
into  salvation.intern.azundris.com:/home/tnurnberg/21913/my50-21913

21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.

Variable character_set_results can legally be NULL (for "no conversion.")
This could result in a NULL deref that crashed the server.  Fixed.

(Although ran some additional precursory tests to see whether I could break
anything else, but no breakage so far.)
 2006-09-04 07:01:15 +02:00
tnurnberg@salvation.intern.azundris.com
41f1932488 Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver. 
Variable character_set_results can legally be NULL (for "no conversion.")
This could result in a NULL deref that crashed the server.  Fixed.

(Although ran some additional precursory tests to see whether I could break
anything else, but no breakage so far.)
 2006-09-04 06:16:34 +02:00
tsmith@maint1.mysql.com
da18dec0c8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  maint1.mysql.com:/data/localhome/tsmith/bk/mysql-5.0-maint
 2006-09-03 23:54:48 +02:00
msvensson@neptunus.(none)
d7ca3d87d7 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-09-02 16:20:51 +02:00
msvensson@neptunus.(none)
36975d8b70 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-09-02 16:15:16 +02:00
grichter@bk-internal.mysql.com
6993e3a3f7 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-cmake
 2006-09-02 11:03:16 +02:00