Commits · 4c991e128b12bb3ea5f4321e51420e76ec4e136a · nexedi / MariaDB

19 Mar, 2008 10 commits
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 4c991e12
  unknown authored Mar 19, 2008
```
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
```
  4c991e12
- Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50 · b60bff37
  unknown authored Mar 19, 2008
```
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51


scripts/make_binary_distribution.sh:
  Use local (manual merge)
```
  b60bff37
- Merge ramayana.hindu.god:/home/tsmith/m/bk/b25486/50 · 5dfbc690
  unknown authored Mar 19, 2008
```
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
```
  5dfbc690
- Merge trift2.:/MySQL/M50/push-5.0 · 9524d47d
  unknown authored Mar 19, 2008
```
into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
```
  9524d47d
- Merge trift2.:/MySQL/M50/man8-5.0 · cd6b266b
  unknown authored Mar 19, 2008
```
into  trift2.:/MySQL/M51/man8-5.1


support-files/mysql.spec.sh:
  Auto merged
```
  cd6b266b
- Merge trift2.:/MySQL/M41/push-4.1 · 13aec1e4
  unknown authored Mar 19, 2008
```
into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Use local - version number changes don't propagate.
```
  13aec1e4
- Merge trift2.:/MySQL/M41/man8-4.1 · 6671e092
  unknown authored Mar 19, 2008
```
into  trift2.:/MySQL/M50/man8-5.0


support-files/mysql.spec.sh:
  Manual merge: Add the man pages for "ndbd" and "ndb_mgmd".
```
  6671e092
- Merge trift2.:/MySQL/M41/man8-4.1 · 03536aa7
  unknown authored Mar 19, 2008
```
into  trift2.:/MySQL/M41/push-4.1
```
  03536aa7
- support-files/mysql.spec.sh : Add the man pages for "ndbd" and "ndb_mgmd". · 8da236f7
  unknown authored Mar 19, 2008
```
support-files/mysql.spec.sh:
  Add the man pages for "ndbd" and "ndb_mgmd".
```
  8da236f7
- Merge trift2.:/MySQL/M41/mysql-4.1 · da2f149f
  unknown authored Mar 19, 2008
```
into  trift2.:/MySQL/M41/push-4.1


configure.in:
  Auto merged
```
  da2f149f
17 Mar, 2008 1 commit
- Raise version number after cloning 4.1.24 · dcb028e1
  unknown authored Mar 18, 2008
  
  dcb028e1
14 Mar, 2008 6 commits

Merge trift2.:/MySQL/M50/push-5.0 · 646e9c75

unknown authored Mar 14, 2008

into  trift2.:/MySQL/M51/push-5.1


client/mysqldump.c:
  Auto merged
scripts/make_win_bin_dist:
  Auto merged

646e9c75

Merge trift2.:/MySQL/M41/push-4.1 · 204c9caf
unknown authored Mar 14, 2008
```
into  trift2.:/MySQL/M50/push-5.0
```
204c9caf
Merge trift2.:/MySQL/M50/clone-5.0 · 3bd473f0
unknown authored Mar 14, 2008
```
into  trift2.:/MySQL/M50/push-5.0


scripts/make_win_bin_dist:
  Auto merged
```
3bd473f0

Merge trift2.:/MySQL/M51/mysql-5.1 · a31a2ae6

unknown authored Mar 14, 2008

into  trift2.:/MySQL/M51/push-5.1


client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/unireg.h:
  Auto merged

a31a2ae6

Merge trift2.:/MySQL/M50/mysql-5.0 · de8d73c7
unknown authored Mar 14, 2008
```
into  trift2.:/MySQL/M50/push-5.0


client/mysqldump.c:
  Auto merged
```
de8d73c7
Merge trift2.:/MySQL/M41/mysql-4.1 · 6a2c6399
unknown authored Mar 14, 2008
```
into  trift2.:/MySQL/M41/push-4.1
```
6a2c6399

13 Mar, 2008 5 commits
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug34192/my50-bug34192 · b6bfbc3a
  unknown authored Mar 13, 2008
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
```
  b6bfbc3a
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug34192/my51-bug34192 · 1e60006f
  unknown authored Mar 13, 2008
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build


client/mysqldump.c:
  Auto merged
```
  1e60006f
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug34192/my50-bug34192 · f5684257
  unknown authored Mar 13, 2008
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug34192/my51-bug34192


client/mysqldump.c:
  manual merge
```
  f5684257
- Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · f36c8297
  unknown authored Mar 13, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


tests/mysql_client_test.c:
  Null merge.
```
  f36c8297
- Bug#35103 mysql_client_test::test_bug29948 causes sporadic failures · ecc147f2
  unknown authored Mar 13, 2008
```
  
Disable test case for bug 29948, which is causing sporadically
failures in other tests inside mysql_client_test.


tests/mysql_client_test.c:
  Disable test case.
```
  ecc147f2
12 Mar, 2008 17 commits

Bug#34192: mysqldump from mysql 5.0.51 silently fails on dumping \ · 5018c0a9

unknown authored Mar 12, 2008

	databases from 4.0 server

mysqldump treated a failure to set the results charset as a severe
error.  

Now, don't try to set the charset for the SHOW CREATE TABLE statement,
if remote server's version is earlier than 4.1, which means it 
doesn't support changing charsets.


client/mysqldump.c:
  Don't set the charset for receiving results if the server doesn't 
  support it.

5018c0a9

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26703/my51-bug26703 · f6c5cde0
unknown authored Mar 12, 2008
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
```
f6c5cde0

Bug#26703: DROP DATABASE fails if database contains a #mysql50# \ · 08717a38

unknown authored Mar 12, 2008

	table with backticks

(Thanks to Lu Jingdong, though I did not take his patch directly, as
it contained a significant flaw.)

It wasn't a backtick/parsing problem.  We merely didn't anticipate
and allocate enough space to handle the optional "#mysql50#" table-
name prefix. 

Now, allocate that extra space in case we need it when we look up 
a legacy table to get its file's name.


mysql-test/r/drop.result:
  Verify that databases with old-style files can be removed.
mysql-test/t/drop.test:
  Verify that databases with old-style files can be removed.
sql/sql_db.cc:
  Extend the size of the memory that holds the table's name, so that
  the legacy "mysql50" prefix fits.

08717a38

Merge five.local.lan:/work/trees/mysql-5.0-build-src-clean · e9799cd5
unknown authored Mar 12, 2008
```
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
```
e9799cd5
Fixed test failures caused by insufficient cleanups in the tests for · eefc19c5
unknown authored Mar 12, 2008
```
bug12713.
```
eefc19c5
Merge five.local.lan:/work/merge/mysql-5.1-funcs_1 · 5358d6ce
unknown authored Mar 12, 2008
```
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
```
5358d6ce
Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 · 2f0ea168
unknown authored Mar 12, 2008
```
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
```
2f0ea168

Post merge fix for · 7781ea1e

unknown authored Mar 12, 2008

   ChangeSet@1.2565, 2008-03-11 20:20:49+01:00
     Merge five.local.lan:/work/merge/mysql-5.0-funcs_1
     into  five.local.lan:/work/merge/mysql-5.1-funcs_1
     MERGE: 1.1810.3473.26

   ChangeSet@1.1810.3473.26, 2008-03-11 19:54:35+01:00
   Post fix for
   WL#4203 Reorganize and fix the data dictionary tests of
           testsuite funcs_1

The final fix of
Bug#34532 Some funcs_1 tests do not clean up at end of testing
   and some minor additional modifications are for
happens here


mysql-test/suite/funcs_1/r/innodb_trig_03e.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_memory.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_myisam.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_03e.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_03e.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_bitdata.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_cursors.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_03.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_0407.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_09.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_views.result:
  Updated results
mysql-test/suite/funcs_1/t/innodb_trig_03e.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_trig_03e.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_trig_03e.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_bitdata.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_cursors.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_trig_0102.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_trig_03.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_trig_03e.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_trig_0407.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_trig_08.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_trig_09.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_views.test:
  Cleanup

7781ea1e

Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt · 0d35eafc

unknown authored Mar 12, 2008

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged

0d35eafc

Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · df7268dc
unknown authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


tests/mysql_client_test.c:
  Manual merge.
```
df7268dc
Post-merge fix. · 821d164b
unknown authored Mar 12, 2008

821d164b
Re-enabled the test for mysql_insert_id() after merging from main. · 6927cb04
unknown authored Mar 12, 2008

6927cb04

Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 2d91ad60

unknown authored Mar 12, 2008

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

2d91ad60

Merge kaamos.(none):/data/src/mysql-5.1 · e38a0de2

unknown authored Mar 12, 2008

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/func_time.result:
  Manual merge.
mysql-test/r/view.result:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
scripts/mysql_config.sh:
  Manual merge.
sql-common/client.c:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.

e38a0de2

Merge kaamos.(none):/data/src/opt/mysql-4.1-opt · ddfd9942
unknown authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
```
ddfd9942

Merge kaamos.(none):/data/src/mysql-5.0 · 242078d0

unknown authored Mar 12, 2008

into  kaamos.(none):/data/src/opt/mysql-5.0-opt


client/mysql.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/view.result:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
scripts/mysql_config.sh:
  Manual merge.

242078d0

Merge kaamos.(none):/data/src/mysql-4.1 · 70cc07cf
unknown authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-4.1-opt
```
70cc07cf

11 Mar, 2008 1 commit

Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 · d0848971

unknown authored Mar 11, 2008

into  five.local.lan:/work/merge/mysql-5.1-funcs_1


mysql-test/suite/funcs_1/cursors/cursors_master.test:
  Auto merged
BitKeeper/deleted/.del-innodb_triggers.result:
  Auto merged
BitKeeper/deleted/.del-memory_triggers.result:
  Auto merged
BitKeeper/deleted/.del-myisam_triggers.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  SCCS merged
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  SCCS merged
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  SCCS merged
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  SCCS merged
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  SCCS merged
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  SCCS merged
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  SCCS merged
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  SCCS merged
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  SCCS merged
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  SCCS merged
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  SCCS merged
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  SCCS merged
mysql-test/suite/funcs_1/t/innodb_storedproc.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc.test:
  Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  manual merge
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
  manual merge
mysql-test/suite/funcs_1/r/myisam_views.result:
  manual merge

d0848971